diff --git a/.editorconfig b/.editorconfig
index a5dfab07a50..1583c600aa5 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -129,7 +129,7 @@ csharp_indent_braces = false
 csharp_indent_switch_labels = true
 
 # Space preferences
-csharp_space_after_cast = true
+csharp_space_after_cast = false
 csharp_space_after_colon_in_inheritance_clause = true
 csharp_space_after_comma = true
 csharp_space_after_dot = false
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index a397604185a..7a8129df1a6 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -17,10 +17,17 @@ Small fixes/refactors are exempt.
 Any media may be used in SS14 progress reports, with clear credit given.
 
 If you're unsure whether your PR will require media, ask a maintainer.
-
-Check the box below to confirm that you have in fact seen this (put an X in the brackets, like [X]):
 -->
 
+## Requirements
+<!-- 
+Due to influx of PR's we require to ensure that PR's are following the correct guidelines.
+
+Please take a moment to read these if its your first time.
+
+Check the boxes below to confirm that you have in fact seen these (put an X in the brackets, like [X]):
+-->
+- [ ] I have read and I am following the [Pull Request Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html). I understand that not doing so may get my pr closed at maintainer’s discretion
 - [ ] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase
 
 ## Breaking changes
@@ -34,7 +41,7 @@ Make players aware of new features and changes that could affect how they play t
 -->
 
 <!--
-Make sure to take this Changelog template out of the comment block in order for it to show up.
+Make sure to take this Changelog template out of the comment block in order for it to show up. Changelog must have a :cl: symbol, so the bot recognizes the changes and adds them to the game's changelog.
 :cl:
 - add: Added fun!
 - remove: Removed fun!
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 08e372cf68c..9ee76414303 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -37,3 +37,8 @@
   - all-globs-to-all-files:
     - "!Resources/Maps/**/*.yml"
     - "!Resources/Prototypes/Maps/**/*.yml"
+
+"Changes: Shaders":
+- changed-files:
+  - any-glob-to-any-file: '**/*.swsl'
+
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 3c2b00666a1..16cb5017d6a 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -72,4 +72,4 @@ jobs:
     - uses: geekyeggo/delete-artifact@v5
       if: always()
       with:
-        name: build
\ No newline at end of file
+        name: build
diff --git a/.github/workflows/test-packaging.yml b/.github/workflows/test-packaging.yml
index 725eb2ef1e6..014cf3f5109 100644
--- a/.github/workflows/test-packaging.yml
+++ b/.github/workflows/test-packaging.yml
@@ -64,8 +64,3 @@ jobs:
 
       - name: Package client
         run: dotnet run --project Content.Packaging client --no-wipe-release
-
-      - name: Shuffle files around
-        run: |
-          mkdir "release/${{ github.sha }}"
-          mv release/*.zip "release/${{ github.sha }}"
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 0e0d3ae890c..00000000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "omnisharp.analyzeOpenDocumentsOnly": true,
-    "dotnet.defaultSolution": "SpaceStation14.sln"
-}
diff --git a/Content.Client/Access/UI/AccessLevelControl.xaml.cs b/Content.Client/Access/UI/AccessLevelControl.xaml.cs
index 34db80b7af9..12487b2e5ce 100644
--- a/Content.Client/Access/UI/AccessLevelControl.xaml.cs
+++ b/Content.Client/Access/UI/AccessLevelControl.xaml.cs
@@ -12,11 +12,18 @@ namespace Content.Client.Access.UI;
 [GenerateTypedNameReferences]
 public sealed partial class AccessLevelControl : GridContainer
 {
+    [Dependency] private readonly ILogManager _logManager = default!;
+
+    private ISawmill _sawmill = default!;
+
     public readonly Dictionary<ProtoId<AccessLevelPrototype>, Button> ButtonsList = new();
 
     public AccessLevelControl()
     {
         RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        _sawmill = _logManager.GetSawmill("accesslevelcontrol");
     }
 
     public void Populate(List<ProtoId<AccessLevelPrototype>> accessLevels, IPrototypeManager prototypeManager)
@@ -25,7 +32,7 @@ public void Populate(List<ProtoId<AccessLevelPrototype>> accessLevels, IPrototyp
         {
             if (!prototypeManager.TryIndex(access, out var accessLevel))
             {
-                Logger.Error($"Unable to find accesslevel for {access}");
+                _sawmill.Error($"Unable to find accesslevel for {access}");
                 continue;
             }
 
diff --git a/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs b/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs
index c1b63dc4d05..d80c600c03e 100644
--- a/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs
+++ b/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
 using Content.Shared.Containers.ItemSlots;
+using Robust.Client.UserInterface;
 using Robust.Shared.Prototypes;
 using static Content.Shared.Access.Components.AccessOverriderComponent;
 
@@ -23,6 +24,28 @@ protected override void Open()
         {
             base.Open();
 
+            _window = this.CreateWindow<AccessOverriderWindow>();
+            RefreshAccess();
+            _window.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
+            _window.OnSubmit += SubmitData;
+
+            _window.PrivilegedIdButton.OnPressed += _ => SendMessage(new ItemSlotButtonPressedEvent(PrivilegedIdCardSlotId));
+        }
+
+        public override void OnProtoReload(PrototypesReloadedEventArgs args)
+        {
+            base.OnProtoReload(args);
+            if (!args.WasModified<AccessLevelPrototype>())
+                return;
+
+            RefreshAccess();
+
+            if (State != null)
+                _window?.UpdateState(_prototypeManager, (AccessOverriderBoundUserInterfaceState) State);
+        }
+
+        private void RefreshAccess()
+        {
             List<ProtoId<AccessLevelPrototype>> accessLevels;
 
             if (EntMan.TryGetComponent<AccessOverriderComponent>(Owner, out var accessOverrider))
@@ -30,38 +53,20 @@ protected override void Open()
                 accessLevels = accessOverrider.AccessLevels;
                 accessLevels.Sort();
             }
-
             else
             {
                 accessLevels = new List<ProtoId<AccessLevelPrototype>>();
                 _accessOverriderSystem.Log.Error($"No AccessOverrider component found for {EntMan.ToPrettyString(Owner)}!");
             }
 
-            _window = new AccessOverriderWindow(this, _prototypeManager, accessLevels)
-            {
-                Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName
-            };
-
-            _window.PrivilegedIdButton.OnPressed += _ => SendMessage(new ItemSlotButtonPressedEvent(PrivilegedIdCardSlotId));
-
-            _window.OnClose += Close;
-            _window.OpenCentered();
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing)
-                return;
-
-            _window?.Dispose();
+            _window?.SetAccessLevels(_prototypeManager, accessLevels);
         }
 
         protected override void UpdateState(BoundUserInterfaceState state)
         {
             base.UpdateState(state);
             var castState = (AccessOverriderBoundUserInterfaceState) state;
-            _window?.UpdateState(castState);
+            _window?.UpdateState(_prototypeManager, castState);
         }
 
         public void SubmitData(List<ProtoId<AccessLevelPrototype>> newAccessList)
diff --git a/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs b/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs
index 6025c3b551f..ba087718583 100644
--- a/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs
+++ b/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs
@@ -13,26 +13,24 @@ namespace Content.Client.Access.UI
     [GenerateTypedNameReferences]
     public sealed partial class AccessOverriderWindow : DefaultWindow
     {
-        [Dependency] private readonly ILogManager _logManager = default!;
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-
-        private readonly AccessOverriderBoundUserInterface _owner;
         private readonly Dictionary<string, Button> _accessButtons = new();
 
-        public AccessOverriderWindow(AccessOverriderBoundUserInterface owner, IPrototypeManager prototypeManager,
-            List<ProtoId<AccessLevelPrototype>> accessLevels)
+        public event Action<List<ProtoId<AccessLevelPrototype>>>? OnSubmit;
+
+        public AccessOverriderWindow()
         {
             RobustXamlLoader.Load(this);
-            IoCManager.InjectDependencies(this);
-            var logMill = _logManager.GetSawmill(SharedAccessOverriderSystem.Sawmill);
+        }
 
-            _owner = owner;
+        public void SetAccessLevels(IPrototypeManager protoManager, List<ProtoId<AccessLevelPrototype>> accessLevels)
+        {
+            _accessButtons.Clear();
+            AccessLevelGrid.DisposeAllChildren();
 
             foreach (var access in accessLevels)
             {
-                if (!prototypeManager.TryIndex(access, out var accessLevel))
+                if (!protoManager.TryIndex(access, out var accessLevel))
                 {
-                    logMill.Error($"Unable to find accesslevel for {access}");
                     continue;
                 }
 
@@ -44,11 +42,16 @@ public AccessOverriderWindow(AccessOverriderBoundUserInterface owner, IPrototype
 
                 AccessLevelGrid.AddChild(newButton);
                 _accessButtons.Add(accessLevel.ID, newButton);
-                newButton.OnPressed += _ => SubmitData();
+                newButton.OnPressed += _ =>
+                {
+                    OnSubmit?.Invoke(
+                        // Iterate over the buttons dictionary, filter by `Pressed`, only get key from the key/value pair
+                        _accessButtons.Where(x => x.Value.Pressed).Select(x => new ProtoId<AccessLevelPrototype>(x.Key)).ToList());
+                };
             }
         }
 
-        public void UpdateState(AccessOverriderBoundUserInterfaceState state)
+        public void UpdateState(IPrototypeManager protoManager, AccessOverriderBoundUserInterfaceState state)
         {
             PrivilegedIdLabel.Text = state.PrivilegedIdName;
             PrivilegedIdButton.Text = state.IsPrivilegedIdPresent
@@ -66,11 +69,11 @@ public void UpdateState(AccessOverriderBoundUserInterfaceState state)
 
             if (state.MissingPrivilegesList != null && state.MissingPrivilegesList.Any())
             {
-                List<string> missingPrivileges = new List<string>();
+                var missingPrivileges = new List<string>();
 
                 foreach (string tag in state.MissingPrivilegesList)
                 {
-                    string privilege = Loc.GetString(_prototypeManager.Index<AccessLevelPrototype>(tag)?.Name ?? "generic-unknown");
+                    var privilege = Loc.GetString(protoManager.Index<AccessLevelPrototype>(tag)?.Name ?? "generic-unknown");
                     missingPrivileges.Add(privilege);
                 }
 
@@ -90,13 +93,5 @@ public void UpdateState(AccessOverriderBoundUserInterfaceState state)
                 }
             }
         }
-
-        private void SubmitData()
-        {
-            _owner.SubmitData(
-
-                // Iterate over the buttons dictionary, filter by `Pressed`, only get key from the key/value pair
-                _accessButtons.Where(x => x.Value.Pressed).Select(x => new ProtoId<AccessLevelPrototype>(x.Key)).ToList());
-        }
     }
 }
diff --git a/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs b/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs
index 761f52988a9..050756fcd14 100644
--- a/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs
+++ b/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Access.Systems;
 using Content.Shared.StatusIcon;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.Access.UI
@@ -20,16 +21,11 @@ protected override void Open()
         {
             base.Open();
 
-            _window?.Dispose();
-            _window = new AgentIDCardWindow(this);
-            if (State != null)
-                UpdateState(State);
+            _window = this.CreateWindow<AgentIDCardWindow>();
 
-            _window.OpenCentered();
-
-            _window.OnClose += Close;
             _window.OnNameChanged += OnNameChanged;
             _window.OnJobChanged += OnJobChanged;
+            _window.OnJobIconChanged += OnJobIconChanged;
         }
 
         private void OnNameChanged(string newName)
@@ -42,7 +38,7 @@ private void OnJobChanged(string newJob)
             SendMessage(new AgentIDCardJobChangedMessage(newJob));
         }
 
-        public void OnJobIconChanged(ProtoId<StatusIconPrototype> newJobIconId)
+        public void OnJobIconChanged(ProtoId<JobIconPrototype> newJobIconId)
         {
             SendMessage(new AgentIDCardJobIconChangedMessage(newJobIconId));
         }
@@ -59,16 +55,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
 
             _window.SetCurrentName(cast.CurrentName);
             _window.SetCurrentJob(cast.CurrentJob);
-            _window.SetAllowedIcons(cast.Icons, cast.CurrentJobIconId);
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing)
-                return;
-
-            _window?.Dispose();
+            _window.SetAllowedIcons(cast.CurrentJobIconId);
         }
     }
 }
diff --git a/Content.Client/Access/UI/AgentIDCardWindow.xaml b/Content.Client/Access/UI/AgentIDCardWindow.xaml
index 89de793714d..7d091e4e165 100644
--- a/Content.Client/Access/UI/AgentIDCardWindow.xaml
+++ b/Content.Client/Access/UI/AgentIDCardWindow.xaml
@@ -6,12 +6,9 @@
         <LineEdit Name="NameLineEdit" />
         <Label Name="CurrentJob" Text="{Loc 'agent-id-card-current-job'}" />
         <LineEdit Name="JobLineEdit" />
-        <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc 'agent-id-card-job-icon-label'}"/>
-            <Control HorizontalExpand="True" MinSize="50 0"/>
-            <GridContainer Name="IconGrid" Columns="10">
-                <!-- Job icon buttons are generated in the code -->
-            </GridContainer>
-        </BoxContainer>
+        <Label Text="{Loc 'agent-id-card-job-icon-label'}"/>
+        <GridContainer Name="IconGrid" Columns="10">
+            <!-- Job icon buttons are generated in the code -->
+        </GridContainer>
     </BoxContainer>
 </DefaultWindow>
diff --git a/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs b/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
index 6d0b2a184f4..320bb88a67e 100644
--- a/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
+++ b/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
@@ -8,6 +8,7 @@
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
 using System.Numerics;
+using System.Linq;
 
 namespace Content.Client.Access.UI
 {
@@ -17,19 +18,19 @@ public sealed partial class AgentIDCardWindow : DefaultWindow
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IEntitySystemManager _entitySystem = default!;
         private readonly SpriteSystem _spriteSystem;
-        private readonly AgentIDCardBoundUserInterface _bui;
 
         private const int JobIconColumnCount = 10;
 
         public event Action<string>? OnNameChanged;
         public event Action<string>? OnJobChanged;
 
-        public AgentIDCardWindow(AgentIDCardBoundUserInterface bui)
+        public event Action<ProtoId<JobIconPrototype>>? OnJobIconChanged;
+
+        public AgentIDCardWindow()
         {
             RobustXamlLoader.Load(this);
             IoCManager.InjectDependencies(this);
             _spriteSystem = _entitySystem.GetEntitySystem<SpriteSystem>();
-            _bui = bui;
 
             NameLineEdit.OnTextEntered += e => OnNameChanged?.Invoke(e.Text);
             NameLineEdit.OnFocusExit += e => OnNameChanged?.Invoke(e.Text);
@@ -38,17 +39,16 @@ public AgentIDCardWindow(AgentIDCardBoundUserInterface bui)
             JobLineEdit.OnFocusExit += e => OnJobChanged?.Invoke(e.Text);
         }
 
-        public void SetAllowedIcons(HashSet<ProtoId<StatusIconPrototype>> icons, string currentJobIconId)
+        public void SetAllowedIcons(string currentJobIconId)
         {
             IconGrid.DisposeAllChildren();
 
-            var jobIconGroup = new ButtonGroup();
+            var jobIconButtonGroup = new ButtonGroup();
             var i = 0;
-            foreach (var jobIconId in icons)
+            var icons = _prototypeManager.EnumeratePrototypes<JobIconPrototype>().Where(icon => icon.AllowSelection).ToList();
+            icons.Sort((x, y) => string.Compare(x.LocalizedJobName, y.LocalizedJobName, StringComparison.CurrentCulture));
+            foreach (var jobIcon in icons)
             {
-                if (!_prototypeManager.TryIndex(jobIconId, out var jobIcon))
-                    continue;
-
                 String styleBase = StyleBase.ButtonOpenBoth;
                 var modulo = i % JobIconColumnCount;
                 if (modulo == 0)
@@ -62,12 +62,13 @@ public void SetAllowedIcons(HashSet<ProtoId<StatusIconPrototype>> icons, string
                     Access = AccessLevel.Public,
                     StyleClasses = { styleBase },
                     MaxSize = new Vector2(42, 28),
-                    Group = jobIconGroup,
-                    Pressed = i == 0,
+                    Group = jobIconButtonGroup,
+                    Pressed = currentJobIconId == jobIcon.ID,
+                    ToolTip = jobIcon.LocalizedJobName
                 };
 
                 // Generate buttons textures
-                TextureRect jobIconTexture = new TextureRect
+                var jobIconTexture = new TextureRect
                 {
                     Texture = _spriteSystem.Frame0(jobIcon.Icon),
                     TextureScale = new Vector2(2.5f, 2.5f),
@@ -75,12 +76,9 @@ public void SetAllowedIcons(HashSet<ProtoId<StatusIconPrototype>> icons, string
                 };
 
                 jobIconButton.AddChild(jobIconTexture);
-                jobIconButton.OnPressed += _ => _bui.OnJobIconChanged(jobIconId);
+                jobIconButton.OnPressed += _ => OnJobIconChanged?.Invoke(jobIcon.ID);
                 IconGrid.AddChild(jobIconButton);
 
-                if (jobIconId.Equals(currentJobIconId))
-                    jobIconButton.Pressed = true;
-
                 i++;
             }
         }
diff --git a/Content.Client/Actions/ActionsSystem.cs b/Content.Client/Actions/ActionsSystem.cs
index b9d554607cf..f83b2609017 100644
--- a/Content.Client/Actions/ActionsSystem.cs
+++ b/Content.Client/Actions/ActionsSystem.cs
@@ -49,6 +49,7 @@ public override void Initialize()
             SubscribeLocalEvent<InstantActionComponent, ComponentHandleState>(OnInstantHandleState);
             SubscribeLocalEvent<EntityTargetActionComponent, ComponentHandleState>(OnEntityTargetHandleState);
             SubscribeLocalEvent<WorldTargetActionComponent, ComponentHandleState>(OnWorldTargetHandleState);
+            SubscribeLocalEvent<EntityWorldTargetActionComponent, ComponentHandleState>(OnEntityWorldTargetHandleState);
         }
 
         private void OnInstantHandleState(EntityUid uid, InstantActionComponent component, ref ComponentHandleState args)
@@ -77,6 +78,18 @@ private void OnWorldTargetHandleState(EntityUid uid, WorldTargetActionComponent
             BaseHandleState<WorldTargetActionComponent>(uid, component, state);
         }
 
+        private void OnEntityWorldTargetHandleState(EntityUid uid,
+            EntityWorldTargetActionComponent component,
+            ref ComponentHandleState args)
+        {
+            if (args.Current is not EntityWorldTargetActionComponentState state)
+                return;
+
+            component.Whitelist = state.Whitelist;
+            component.CanTargetSelf = state.CanTargetSelf;
+            BaseHandleState<EntityWorldTargetActionComponent>(uid, component, state);
+        }
+
         private void BaseHandleState<T>(EntityUid uid, BaseActionComponent component, BaseActionComponentState state) where T : BaseActionComponent
         {
             // TODO ACTIONS use auto comp states
@@ -108,7 +121,7 @@ private void BaseHandleState<T>(EntityUid uid, BaseActionComponent component, Ba
             UpdateAction(uid, component);
         }
 
-        protected override void UpdateAction(EntityUid? actionId, BaseActionComponent? action = null)
+        public override void UpdateAction(EntityUid? actionId, BaseActionComponent? action = null)
         {
             if (!ResolveActionData(actionId, ref action))
                 return;
diff --git a/Content.Client/Actions/UI/ActionAlertTooltip.cs b/Content.Client/Actions/UI/ActionAlertTooltip.cs
index ddc498b6e91..f805f6643d2 100644
--- a/Content.Client/Actions/UI/ActionAlertTooltip.cs
+++ b/Content.Client/Actions/UI/ActionAlertTooltip.cs
@@ -1,4 +1,4 @@
-using Content.Client.Stylesheets;
+using Content.Client.Stylesheets;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
@@ -77,9 +77,12 @@ public ActionAlertTooltip(FormattedMessage name, FormattedMessage? desc, string?
                     MaxWidth = TooltipTextMaxWidth,
                     StyleClasses = {StyleNano.StyleClassTooltipActionRequirements}
                 };
-                requiresLabel.SetMessage(FormattedMessage.FromMarkup("[color=#635c5c]" +
-                                                                     requires +
-                                                                     "[/color]"));
+
+                if (!FormattedMessage.TryFromMarkup("[color=#635c5c]" + requires + "[/color]", out var markup))
+                    return;
+
+                requiresLabel.SetMessage(markup);
+
                 vbox.AddChild(requiresLabel);
             }
         }
@@ -97,8 +100,11 @@ protected override void FrameUpdate(FrameEventArgs args)
             if (timeLeft > TimeSpan.Zero)
             {
                 var duration = Cooldown.Value.End - Cooldown.Value.Start;
-                _cooldownLabel.SetMessage(FormattedMessage.FromMarkup(
-                    $"[color=#a10505]{(int) duration.TotalSeconds} sec cooldown ({(int) timeLeft.TotalSeconds + 1} sec remaining)[/color]"));
+
+                if (!FormattedMessage.TryFromMarkup($"[color=#a10505]{(int) duration.TotalSeconds} sec cooldown ({(int) timeLeft.TotalSeconds + 1} sec remaining)[/color]", out var markup))
+                    return;
+
+                _cooldownLabel.SetMessage(markup);
                 _cooldownLabel.Visible = true;
             }
             else
diff --git a/Content.Client/Administration/AdminNameOverlay.cs b/Content.Client/Administration/AdminNameOverlay.cs
index c21ba2e32ca..27b2a5dedb0 100644
--- a/Content.Client/Administration/AdminNameOverlay.cs
+++ b/Content.Client/Administration/AdminNameOverlay.cs
@@ -44,7 +44,7 @@ protected override void Draw(in OverlayDrawArgs args)
                 }
 
                 // if not on the same map, continue
-                if (_entityManager.GetComponent<TransformComponent>(entity.Value).MapID != _eyeManager.CurrentMap)
+                if (_entityManager.GetComponent<TransformComponent>(entity.Value).MapID != args.MapId)
                 {
                     continue;
                 }
diff --git a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs
index ddd66623bd4..dd8e3e22121 100644
--- a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs
+++ b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs
@@ -88,26 +88,51 @@ public BwoinkControl()
                 var ach = AHelpHelper.EnsurePanel(a.SessionId);
                 var bch = AHelpHelper.EnsurePanel(b.SessionId);
 
-                // First, sort by unread. Any chat with unread messages appears first. We just sort based on unread
-                // status, not number of unread messages, so that more recent unread messages take priority.
+                // Pinned players first
+                if (a.IsPinned != b.IsPinned)
+                    return a.IsPinned ? -1 : 1;
+
+                // First, sort by unread. Any chat with unread messages appears first.
                 var aUnread = ach.Unread > 0;
                 var bUnread = bch.Unread > 0;
                 if (aUnread != bUnread)
                     return aUnread ? -1 : 1;
 
+                // Sort by recent messages during the current round.
+                var aRecent = a.ActiveThisRound && ach.LastMessage != DateTime.MinValue;
+                var bRecent = b.ActiveThisRound && bch.LastMessage != DateTime.MinValue;
+                if (aRecent != bRecent)
+                    return aRecent ? -1 : 1;
+
                 // Next, sort by connection status. Any disconnected players are grouped towards the end.
                 if (a.Connected != b.Connected)
                     return a.Connected ? -1 : 1;
 
-                // Next, group by whether or not the players have participated in this round.
-                // The ahelp window shows all players that have connected since server restart, this groups them all towards the bottom.
-                if (a.ActiveThisRound != b.ActiveThisRound)
-                    return a.ActiveThisRound ? -1 : 1;
+                // Sort connected players by New Player status, then by Antag status
+                if (a.Connected && b.Connected)
+                {
+                    var aNewPlayer = a.OverallPlaytime <= TimeSpan.FromMinutes(_cfg.GetCVar(CCVars.NewPlayerThreshold));
+                    var bNewPlayer = b.OverallPlaytime <= TimeSpan.FromMinutes(_cfg.GetCVar(CCVars.NewPlayerThreshold));
+
+                    if (aNewPlayer != bNewPlayer)
+                        return aNewPlayer ? -1 : 1;
+
+                    if (a.Antag != b.Antag)
+                        return a.Antag ? -1 : 1;
+                }
+
+                // Sort disconnected players by participation in the round
+                if (!a.Connected && !b.Connected)
+                {
+                    if (a.ActiveThisRound != b.ActiveThisRound)
+                        return a.ActiveThisRound ? -1 : 1;
+                }
 
                 // Finally, sort by the most recent message.
                 return bch.LastMessage.CompareTo(ach.LastMessage);
             };
 
+
             Bans.OnPressed += _ =>
             {
                 if (_currentPlayer is not null)
@@ -253,7 +278,20 @@ private void SwitchToChannel(NetUserId? ch)
 
         public void PopulateList()
         {
+            // Maintain existing pin statuses
+            var pinnedPlayers = ChannelSelector.PlayerInfo.Where(p => p.IsPinned).ToDictionary(p => p.SessionId);
+
             ChannelSelector.PopulateList();
+
+            // Restore pin statuses
+            foreach (var player in ChannelSelector.PlayerInfo)
+            {
+                if (pinnedPlayers.TryGetValue(player.SessionId, out var pinnedPlayer))
+                {
+                    player.IsPinned = pinnedPlayer.IsPinned;
+                }
+            }
+
             UpdateButtons();
         }
     }
diff --git a/Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs b/Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs
index 30f9d24df1d..e8653843c74 100644
--- a/Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs
@@ -30,7 +30,11 @@ public BwoinkWindow()
                 }
             };
 
-            OnOpen += () => Bwoink.PopulateList();
+            OnOpen += () =>
+            {
+                Bwoink.ChannelSelector.StopFiltering();
+                Bwoink.PopulateList();
+            };
         }
     }
 }
diff --git a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
index 12522d552d7..c7fbf6c2dc0 100644
--- a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
+++ b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
@@ -4,154 +4,166 @@
 using Content.Client.Verbs.UI;
 using Content.Shared.Administration;
 using Robust.Client.AutoGenerated;
+using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Input;
+using Robust.Shared.Utility;
 
-namespace Content.Client.Administration.UI.CustomControls
+namespace Content.Client.Administration.UI.CustomControls;
+
+[GenerateTypedNameReferences]
+public sealed partial class PlayerListControl : BoxContainer
 {
-    [GenerateTypedNameReferences]
-    public sealed partial class PlayerListControl : BoxContainer
-    {
-        private readonly AdminSystem _adminSystem;
+    private readonly AdminSystem _adminSystem;
 
-        private List<PlayerInfo> _playerList = new();
-        private readonly List<PlayerInfo> _sortedPlayerList = new();
+    private readonly IEntityManager _entManager;
+    private readonly IUserInterfaceManager _uiManager;
 
-        public event Action<PlayerInfo?>? OnSelectionChanged;
-        public IReadOnlyList<PlayerInfo> PlayerInfo => _playerList;
+    private PlayerInfo? _selectedPlayer;
 
-        public Func<PlayerInfo, string, string>? OverrideText;
-        public Comparison<PlayerInfo>? Comparison;
+    private List<PlayerInfo> _playerList = new();
+    private List<PlayerInfo> _sortedPlayerList = new();
 
-        private IEntityManager _entManager;
-        private IUserInterfaceManager _uiManager;
+    public Comparison<PlayerInfo>? Comparison;
+    public Func<PlayerInfo, string, string>? OverrideText;
 
-        private PlayerInfo? _selectedPlayer;
+    public PlayerListControl()
+    {
+        _entManager = IoCManager.Resolve<IEntityManager>();
+        _uiManager = IoCManager.Resolve<IUserInterfaceManager>();
+        _adminSystem = _entManager.System<AdminSystem>();
+        RobustXamlLoader.Load(this);
+        // Fill the Option data
+        PlayerListContainer.ItemPressed += PlayerListItemPressed;
+        PlayerListContainer.ItemKeyBindDown += PlayerListItemKeyBindDown;
+        PlayerListContainer.GenerateItem += GenerateButton;
+        PlayerListContainer.NoItemSelected += PlayerListNoItemSelected;
+        PopulateList(_adminSystem.PlayerList);
+        FilterLineEdit.OnTextChanged += _ => FilterList();
+        _adminSystem.PlayerListChanged += PopulateList;
+        BackgroundPanel.PanelOverride = new StyleBoxFlat { BackgroundColor = new Color(32, 32, 40) };
+    }
 
-        public PlayerListControl()
-        {
-            _entManager = IoCManager.Resolve<IEntityManager>();
-            _uiManager = IoCManager.Resolve<IUserInterfaceManager>();
-            _adminSystem = _entManager.System<AdminSystem>();
-            RobustXamlLoader.Load(this);
-            // Fill the Option data
-            PlayerListContainer.ItemPressed += PlayerListItemPressed;
-            PlayerListContainer.ItemKeyBindDown += PlayerListItemKeyBindDown;
-            PlayerListContainer.GenerateItem += GenerateButton;
-            PlayerListContainer.NoItemSelected += PlayerListNoItemSelected;
-            PopulateList(_adminSystem.PlayerList);
-            FilterLineEdit.OnTextChanged += _ => FilterList();
-            _adminSystem.PlayerListChanged += PopulateList;
-            BackgroundPanel.PanelOverride = new StyleBoxFlat {BackgroundColor = new Color(32, 32, 40)};
-        }
+    public IReadOnlyList<PlayerInfo> PlayerInfo => _playerList;
 
-        private void PlayerListNoItemSelected()
-        {
-            _selectedPlayer = null;
-            OnSelectionChanged?.Invoke(null);
-        }
+    public event Action<PlayerInfo?>? OnSelectionChanged;
 
-        private void PlayerListItemPressed(BaseButton.ButtonEventArgs? args, ListData? data)
-        {
-            if (args == null || data is not PlayerListData {Info: var selectedPlayer})
-                return;
+    private void PlayerListNoItemSelected()
+    {
+        _selectedPlayer = null;
+        OnSelectionChanged?.Invoke(null);
+    }
 
-            if (selectedPlayer == _selectedPlayer)
-                return;
+    private void PlayerListItemPressed(BaseButton.ButtonEventArgs? args, ListData? data)
+    {
+        if (args == null || data is not PlayerListData { Info: var selectedPlayer })
+            return;
 
-            if (args.Event.Function != EngineKeyFunctions.UIClick)
-                return;
+        if (selectedPlayer == _selectedPlayer)
+            return;
 
-            OnSelectionChanged?.Invoke(selectedPlayer);
-            _selectedPlayer = selectedPlayer;
+        if (args.Event.Function != EngineKeyFunctions.UIClick)
+            return;
 
-            // 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)
-                label.Text = GetText(selectedPlayer);
-        }
+        OnSelectionChanged?.Invoke(selectedPlayer);
+        _selectedPlayer = selectedPlayer;
 
-        private void PlayerListItemKeyBindDown(GUIBoundKeyEventArgs? args, ListData? data)
-        {
-            if (args == null || data is not PlayerListData { Info: var selectedPlayer })
-                return;
+        // 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)
+            label.Text = GetText(selectedPlayer);
+    }
 
-            if (args.Function != EngineKeyFunctions.UIRightClick || selectedPlayer.NetEntity == null)
-                return;
+    private void PlayerListItemKeyBindDown(GUIBoundKeyEventArgs? args, ListData? data)
+    {
+        if (args == null || data is not PlayerListData { Info: var selectedPlayer })
+            return;
 
-            _uiManager.GetUIController<VerbMenuUIController>().OpenVerbMenu(selectedPlayer.NetEntity.Value, true);
-            args.Handle();
-        }
+        if (args.Function != EngineKeyFunctions.UIRightClick || selectedPlayer.NetEntity == null)
+            return;
+
+        _uiManager.GetUIController<VerbMenuUIController>().OpenVerbMenu(selectedPlayer.NetEntity.Value, true);
+        args.Handle();
+    }
+
+    public void StopFiltering()
+    {
+        FilterLineEdit.Text = string.Empty;
+    }
 
-        public void StopFiltering()
+    private void FilterList()
+    {
+        _sortedPlayerList.Clear();
+        foreach (var info in _playerList)
         {
-            FilterLineEdit.Text = string.Empty;
+            var displayName = $"{info.CharacterName} ({info.Username})";
+            if (info.IdentityName != info.CharacterName)
+                displayName += $" [{info.IdentityName}]";
+            if (!string.IsNullOrEmpty(FilterLineEdit.Text)
+                && !displayName.ToLowerInvariant().Contains(FilterLineEdit.Text.Trim().ToLowerInvariant()))
+                continue;
+            _sortedPlayerList.Add(info);
         }
 
-        private void FilterList()
-        {
-            _sortedPlayerList.Clear();
-            foreach (var info in _playerList)
-            {
-                var displayName = $"{info.CharacterName} ({info.Username})";
-                if (info.IdentityName != info.CharacterName)
-                    displayName += $" [{info.IdentityName}]";
-                if (!string.IsNullOrEmpty(FilterLineEdit.Text)
-                    && !displayName.ToLowerInvariant().Contains(FilterLineEdit.Text.Trim().ToLowerInvariant()))
-                    continue;
-                _sortedPlayerList.Add(info);
-            }
+        if (Comparison != null)
+            _sortedPlayerList.Sort((a, b) => Comparison(a, b));
 
-            if (Comparison != null)
-                _sortedPlayerList.Sort((a, b) => Comparison(a, b));
+        PlayerListContainer.PopulateList(_sortedPlayerList.Select(info => new PlayerListData(info)).ToList());
+        if (_selectedPlayer != null)
+            PlayerListContainer.Select(new PlayerListData(_selectedPlayer));
+    }
 
-            PlayerListContainer.PopulateList(_sortedPlayerList.Select(info => new PlayerListData(info)).ToList());
-            if (_selectedPlayer != null)
-                PlayerListContainer.Select(new PlayerListData(_selectedPlayer));
-        }
 
-        public void PopulateList(IReadOnlyList<PlayerInfo>? players = null)
-        {
-            players ??= _adminSystem.PlayerList;
+    public void PopulateList(IReadOnlyList<PlayerInfo>? players = null)
+    {
+        // Maintain existing pin statuses
+        var pinnedPlayers = _playerList.Where(p => p.IsPinned).ToDictionary(p => p.SessionId);
 
-            _playerList = players.ToList();
-            if (_selectedPlayer != null && !_playerList.Contains(_selectedPlayer))
-                _selectedPlayer = null;
+        players ??= _adminSystem.PlayerList;
 
-            FilterList();
-        }
+        _playerList = players.ToList();
 
-        private string GetText(PlayerInfo info)
+        // Restore pin statuses
+        foreach (var player in _playerList)
         {
-            var text = $"{info.CharacterName} ({info.Username})";
-            if (OverrideText != null)
-                text = OverrideText.Invoke(info, text);
-            return text;
+            if (pinnedPlayers.TryGetValue(player.SessionId, out var pinnedPlayer))
+            {
+                player.IsPinned = pinnedPlayer.IsPinned;
+            }
         }
 
-        private void GenerateButton(ListData data, ListContainerButton button)
-        {
-            if (data is not PlayerListData { Info: var info })
-                return;
+        if (_selectedPlayer != null && !_playerList.Contains(_selectedPlayer))
+            _selectedPlayer = null;
 
-            button.AddChild(new BoxContainer
-            {
-                Orientation = LayoutOrientation.Vertical,
-                Children =
-                {
-                    new Label
-                    {
-                        ClipText = true,
-                        Text = GetText(info)
-                    }
-                }
-            });
-
-            button.AddStyleClass(ListContainer.StyleClassListContainerButton);
-        }
+        FilterList();
+    }
+
+
+    private string GetText(PlayerInfo info)
+    {
+        var text = $"{info.CharacterName} ({info.Username})";
+        if (OverrideText != null)
+            text = OverrideText.Invoke(info, text);
+        return text;
     }
 
-    public record PlayerListData(PlayerInfo Info) : ListData;
+    private void GenerateButton(ListData data, ListContainerButton button)
+    {
+        if (data is not PlayerListData { Info: var info })
+            return;
+
+        var entry = new PlayerListEntry();
+        entry.Setup(info, OverrideText);
+        entry.OnPinStatusChanged += _ =>
+        {
+            FilterList();
+        };
+
+        button.AddChild(entry);
+        button.AddStyleClass(ListContainer.StyleClassListContainerButton);
+    }
 }
+
+public record PlayerListData(PlayerInfo Info) : ListData;
diff --git a/Content.Client/Administration/UI/CustomControls/PlayerListEntry.xaml b/Content.Client/Administration/UI/CustomControls/PlayerListEntry.xaml
new file mode 100644
index 00000000000..af13ccc0e09
--- /dev/null
+++ b/Content.Client/Administration/UI/CustomControls/PlayerListEntry.xaml
@@ -0,0 +1,6 @@
+<BoxContainer xmlns="https://spacestation14.io"
+              Orientation="Horizontal" HorizontalExpand="true">
+    <Label Name="PlayerEntryLabel" Text="" ClipText="True" HorizontalExpand="True" />
+    <TextureButton Name="PlayerEntryPinButton"
+                   HorizontalAlignment="Right" />
+</BoxContainer>
diff --git a/Content.Client/Administration/UI/CustomControls/PlayerListEntry.xaml.cs b/Content.Client/Administration/UI/CustomControls/PlayerListEntry.xaml.cs
new file mode 100644
index 00000000000..cd6a56ea71e
--- /dev/null
+++ b/Content.Client/Administration/UI/CustomControls/PlayerListEntry.xaml.cs
@@ -0,0 +1,58 @@
+using Content.Client.Stylesheets;
+using Content.Shared.Administration;
+using Robust.Client.AutoGenerated;
+using Robust.Client.GameObjects;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Administration.UI.CustomControls;
+
+[GenerateTypedNameReferences]
+public sealed partial class PlayerListEntry : BoxContainer
+{
+    public PlayerListEntry()
+    {
+        RobustXamlLoader.Load(this);
+    }
+
+    public event Action<PlayerInfo>? OnPinStatusChanged;
+
+    public void Setup(PlayerInfo info, Func<PlayerInfo, string, string>? overrideText)
+    {
+        Update(info, overrideText);
+        PlayerEntryPinButton.OnPressed += HandlePinButtonPressed(info);
+    }
+
+    private Action<BaseButton.ButtonEventArgs> HandlePinButtonPressed(PlayerInfo info)
+    {
+        return args =>
+        {
+            info.IsPinned = !info.IsPinned;
+            UpdatePinButtonTexture(info.IsPinned);
+            OnPinStatusChanged?.Invoke(info);
+        };
+    }
+
+    private void Update(PlayerInfo info, Func<PlayerInfo, string, string>? overrideText)
+    {
+        PlayerEntryLabel.Text = overrideText?.Invoke(info, $"{info.CharacterName} ({info.Username})") ??
+                                $"{info.CharacterName} ({info.Username})";
+
+        UpdatePinButtonTexture(info.IsPinned);
+    }
+
+    private void UpdatePinButtonTexture(bool isPinned)
+    {
+        if (isPinned)
+        {
+            PlayerEntryPinButton?.RemoveStyleClass(StyleNano.StyleClassPinButtonUnpinned);
+            PlayerEntryPinButton?.AddStyleClass(StyleNano.StyleClassPinButtonPinned);
+        }
+        else
+        {
+            PlayerEntryPinButton?.RemoveStyleClass(StyleNano.StyleClassPinButtonPinned);
+            PlayerEntryPinButton?.AddStyleClass(StyleNano.StyleClassPinButtonUnpinned);
+        }
+    }
+}
diff --git a/Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml b/Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml
index f978138ca58..4a3c0ef7ace 100644
--- a/Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml
+++ b/Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml
@@ -1,10 +1,10 @@
 <Popup xmlns="https://spacestation14.io"
        xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
-    <PanelContainer StyleClasses="BackgroundDark">
+    <PanelContainer>
         <PanelContainer.PanelOverride>
-            <gfx:StyleBoxFlat BorderThickness="1" BorderColor="#18181B"/>
+            <gfx:StyleBoxFlat BorderThickness="2" BorderColor="#18181B" BackgroundColor="#25252a"/>
         </PanelContainer.PanelOverride>
-        <BoxContainer Orientation="Vertical">
+        <BoxContainer Orientation="Vertical" Margin="4 4 4 4">
             <Label Name="PlayerNameLabel"/>
             <Label Name="IdLabel"/>
             <Label Name="TypeLabel"/>
diff --git a/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml b/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml
new file mode 100644
index 00000000000..8feec273b47
--- /dev/null
+++ b/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml
@@ -0,0 +1,36 @@
+<ui:FancyWindow
+    xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+    xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
+    Title="{Loc ban-panel-title}" MinSize="300 300">
+    <BoxContainer Orientation="Vertical">
+        <BoxContainer Orientation="Horizontal">
+        <Label Name="PlayerName"/>
+        <Button Name="UsernameCopyButton" Text="{Loc player-panel-copy-username}"/>
+        </BoxContainer>
+       <BoxContainer Orientation="Horizontal">
+           <Label Name="Whitelisted"/>
+           <controls:ConfirmButton Name="WhitelistToggle" Text="{Loc 'player-panel-false'}" Visible="False"></controls:ConfirmButton>
+       </BoxContainer>
+       <Label Name="Playtime"/>
+       <Label Name="Notes"/>
+       <Label Name="Bans"/>
+       <Label Name="RoleBans"/>
+       <Label Name="SharedConnections"/>
+
+       <BoxContainer Align="Center">
+           <GridContainer Rows="5">
+            <Button Name="NotesButton" Text="{Loc player-panel-show-notes}" SetWidth="136" Disabled="True"/>
+            <Button Name="AhelpButton" Text="{Loc player-panel-help}" Disabled="True"/>
+            <Button Name="FreezeButton" Text = "{Loc player-panel-freeze}" Disabled="True"/>
+            <controls:ConfirmButton Name="KickButton" Text="{Loc player-panel-kick}" Disabled="True"/>
+            <controls:ConfirmButton Name="DeleteButton" Text="{Loc player-panel-delete}" Disabled="True"/>
+            <Button Name="ShowBansButton" Text="{Loc player-panel-show-bans}" SetWidth="136" Disabled="True"/>
+            <Button Name="LogsButton" Text="{Loc player-panel-logs}" Disabled="True"/>
+            <Button Name="FreezeAndMuteToggleButton" Text="{Loc player-panel-freeze-and-mute}" Disabled="True"/>
+            <Button Name="BanButton" Text="{Loc player-panel-ban}" Disabled="True"/>
+            <controls:ConfirmButton Name="RejuvenateButton" Text="{Loc player-panel-rejuvenate}" Disabled="True"/>
+           </GridContainer>
+       </BoxContainer>
+    </BoxContainer>
+</ui:FancyWindow>
diff --git a/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml.cs b/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml.cs
new file mode 100644
index 00000000000..824d9eb6c77
--- /dev/null
+++ b/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml.cs
@@ -0,0 +1,132 @@
+using Content.Client.Administration.Managers;
+using Content.Client.UserInterface.Controls;
+using Content.Shared.Administration;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Network;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Administration.UI.PlayerPanel;
+
+[GenerateTypedNameReferences]
+public sealed partial class PlayerPanel : FancyWindow
+{
+    private readonly IClientAdminManager _adminManager;
+
+    public event Action<string>? OnUsernameCopy;
+    public event Action<NetUserId?>? OnOpenNotes;
+    public event Action<NetUserId?>? OnOpenBans;
+    public event Action<NetUserId?>? OnAhelp;
+    public event Action<string?>? OnKick;
+    public event Action<NetUserId?>? OnOpenBanPanel;
+    public event Action<NetUserId?, bool>? OnWhitelistToggle;
+    public event Action? OnFreezeAndMuteToggle;
+    public event Action? OnFreeze;
+    public event Action? OnLogs;
+    public event Action? OnDelete;
+    public event Action? OnRejuvenate;
+
+    public NetUserId? TargetPlayer;
+    public string? TargetUsername;
+    private bool _isWhitelisted;
+
+    public PlayerPanel(IClientAdminManager adminManager)
+    {
+            RobustXamlLoader.Load(this);
+            _adminManager = adminManager;
+
+            UsernameCopyButton.OnPressed += _ => OnUsernameCopy?.Invoke(PlayerName.Text ?? "");
+            BanButton.OnPressed += _ => OnOpenBanPanel?.Invoke(TargetPlayer);
+            KickButton.OnPressed += _ => OnKick?.Invoke(TargetUsername);
+            NotesButton.OnPressed += _ => OnOpenNotes?.Invoke(TargetPlayer);
+            ShowBansButton.OnPressed += _ => OnOpenBans?.Invoke(TargetPlayer);
+            AhelpButton.OnPressed += _ => OnAhelp?.Invoke(TargetPlayer);
+            WhitelistToggle.OnPressed += _ =>
+            {
+                OnWhitelistToggle?.Invoke(TargetPlayer, _isWhitelisted);
+                SetWhitelisted(!_isWhitelisted);
+            };
+            FreezeButton.OnPressed += _ => OnFreeze?.Invoke();
+            FreezeAndMuteToggleButton.OnPressed += _ => OnFreezeAndMuteToggle?.Invoke();
+            LogsButton.OnPressed += _ => OnLogs?.Invoke();
+            DeleteButton.OnPressed += _ => OnDelete?.Invoke();
+            RejuvenateButton.OnPressed += _ => OnRejuvenate?.Invoke();
+    }
+
+    public void SetUsername(string player)
+    {
+        Title = Loc.GetString("player-panel-title", ("player", player));
+        PlayerName.Text = Loc.GetString("player-panel-username", ("player", player));
+    }
+
+    public void SetWhitelisted(bool? whitelisted)
+    {
+        if (whitelisted == null)
+        {
+            Whitelisted.Text = null;
+            WhitelistToggle.Visible = false;
+        }
+        else
+        {
+            Whitelisted.Text = Loc.GetString("player-panel-whitelisted");
+            WhitelistToggle.Text = whitelisted.Value.ToString();
+            WhitelistToggle.Visible = true;
+            _isWhitelisted = whitelisted.Value;
+        }
+    }
+
+    public void SetBans(int? totalBans, int? totalRoleBans)
+    {
+        // If one value exists then so should the other.
+        DebugTools.Assert(totalBans.HasValue && totalRoleBans.HasValue || totalBans == null && totalRoleBans == null);
+
+        Bans.Text = totalBans != null ? Loc.GetString("player-panel-bans", ("totalBans", totalBans)) : null;
+
+        RoleBans.Text = totalRoleBans != null ? Loc.GetString("player-panel-rolebans", ("totalRoleBans", totalRoleBans)) : null;
+    }
+
+    public void SetNotes(int? totalNotes)
+    {
+        Notes.Text = totalNotes != null ? Loc.GetString("player-panel-notes", ("totalNotes", totalNotes)) : null;
+    }
+
+    public void SetSharedConnections(int sharedConnections)
+    {
+        SharedConnections.Text = Loc.GetString("player-panel-shared-connections", ("sharedConnections", sharedConnections));
+    }
+
+    public void SetPlaytime(TimeSpan playtime)
+    {
+        Playtime.Text = Loc.GetString("player-panel-playtime",
+            ("days", playtime.Days),
+            ("hours", playtime.Hours % 24),
+            ("minutes", playtime.Minutes % (24 * 60)));
+    }
+
+    public void SetFrozen(bool canFreeze, bool frozen)
+    {
+        FreezeAndMuteToggleButton.Disabled = !canFreeze;
+        FreezeButton.Disabled = !canFreeze || frozen;
+
+        FreezeAndMuteToggleButton.Text = Loc.GetString(!frozen ? "player-panel-freeze-and-mute" : "player-panel-unfreeze");
+    }
+
+    public void SetAhelp(bool canAhelp)
+    {
+        AhelpButton.Disabled = !canAhelp;
+    }
+
+    public void SetButtons()
+    {
+        BanButton.Disabled = !_adminManager.CanCommand("banpanel");
+        KickButton.Disabled = !_adminManager.CanCommand("kick");
+        NotesButton.Disabled = !_adminManager.CanCommand("adminnotes");
+        ShowBansButton.Disabled = !_adminManager.CanCommand("banlist");
+        WhitelistToggle.Disabled =
+            !(_adminManager.CanCommand("addwhitelist") && _adminManager.CanCommand("removewhitelist"));
+        LogsButton.Disabled = !_adminManager.CanCommand("adminlogs");
+        RejuvenateButton.Disabled = !_adminManager.HasFlag(AdminFlags.Debug);
+        DeleteButton.Disabled = !_adminManager.HasFlag(AdminFlags.Debug);
+    }
+}
diff --git a/Content.Client/Administration/UI/PlayerPanel/PlayerPanelEui.cs b/Content.Client/Administration/UI/PlayerPanel/PlayerPanelEui.cs
new file mode 100644
index 00000000000..87ce7560463
--- /dev/null
+++ b/Content.Client/Administration/UI/PlayerPanel/PlayerPanelEui.cs
@@ -0,0 +1,72 @@
+using Content.Client.Administration.Managers;
+using Content.Client.Eui;
+using Content.Shared.Administration;
+using Content.Shared.Eui;
+using JetBrains.Annotations;
+using Robust.Client.Console;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.Administration.UI.PlayerPanel;
+
+[UsedImplicitly]
+public sealed class PlayerPanelEui : BaseEui
+{
+    [Dependency] private readonly IClientConsoleHost _console = default!;
+    [Dependency] private readonly IClientAdminManager _admin = default!;
+    [Dependency] private readonly IClipboardManager _clipboard = default!;
+
+    private PlayerPanel PlayerPanel { get;  }
+
+    public PlayerPanelEui()
+    {
+        PlayerPanel = new PlayerPanel(_admin);
+
+        PlayerPanel.OnUsernameCopy += username => _clipboard.SetText(username);
+        PlayerPanel.OnOpenNotes += id => _console.ExecuteCommand($"adminnotes \"{id}\"");
+        // Kick command does not support GUIDs
+        PlayerPanel.OnKick += username => _console.ExecuteCommand($"kick \"{username}\"");
+        PlayerPanel.OnOpenBanPanel += id => _console.ExecuteCommand($"banpanel \"{id}\"");
+        PlayerPanel.OnOpenBans += id => _console.ExecuteCommand($"banlist \"{id}\"");
+        PlayerPanel.OnAhelp += id => _console.ExecuteCommand($"openahelp \"{id}\"");
+        PlayerPanel.OnWhitelistToggle += (id, whitelisted) =>
+        {
+            _console.ExecuteCommand(whitelisted ? $"whitelistremove \"{id}\"" : $"whitelistadd \"{id}\"");
+        };
+
+        PlayerPanel.OnFreezeAndMuteToggle += () => SendMessage(new PlayerPanelFreezeMessage(true));
+        PlayerPanel.OnFreeze += () => SendMessage(new PlayerPanelFreezeMessage());
+        PlayerPanel.OnLogs += () => SendMessage(new PlayerPanelLogsMessage());
+        PlayerPanel.OnRejuvenate += () => SendMessage(new PlayerPanelRejuvenationMessage());
+        PlayerPanel.OnDelete+= () => SendMessage(new PlayerPanelDeleteMessage());
+
+        PlayerPanel.OnClose += () => SendMessage(new CloseEuiMessage());
+    }
+
+    public override void Opened()
+    {
+        PlayerPanel.OpenCentered();
+    }
+
+    public override void Closed()
+    {
+        PlayerPanel.Close();
+    }
+
+    public override void HandleState(EuiStateBase state)
+    {
+        if (state is not PlayerPanelEuiState s)
+            return;
+
+        PlayerPanel.TargetPlayer = s.Guid;
+        PlayerPanel.TargetUsername = s.Username;
+        PlayerPanel.SetUsername(s.Username);
+        PlayerPanel.SetPlaytime(s.Playtime);
+        PlayerPanel.SetBans(s.TotalBans, s.TotalRoleBans);
+        PlayerPanel.SetNotes(s.TotalNotes);
+        PlayerPanel.SetWhitelisted(s.Whitelisted);
+        PlayerPanel.SetSharedConnections(s.SharedConnections);
+        PlayerPanel.SetFrozen(s.CanFreeze, s.Frozen);
+        PlayerPanel.SetAhelp(s.CanAhelp);
+        PlayerPanel.SetButtons();
+    }
+}
diff --git a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
index 78eefa34628..4b50771b0fe 100644
--- a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
@@ -1,20 +1,21 @@
+using Content.Client.Administration.Managers;
 using Content.Client.Station;
 using Content.Client.UserInterface.Controls;
 using Robust.Client.AutoGenerated;
+using Robust.Client.Console;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Map.Components;
-using Robust.Shared.Timing;
 
 namespace Content.Client.Administration.UI.Tabs.ObjectsTab;
 
 [GenerateTypedNameReferences]
 public sealed partial class ObjectsTab : Control
 {
+    [Dependency] private readonly IClientAdminManager _admin = default!;
     [Dependency] private readonly IEntityManager _entityManager = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IClientConsoleHost _console = default!;
 
     private readonly Color _altColor = Color.FromHex("#292B38");
     private readonly Color _defaultColor = Color.FromHex("#2F2F3B");
@@ -50,10 +51,20 @@ public ObjectsTab()
         RefreshListButton.OnPressed += _ => RefreshObjectList();
 
         var defaultSelection = ObjectsTabSelection.Grids;
-        ObjectTypeOptions.SelectId((int) defaultSelection);
+        ObjectTypeOptions.SelectId((int)defaultSelection);
         RefreshObjectList(defaultSelection);
     }
 
+    private void TeleportTo(NetEntity nent)
+    {
+        _console.ExecuteCommand($"tpto {nent}");
+    }
+
+    private void Delete(NetEntity nent)
+    {
+        _console.ExecuteCommand($"delete {nent}");
+    }
+
     public void RefreshObjectList()
     {
         RefreshObjectList(_selections[ObjectTypeOptions.SelectedId]);
@@ -117,9 +128,9 @@ private void GenerateButton(ListData data, ListContainerButton button)
         if (data is not ObjectsListData { Info: var info, BackgroundColor: var backgroundColor })
             return;
 
-        var entry = new ObjectsTabEntry(info.Name,
-            info.Entity,
-            new StyleBoxFlat { BackgroundColor = backgroundColor });
+        var entry = new ObjectsTabEntry(_admin, info.Name, info.Entity, new StyleBoxFlat { BackgroundColor = backgroundColor });
+        entry.OnTeleport += TeleportTo;
+        entry.OnDelete += Delete;
         button.ToolTip = $"{info.Name}, {info.Entity}";
 
         button.AddChild(entry);
diff --git a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml
index 83c4cc5697f..c561125a30c 100644
--- a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml
+++ b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml
@@ -5,13 +5,25 @@
                   HorizontalExpand="True"
                   SeparationOverride="4">
         <Label Name="NameLabel"
-               SizeFlagsStretchRatio="3"
+               SizeFlagsStretchRatio="5"
                HorizontalExpand="True"
                ClipText="True"/>
         <customControls:VSeparator/>
         <Label Name="EIDLabel"
+               SizeFlagsStretchRatio="5"
+               HorizontalExpand="True"
+               ClipText="True"/>
+        <customControls:VSeparator/>
+        <Button Name="TeleportButton"
+                Text="{Loc object-tab-entity-teleport}"
                SizeFlagsStretchRatio="3"
                HorizontalExpand="True"
                ClipText="True"/>
+        <customControls:VSeparator/>
+        <Button Name="DeleteButton"
+                Text="{Loc object-tab-entity-delete}"
+                SizeFlagsStretchRatio="3"
+                HorizontalExpand="True"
+                ClipText="True"/>
     </BoxContainer>
 </PanelContainer>
diff --git a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml.cs b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml.cs
index aab06c6ccd0..29774bb587e 100644
--- a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml.cs
@@ -1,4 +1,5 @@
-using Robust.Client.AutoGenerated;
+using Content.Client.Administration.Managers;
+using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
@@ -10,12 +11,22 @@ public sealed partial class ObjectsTabEntry : PanelContainer
 {
     public NetEntity AssocEntity;
 
-    public ObjectsTabEntry(string name, NetEntity nent, StyleBox styleBox)
+    public Action<NetEntity>? OnTeleport;
+    public Action<NetEntity>? OnDelete;
+
+    public ObjectsTabEntry(IClientAdminManager manager, string name, NetEntity nent, StyleBox styleBox)
     {
         RobustXamlLoader.Load(this);
+
         AssocEntity = nent;
         EIDLabel.Text = nent.ToString();
         NameLabel.Text = name;
         BackgroundColorPanel.PanelOverride = styleBox;
+
+        TeleportButton.Disabled = !manager.CanCommand("tpto");
+        DeleteButton.Disabled = !manager.CanCommand("delete");
+
+        TeleportButton.OnPressed += _ => OnTeleport?.Invoke(nent);
+        DeleteButton.OnPressed += _ => OnDelete?.Invoke(nent);
     }
 }
diff --git a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabHeader.xaml b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabHeader.xaml
index 71a1f5c7bc6..2cc7d76180e 100644
--- a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabHeader.xaml
+++ b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabHeader.xaml
@@ -5,17 +5,23 @@
                   HorizontalExpand="True"
                   SeparationOverride="4">
         <Label Name="ObjectNameLabel"
-               SizeFlagsStretchRatio="3"
+               SizeFlagsStretchRatio="5"
                HorizontalExpand="True"
                ClipText="True"
                Text="{Loc object-tab-object-name}"
                MouseFilter="Pass"/>
         <cc:VSeparator/>
         <Label Name="EntityIDLabel"
-               SizeFlagsStretchRatio="3"
+               SizeFlagsStretchRatio="5"
                HorizontalExpand="True"
                ClipText="True"
                Text="{Loc object-tab-entity-id}"
                MouseFilter="Pass"/>
+        <Label Name="EntityTeleportLabel"
+               SizeFlagsStretchRatio="3"
+               HorizontalExpand="True"/>
+        <Label Name="EntityDeleteLabel"
+               SizeFlagsStretchRatio="3"
+               HorizontalExpand="True"/>
     </BoxContainer>
 </Control>
diff --git a/Content.Client/Alerts/ClientAlertsSystem.cs b/Content.Client/Alerts/ClientAlertsSystem.cs
index 359c8957f9d..525ef1f018f 100644
--- a/Content.Client/Alerts/ClientAlertsSystem.cs
+++ b/Content.Client/Alerts/ClientAlertsSystem.cs
@@ -93,6 +93,6 @@ private void OnPlayerDetached(EntityUid uid, AlertsComponent component, LocalPla
 
     public void AlertClicked(ProtoId<AlertPrototype> alertType)
     {
-        RaiseNetworkEvent(new ClickAlertEvent(alertType));
+        RaisePredictiveEvent(new ClickAlertEvent(alertType));
     }
 }
diff --git a/Content.Client/Ame/UI/AmeControllerBoundUserInterface.cs b/Content.Client/Ame/UI/AmeControllerBoundUserInterface.cs
index e84cf5d34de..3d65f751899 100644
--- a/Content.Client/Ame/UI/AmeControllerBoundUserInterface.cs
+++ b/Content.Client/Ame/UI/AmeControllerBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Ame.Components;
 using JetBrains.Annotations;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Ame.UI
 {
@@ -16,9 +17,8 @@ protected override void Open()
         {
             base.Open();
 
-            _window = new AmeWindow(this);
-            _window.OnClose += Close;
-            _window.OpenCentered();
+            _window = this.CreateWindow<AmeWindow>();
+            _window.OnAmeButton += ButtonPressed;
         }
 
         /// <summary>
@@ -40,15 +40,5 @@ public void ButtonPressed(UiButton button)
         {
             SendMessage(new UiButtonPressedMessage(button));
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            if (disposing)
-            {
-                _window?.Dispose();
-            }
-        }
     }
 }
diff --git a/Content.Client/Ame/UI/AmeWindow.xaml.cs b/Content.Client/Ame/UI/AmeWindow.xaml.cs
index 8b91ec59660..d6d580bcdaf 100644
--- a/Content.Client/Ame/UI/AmeWindow.xaml.cs
+++ b/Content.Client/Ame/UI/AmeWindow.xaml.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Client.UserInterface;
 using Content.Shared.Ame.Components;
 using Robust.Client.AutoGenerated;
@@ -9,15 +10,17 @@ namespace Content.Client.Ame.UI
     [GenerateTypedNameReferences]
     public sealed partial class AmeWindow : DefaultWindow
     {
-        public AmeWindow(AmeControllerBoundUserInterface ui)
+        public event Action<UiButton>? OnAmeButton;
+
+        public AmeWindow()
         {
             RobustXamlLoader.Load(this);
             IoCManager.InjectDependencies(this);
 
-            EjectButton.OnPressed += _ => ui.ButtonPressed(UiButton.Eject);
-            ToggleInjection.OnPressed += _ => ui.ButtonPressed(UiButton.ToggleInjection);
-            IncreaseFuelButton.OnPressed += _ => ui.ButtonPressed(UiButton.IncreaseFuel);
-            DecreaseFuelButton.OnPressed += _ => ui.ButtonPressed(UiButton.DecreaseFuel);
+            EjectButton.OnPressed += _ => OnAmeButton?.Invoke(UiButton.Eject);
+            ToggleInjection.OnPressed += _ => OnAmeButton?.Invoke(UiButton.ToggleInjection);
+            IncreaseFuelButton.OnPressed += _ => OnAmeButton?.Invoke(UiButton.IncreaseFuel);
+            DecreaseFuelButton.OnPressed += _ => OnAmeButton?.Invoke(UiButton.DecreaseFuel);
         }
 
         /// <summary>
@@ -29,7 +32,7 @@ public void UpdateState(BoundUserInterfaceState state)
             var castState = (AmeControllerBoundUserInterfaceState) state;
 
             // Disable all buttons if not powered
-            if (Contents.Children != null)
+            if (Contents.Children.Any())
             {
                 ButtonHelpers.SetButtonDisabledRecursive(Contents, !castState.HasPower);
                 EjectButton.Disabled = false;
@@ -65,8 +68,8 @@ public void UpdateState(BoundUserInterfaceState state)
             CoreCount.Text = $"{castState.CoreCount}";
             InjectionAmount.Text = $"{castState.InjectionAmount}";
             // format power statistics to pretty numbers
-            CurrentPowerSupply.Text = $"{castState.CurrentPowerSupply.ToString("N1")}";
-            TargetedPowerSupply.Text = $"{castState.TargetedPowerSupply.ToString("N1")}";
+            CurrentPowerSupply.Text = $"{castState.CurrentPowerSupply:N1}";
+            TargetedPowerSupply.Text = $"{castState.TargetedPowerSupply:N1}";
         }
     }
 }
diff --git a/Content.Client/Anomaly/Ui/AnomalyGeneratorBoundUserInterface.cs b/Content.Client/Anomaly/Ui/AnomalyGeneratorBoundUserInterface.cs
index 5764d0a097d..5d1985485c4 100644
--- a/Content.Client/Anomaly/Ui/AnomalyGeneratorBoundUserInterface.cs
+++ b/Content.Client/Anomaly/Ui/AnomalyGeneratorBoundUserInterface.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Gravity;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Anomaly.Ui;
 
@@ -18,10 +19,8 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new(Owner);
-
-        _window.OpenCentered();
-        _window.OnClose += Close;
+        _window = this.CreateWindow<AnomalyGeneratorWindow>();
+        _window.SetEntity(Owner);
 
         _window.OnGenerateButtonPressed += () =>
         {
@@ -37,18 +36,5 @@ protected override void UpdateState(BoundUserInterfaceState state)
             return;
         _window?.UpdateState(msg);
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing) return;
-
-        _window?.Dispose();
-    }
-
-    public void SetPowerSwitch(bool on)
-    {
-        SendMessage(new SharedGravityGeneratorComponent.SwitchGeneratorMessage(on));
-    }
 }
 
diff --git a/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs b/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs
index 08438e2a1b2..82d41192dd0 100644
--- a/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs
+++ b/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs
@@ -18,17 +18,21 @@ public sealed partial class AnomalyGeneratorWindow : FancyWindow
 
     public Action? OnGenerateButtonPressed;
 
-    public AnomalyGeneratorWindow(EntityUid gen)
+    public AnomalyGeneratorWindow()
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
 
-        EntityView.SetEntity(gen);
         EntityView.SpriteOffset = false;
 
         GenerateButton.OnPressed += _ => OnGenerateButtonPressed?.Invoke();
     }
 
+    public void SetEntity(EntityUid uid)
+    {
+        EntityView.SetEntity(uid);
+    }
+
     public void UpdateState(AnomalyGeneratorUserInterfaceState state)
     {
         _cooldownEnd = state.CooldownEndTime;
diff --git a/Content.Client/Arcade/BlockGameMenu.cs b/Content.Client/Arcade/BlockGameMenu.cs
index eeda2a31020..ad360c54394 100644
--- a/Content.Client/Arcade/BlockGameMenu.cs
+++ b/Content.Client/Arcade/BlockGameMenu.cs
@@ -28,8 +28,6 @@ public sealed class BlockGameMenu : DefaultWindow
 
         private static readonly Vector2 BlockSize = new(15, 15);
 
-        private readonly BlockGameBoundUserInterface _owner;
-
         private readonly PanelContainer _mainPanel;
 
         private readonly BoxContainer _gameRootContainer;
@@ -58,10 +56,11 @@ public sealed class BlockGameMenu : DefaultWindow
         private bool _isPlayer = false;
         private bool _gameOver = false;
 
-        public BlockGameMenu(BlockGameBoundUserInterface owner)
+        public event Action<BlockGamePlayerAction>? OnAction;
+
+        public BlockGameMenu()
         {
             Title = Loc.GetString("blockgame-menu-title");
-            _owner = owner;
 
             MinSize = SetSize = new Vector2(410, 490);
 
@@ -176,7 +175,7 @@ public BlockGameMenu(BlockGameBoundUserInterface owner)
             };
             _newGameButton.OnPressed += (e) =>
             {
-                _owner.SendAction(BlockGamePlayerAction.NewGame);
+                OnAction?.Invoke(BlockGamePlayerAction.NewGame);
             };
             pauseMenuContainer.AddChild(_newGameButton);
             pauseMenuContainer.AddChild(new Control { MinSize = new Vector2(1, 10) });
@@ -186,7 +185,10 @@ public BlockGameMenu(BlockGameBoundUserInterface owner)
                 Text = Loc.GetString("blockgame-menu-button-scoreboard"),
                 TextAlign = Label.AlignMode.Center
             };
-            _scoreBoardButton.OnPressed += (e) => _owner.SendAction(BlockGamePlayerAction.ShowHighscores);
+            _scoreBoardButton.OnPressed += (e) =>
+            {
+                OnAction?.Invoke(BlockGamePlayerAction.ShowHighscores);
+            };
             pauseMenuContainer.AddChild(_scoreBoardButton);
             _unpauseButtonMargin = new Control { MinSize = new Vector2(1, 10), Visible = false };
             pauseMenuContainer.AddChild(_unpauseButtonMargin);
@@ -199,7 +201,7 @@ public BlockGameMenu(BlockGameBoundUserInterface owner)
             };
             _unpauseButton.OnPressed += (e) =>
             {
-                _owner.SendAction(BlockGamePlayerAction.Unpause);
+                OnAction?.Invoke(BlockGamePlayerAction.Unpause);
             };
             pauseMenuContainer.AddChild(_unpauseButton);
 
@@ -257,7 +259,7 @@ public BlockGameMenu(BlockGameBoundUserInterface owner)
             };
             _finalNewGameButton.OnPressed += (e) =>
             {
-                _owner.SendAction(BlockGamePlayerAction.NewGame);
+                OnAction?.Invoke(BlockGamePlayerAction.NewGame);
             };
             gameOverMenuContainer.AddChild(_finalNewGameButton);
 
@@ -327,7 +329,10 @@ public BlockGameMenu(BlockGameBoundUserInterface owner)
                 Text = Loc.GetString("blockgame-menu-button-back"),
                 TextAlign = Label.AlignMode.Center
             };
-            _highscoreBackButton.OnPressed += (e) => _owner.SendAction(BlockGamePlayerAction.Pause);
+            _highscoreBackButton.OnPressed += (e) =>
+            {
+                OnAction?.Invoke(BlockGamePlayerAction.Pause);
+            };
             menuContainer.AddChild(_highscoreBackButton);
 
             menuInnerPanel.AddChild(menuContainer);
@@ -375,7 +380,7 @@ private Control SetupGameGrid(Texture panelTex)
             {
                 PanelOverride = back,
                 HorizontalExpand = true,
-                SizeFlagsStretchRatio = 60
+                SizeFlagsStretchRatio = 34.25f
             };
             var backgroundPanel = new PanelContainer
             {
@@ -473,7 +478,7 @@ protected override void KeyboardFocusExited()
 
         private void TryPause()
         {
-            _owner.SendAction(BlockGamePlayerAction.Pause);
+            OnAction?.Invoke(BlockGamePlayerAction.Pause);
         }
 
         public void SetStarted()
@@ -576,19 +581,19 @@ protected override void KeyBindDown(GUIBoundKeyEventArgs args)
                 return;
 
             else if (args.Function == ContentKeyFunctions.ArcadeLeft)
-                _owner.SendAction(BlockGamePlayerAction.StartLeft);
+                OnAction?.Invoke(BlockGamePlayerAction.StartLeft);
             else if (args.Function == ContentKeyFunctions.ArcadeRight)
-                _owner.SendAction(BlockGamePlayerAction.StartRight);
+                OnAction?.Invoke(BlockGamePlayerAction.StartRight);
             else if (args.Function == ContentKeyFunctions.ArcadeUp)
-                _owner.SendAction(BlockGamePlayerAction.Rotate);
+                OnAction?.Invoke(BlockGamePlayerAction.Rotate);
             else if (args.Function == ContentKeyFunctions.Arcade3)
-                _owner.SendAction(BlockGamePlayerAction.CounterRotate);
+                OnAction?.Invoke(BlockGamePlayerAction.CounterRotate);
             else if (args.Function == ContentKeyFunctions.ArcadeDown)
-                _owner.SendAction(BlockGamePlayerAction.SoftdropStart);
+                OnAction?.Invoke(BlockGamePlayerAction.SoftdropStart);
             else if (args.Function == ContentKeyFunctions.Arcade2)
-                _owner.SendAction(BlockGamePlayerAction.Hold);
+                OnAction?.Invoke(BlockGamePlayerAction.Hold);
             else if (args.Function == ContentKeyFunctions.Arcade1)
-                _owner.SendAction(BlockGamePlayerAction.Harddrop);
+                OnAction?.Invoke(BlockGamePlayerAction.Harddrop);
         }
 
         protected override void KeyBindUp(GUIBoundKeyEventArgs args)
@@ -599,11 +604,11 @@ protected override void KeyBindUp(GUIBoundKeyEventArgs args)
                 return;
 
             else if (args.Function == ContentKeyFunctions.ArcadeLeft)
-                _owner.SendAction(BlockGamePlayerAction.EndLeft);
+                OnAction?.Invoke(BlockGamePlayerAction.EndLeft);
             else if (args.Function == ContentKeyFunctions.ArcadeRight)
-                _owner.SendAction(BlockGamePlayerAction.EndRight);
+                OnAction?.Invoke(BlockGamePlayerAction.EndRight);
             else if (args.Function == ContentKeyFunctions.ArcadeDown)
-                _owner.SendAction(BlockGamePlayerAction.SoftdropEnd);
+                OnAction?.Invoke(BlockGamePlayerAction.SoftdropEnd);
         }
 
         public void UpdateNextBlock(BlockGameBlock[] blocks)
diff --git a/Content.Client/Arcade/SpaceVillainArcadeMenu.cs b/Content.Client/Arcade/SpaceVillainArcadeMenu.cs
index e5542a5848e..1ee4c268184 100644
--- a/Content.Client/Arcade/SpaceVillainArcadeMenu.cs
+++ b/Content.Client/Arcade/SpaceVillainArcadeMenu.cs
@@ -8,8 +8,6 @@ namespace Content.Client.Arcade
 {
     public sealed class SpaceVillainArcadeMenu : DefaultWindow
     {
-        public SpaceVillainArcadeBoundUserInterface Owner { get; set; }
-
         private readonly Label _enemyNameLabel;
         private readonly Label _playerInfoLabel;
         private readonly Label _enemyInfoLabel;
@@ -17,11 +15,13 @@ public sealed class SpaceVillainArcadeMenu : DefaultWindow
         private readonly Label _enemyActionLabel;
 
         private readonly Button[] _gameButtons = new Button[3]; //used to disable/enable all game buttons
-        public SpaceVillainArcadeMenu(SpaceVillainArcadeBoundUserInterface owner)
+
+        public event Action<SharedSpaceVillainArcadeComponent.PlayerAction>? OnPlayerAction;
+
+        public SpaceVillainArcadeMenu()
         {
             MinSize = SetSize = new Vector2(300, 225);
             Title = Loc.GetString("spacevillain-menu-title");
-            Owner = owner;
 
             var grid = new GridContainer { Columns = 1 };
 
@@ -47,32 +47,43 @@ public SpaceVillainArcadeMenu(SpaceVillainArcadeBoundUserInterface owner)
             grid.AddChild(_enemyActionLabel);
 
             var buttonGrid = new GridContainer { Columns = 3 };
-            _gameButtons[0] = new ActionButton(Owner, SharedSpaceVillainArcadeComponent.PlayerAction.Attack)
+            _gameButtons[0] = new Button()
             {
                 Text = Loc.GetString("spacevillain-menu-button-attack")
             };
+
+            _gameButtons[0].OnPressed +=
+                _ => OnPlayerAction?.Invoke(SharedSpaceVillainArcadeComponent.PlayerAction.Attack);
             buttonGrid.AddChild(_gameButtons[0]);
 
-            _gameButtons[1] = new ActionButton(Owner, SharedSpaceVillainArcadeComponent.PlayerAction.Heal)
+            _gameButtons[1] = new Button()
             {
                 Text = Loc.GetString("spacevillain-menu-button-heal")
             };
+
+            _gameButtons[1].OnPressed +=
+                _ => OnPlayerAction?.Invoke(SharedSpaceVillainArcadeComponent.PlayerAction.Heal);
             buttonGrid.AddChild(_gameButtons[1]);
 
-            _gameButtons[2] = new ActionButton(Owner, SharedSpaceVillainArcadeComponent.PlayerAction.Recharge)
+            _gameButtons[2] = new Button()
             {
                 Text = Loc.GetString("spacevillain-menu-button-recharge")
             };
+
+            _gameButtons[2].OnPressed +=
+                _ => OnPlayerAction?.Invoke(SharedSpaceVillainArcadeComponent.PlayerAction.Recharge);
             buttonGrid.AddChild(_gameButtons[2]);
 
             centerContainer = new CenterContainer();
             centerContainer.AddChild(buttonGrid);
             grid.AddChild(centerContainer);
 
-            var newGame = new ActionButton(Owner, SharedSpaceVillainArcadeComponent.PlayerAction.NewGame)
+            var newGame = new Button()
             {
                 Text = Loc.GetString("spacevillain-menu-button-new-game")
             };
+
+            newGame.OnPressed += _ => OnPlayerAction?.Invoke(SharedSpaceVillainArcadeComponent.PlayerAction.NewGame);
             grid.AddChild(newGame);
 
             Contents.AddChild(grid);
@@ -99,23 +110,5 @@ public void UpdateInfo(SharedSpaceVillainArcadeComponent.SpaceVillainArcadeDataU
             _playerActionLabel.Text = message.PlayerActionMessage;
             _enemyActionLabel.Text = message.EnemyActionMessage;
         }
-
-        private sealed class ActionButton : Button
-        {
-            private readonly SpaceVillainArcadeBoundUserInterface _owner;
-            private readonly SharedSpaceVillainArcadeComponent.PlayerAction _playerAction;
-
-            public ActionButton(SpaceVillainArcadeBoundUserInterface owner, SharedSpaceVillainArcadeComponent.PlayerAction playerAction)
-            {
-                _owner = owner;
-                _playerAction = playerAction;
-                OnPressed += Clicked;
-            }
-
-            private void Clicked(ButtonEventArgs e)
-            {
-                _owner.SendAction(_playerAction);
-            }
-        }
     }
 }
diff --git a/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs b/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs
index 1a3422dec0f..4f08e6bd0ac 100644
--- a/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs
+++ b/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Arcade;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Arcade.UI;
 
@@ -15,9 +16,8 @@ protected override void Open()
     {
         base.Open();
 
-        _menu = new BlockGameMenu(this);
-        _menu.OnClose += Close;
-        _menu.OpenCentered();
+        _menu = this.CreateWindow<BlockGameMenu>();
+        _menu.OnAction += SendAction;
     }
 
     protected override void ReceiveMessage(BoundUserInterfaceMessage message)
diff --git a/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs b/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs
index 40bbe8b2d8c..8fff406e86c 100644
--- a/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs
+++ b/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs
@@ -1,4 +1,5 @@
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
 using static Content.Shared.Arcade.SharedSpaceVillainArcadeComponent;
@@ -9,8 +10,6 @@ public sealed class SpaceVillainArcadeBoundUserInterface : BoundUserInterface
 {
     [ViewVariables] private SpaceVillainArcadeMenu? _menu;
 
-    //public SharedSpaceVillainArcadeComponent SpaceVillainArcade;
-
     public SpaceVillainArcadeBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
     {
         SendAction(PlayerAction.RequestData);
@@ -25,10 +24,8 @@ protected override void Open()
     {
         base.Open();
 
-        _menu = new SpaceVillainArcadeMenu(this);
-
-        _menu.OnClose += Close;
-        _menu.OpenCentered();
+        _menu = this.CreateWindow<SpaceVillainArcadeMenu>();
+        _menu.OnPlayerAction += SendAction;
     }
 
     protected override void ReceiveMessage(BoundUserInterfaceMessage message)
@@ -36,12 +33,4 @@ protected override void ReceiveMessage(BoundUserInterfaceMessage message)
         if (message is SpaceVillainArcadeDataUpdateMessage msg)
             _menu?.UpdateInfo(msg);
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-
-        if (disposing)
-            _menu?.Dispose();
-    }
 }
diff --git a/Content.Client/Atmos/EntitySystems/GasMinerSystem.cs b/Content.Client/Atmos/EntitySystems/GasMinerSystem.cs
new file mode 100644
index 00000000000..aec138eed8f
--- /dev/null
+++ b/Content.Client/Atmos/EntitySystems/GasMinerSystem.cs
@@ -0,0 +1,10 @@
+using Content.Shared.Atmos.EntitySystems;
+using JetBrains.Annotations;
+
+namespace Content.Client.Atmos.EntitySystems;
+
+[UsedImplicitly]
+public sealed class GasMinerSystem : SharedGasMinerSystem
+{
+
+}
diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs b/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs
index 8f3b507c806..2ae15188355 100644
--- a/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs
+++ b/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Atmos.Monitor;
 using Content.Shared.Atmos.Monitor.Components;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
@@ -20,16 +21,9 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new AirAlarmWindow(this);
+        _window = this.CreateWindow<AirAlarmWindow>();
+        _window.SetEntity(Owner);
 
-        if (State != null)
-        {
-            UpdateState(State);
-        }
-
-        _window.OpenCentered();
-
-        _window.OnClose += Close;
         _window.AtmosDeviceDataChanged += OnDeviceDataChanged;
 		_window.AtmosDeviceDataCopied += OnDeviceDataCopied;
         _window.AtmosAlarmThresholdChanged += OnThresholdChanged;
diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
index 43be67c9d6b..eeec11c7660 100644
--- a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
+++ b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
@@ -47,7 +47,7 @@ public sealed partial class AirAlarmWindow : FancyWindow
 
     private CheckBox _autoMode => AutoModeCheckBox;
 
-    public AirAlarmWindow(BoundUserInterface owner)
+    public AirAlarmWindow()
     {
         RobustXamlLoader.Load(this);
 
@@ -95,8 +95,11 @@ public AirAlarmWindow(BoundUserInterface owner)
             _sensors.Clear();
             ResyncAllRequested!.Invoke();
         };
+    }
 
-        EntityView.SetEntity(owner.Owner);
+    public void SetEntity(EntityUid uid)
+    {
+        EntityView.SetEntity(uid);
     }
 
     public void UpdateState(AirAlarmUIState state)
diff --git a/Content.Client/Atmos/UI/GasCanisterBoundUserInterface.cs b/Content.Client/Atmos/UI/GasCanisterBoundUserInterface.cs
index a5e316a8def..7bf9b396d5e 100644
--- a/Content.Client/Atmos/UI/GasCanisterBoundUserInterface.cs
+++ b/Content.Client/Atmos/UI/GasCanisterBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Atmos.Piping.Binary.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Atmos.UI
 {
@@ -21,14 +22,8 @@ protected override void Open()
         {
             base.Open();
 
-            _window = new GasCanisterWindow();
+            _window = this.CreateWindow<GasCanisterWindow>();
 
-            if (State != null)
-                UpdateState(State);
-
-            _window.OpenCentered();
-
-            _window.OnClose += Close;
             _window.ReleaseValveCloseButtonPressed += OnReleaseValveClosePressed;
             _window.ReleaseValveOpenButtonPressed += OnReleaseValveOpenPressed;
             _window.ReleasePressureSet += OnReleasePressureSet;
diff --git a/Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs b/Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs
index 1904e2b3402..2b8020924cf 100644
--- a/Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs
+++ b/Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Atmos.Piping.Trinary.Components;
 using Content.Shared.Localizations;
 using JetBrains.Annotations;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Atmos.UI
 {
@@ -28,14 +29,8 @@ protected override void Open()
 
             var atmosSystem = EntMan.System<AtmosphereSystem>();
 
-            _window = new GasFilterWindow(atmosSystem.Gases);
-
-            if (State != null)
-                UpdateState(State);
-
-            _window.OpenCentered();
-
-            _window.OnClose += Close;
+            _window = this.CreateWindow<GasFilterWindow>();
+            _window.PopulateGasList(atmosSystem.Gases);
 
             _window.ToggleStatusButtonPressed += OnToggleStatusButtonPressed;
             _window.FilterTransferRateChanged += OnFilterTransferRatePressed;
diff --git a/Content.Client/Atmos/UI/GasFilterWindow.xaml.cs b/Content.Client/Atmos/UI/GasFilterWindow.xaml.cs
index 28766c688a0..62748b52592 100644
--- a/Content.Client/Atmos/UI/GasFilterWindow.xaml.cs
+++ b/Content.Client/Atmos/UI/GasFilterWindow.xaml.cs
@@ -26,10 +26,9 @@ public sealed partial class GasFilterWindow : DefaultWindow
         public event Action<string>? FilterTransferRateChanged;
         public event Action? SelectGasPressed;
 
-        public GasFilterWindow(IEnumerable<GasPrototype> gases)
+        public GasFilterWindow()
         {
             RobustXamlLoader.Load(this);
-            PopulateGasList(gases);
 
             ToggleStatusButton.OnPressed += _ => SetFilterStatus(!FilterStatus);
             ToggleStatusButton.OnPressed += _ => ToggleStatusButtonPressed?.Invoke();
@@ -73,7 +72,7 @@ public void SetGasFiltered(string? id, string name)
             SelectGasButton.Disabled = true;
         }
 
-        private void PopulateGasList(IEnumerable<GasPrototype> gases)
+        public void PopulateGasList(IEnumerable<GasPrototype> gases)
         {
             GasList.Add(new ItemList.Item(GasList)
             {
@@ -81,7 +80,7 @@ private void PopulateGasList(IEnumerable<GasPrototype> gases)
                 Text = Loc.GetString("comp-gas-filter-ui-filter-gas-none")
             });
 
-            foreach (GasPrototype gas in gases)
+            foreach (var gas in gases)
             {
                 var gasName = Loc.GetString(gas.Name);
                 GasList.Add(GetGasItem(gas.ID, gasName, GasList));
diff --git a/Content.Client/Atmos/UI/GasMixerBoundUserInteface.cs b/Content.Client/Atmos/UI/GasMixerBoundUserInteface.cs
index 709c06517cb..392fbf1cd9a 100644
--- a/Content.Client/Atmos/UI/GasMixerBoundUserInteface.cs
+++ b/Content.Client/Atmos/UI/GasMixerBoundUserInteface.cs
@@ -2,7 +2,7 @@
 using Content.Shared.Atmos.Piping.Trinary.Components;
 using Content.Shared.Localizations;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Atmos.UI
 {
@@ -26,14 +26,7 @@ protected override void Open()
         {
             base.Open();
 
-            _window = new GasMixerWindow();
-
-            if (State != null)
-                UpdateState(State);
-
-            _window.OpenCentered();
-
-            _window.OnClose += Close;
+            _window = this.CreateWindow<GasMixerWindow>();
 
             _window.ToggleStatusButtonPressed += OnToggleStatusButtonPressed;
             _window.MixerOutputPressureChanged += OnMixerOutputPressurePressed;
@@ -83,12 +76,5 @@ protected override void UpdateState(BoundUserInterfaceState state)
             _window.SetOutputPressure(cast.OutputPressure);
             _window.SetNodePercentages(cast.NodeOne);
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing) return;
-            _window?.Dispose();
-        }
     }
 }
diff --git a/Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs b/Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs
index 6eba2e0d215..220fdbe875c 100644
--- a/Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs
+++ b/Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Localizations;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Atmos.UI
 {
@@ -26,14 +27,7 @@ protected override void Open()
         {
             base.Open();
 
-            _window = new GasPressurePumpWindow();
-
-            if (State != null)
-                UpdateState(State);
-
-            _window.OpenCentered();
-
-            _window.OnClose += Close;
+            _window = this.CreateWindow<GasPressurePumpWindow>();
 
             _window.ToggleStatusButtonPressed += OnToggleStatusButtonPressed;
             _window.PumpOutputPressureChanged += OnPumpOutputPressurePressed;
@@ -67,12 +61,5 @@ protected override void UpdateState(BoundUserInterfaceState state)
             _window.SetPumpStatus(cast.Enabled);
             _window.SetOutputPressure(cast.OutputPressure);
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing) return;
-            _window?.Dispose();
-        }
     }
 }
diff --git a/Content.Client/Atmos/UI/GasThermomachineBoundUserInterface.cs b/Content.Client/Atmos/UI/GasThermomachineBoundUserInterface.cs
index 1664c8b9d75..d62be8f4bb4 100644
--- a/Content.Client/Atmos/UI/GasThermomachineBoundUserInterface.cs
+++ b/Content.Client/Atmos/UI/GasThermomachineBoundUserInterface.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Atmos.Piping.Unary.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Atmos.UI
 {
@@ -31,14 +32,7 @@ protected override void Open()
         {
             base.Open();
 
-            _window = new GasThermomachineWindow();
-
-            if (State != null)
-                UpdateState(State);
-
-            _window.OpenCentered();
-
-            _window.OnClose += Close;
+            _window = this.CreateWindow<GasThermomachineWindow>();
 
             _window.ToggleStatusButton.OnPressed += _ => OnToggleStatusButtonPressed();
             _window.TemperatureSpinbox.OnValueChanged += _ => OnTemperatureChanged(_window.TemperatureSpinbox.Value);
@@ -91,12 +85,5 @@ protected override void UpdateState(BoundUserInterfaceState state)
                 true => Loc.GetString("comp-gas-thermomachine-ui-title-heater")
             };
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing) return;
-            _window?.Dispose();
-        }
     }
 }
diff --git a/Content.Client/Atmos/UI/GasVolumePumpBoundUserInterface.cs b/Content.Client/Atmos/UI/GasVolumePumpBoundUserInterface.cs
index 1b39306181a..642f34c2f92 100644
--- a/Content.Client/Atmos/UI/GasVolumePumpBoundUserInterface.cs
+++ b/Content.Client/Atmos/UI/GasVolumePumpBoundUserInterface.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Localizations;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Atmos.UI
 {
@@ -26,14 +27,7 @@ protected override void Open()
         {
             base.Open();
 
-            _window = new GasVolumePumpWindow();
-
-            if (State != null)
-                UpdateState(State);
-
-            _window.OpenCentered();
-
-            _window.OnClose += Close;
+            _window = this.CreateWindow<GasVolumePumpWindow>();
 
             _window.ToggleStatusButtonPressed += OnToggleStatusButtonPressed;
             _window.PumpTransferRateChanged += OnPumpTransferRatePressed;
@@ -64,16 +58,9 @@ protected override void UpdateState(BoundUserInterfaceState state)
             if (_window == null || state is not GasVolumePumpBoundUserInterfaceState cast)
                 return;
 
-            _window.Title = (cast.PumpLabel);
+            _window.Title = cast.PumpLabel;
             _window.SetPumpStatus(cast.Enabled);
             _window.SetTransferRate(cast.TransferRate);
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing) return;
-            _window?.Dispose();
-        }
     }
 }
diff --git a/Content.Client/Atmos/UI/SpaceHeaterBoundUserInterface.cs b/Content.Client/Atmos/UI/SpaceHeaterBoundUserInterface.cs
index 4d8d1191e91..e70426575d4 100644
--- a/Content.Client/Atmos/UI/SpaceHeaterBoundUserInterface.cs
+++ b/Content.Client/Atmos/UI/SpaceHeaterBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Atmos.Piping.Portable.Components;
 using JetBrains.Annotations;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 
 namespace Content.Client.Atmos.UI;
@@ -21,14 +22,7 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new SpaceHeaterWindow();
-
-        if (State != null)
-            UpdateState(State);
-
-        _window.OpenCentered();
-
-        _window.OnClose += Close;
+        _window = this.CreateWindow<SpaceHeaterWindow>();
 
         _window.ToggleStatusButton.OnPressed += _ => OnToggleStatusButtonPressed();
         _window.IncreaseTempRange.OnPressed += _ => OnTemperatureRangeChanged(_window.TemperatureChangeDelta);
diff --git a/Content.Client/Audio/AudioUIController.cs b/Content.Client/Audio/AudioUIController.cs
index ef903672fd0..16e1edd2523 100644
--- a/Content.Client/Audio/AudioUIController.cs
+++ b/Content.Client/Audio/AudioUIController.cs
@@ -54,7 +54,7 @@ private void SetClickSound(string value)
     {
         if (!string.IsNullOrEmpty(value))
         {
-            var resource = _cache.GetResource<AudioResource>(value);
+            var resource = GetSoundOrFallback(value, CCVars.UIClickSound.DefaultValue);
             var source =
                 _audioManager.CreateAudioSource(resource);
 
@@ -77,7 +77,7 @@ private void SetHoverSound(string value)
     {
         if (!string.IsNullOrEmpty(value))
         {
-            var hoverResource = _cache.GetResource<AudioResource>(value);
+            var hoverResource = GetSoundOrFallback(value, CCVars.UIHoverSound.DefaultValue);
             var hoverSource =
                 _audioManager.CreateAudioSource(hoverResource);
 
@@ -95,4 +95,12 @@ private void SetHoverSound(string value)
             UIManager.SetHoverSound(null);
         }
     }
+
+    private AudioResource GetSoundOrFallback(string path, string fallback)
+    {
+        if (!_cache.TryGetResource(path, out AudioResource? resource))
+            return _cache.GetResource<AudioResource>(fallback);
+
+        return resource;
+    }
 }
diff --git a/Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs b/Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs
index 84b787a4ec9..d60c978ccf5 100644
--- a/Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs
+++ b/Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs
@@ -4,6 +4,7 @@
 using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
 using Content.Shared.Random;
+using Content.Shared.Random.Rules;
 using Robust.Client.GameObjects;
 using Robust.Client.Player;
 using Robust.Client.ResourceManagement;
diff --git a/Content.Client/Audio/Jukebox/JukeboxBoundUserInterface.cs b/Content.Client/Audio/Jukebox/JukeboxBoundUserInterface.cs
index 60fe339069a..865dfc478d0 100644
--- a/Content.Client/Audio/Jukebox/JukeboxBoundUserInterface.cs
+++ b/Content.Client/Audio/Jukebox/JukeboxBoundUserInterface.cs
@@ -1,8 +1,7 @@
 using Content.Shared.Audio.Jukebox;
 using Robust.Client.Audio;
-using Robust.Client.Player;
+using Robust.Client.UserInterface;
 using Robust.Shared.Audio.Components;
-using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.Audio.Jukebox;
@@ -23,9 +22,7 @@ protected override void Open()
     {
         base.Open();
 
-        _menu = new JukeboxMenu();
-        _menu.OnClose += Close;
-        _menu.OpenCentered();
+        _menu = this.CreateWindow<JukeboxMenu>();
 
         _menu.OnPlayPressed += args =>
         {
@@ -100,19 +97,5 @@ public void SetTime(float time)
 
         SendMessage(new JukeboxSetTimeMessage(sentTime));
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing)
-            return;
-
-        if (_menu == null)
-            return;
-
-        _menu.OnClose -= Close;
-        _menu.Dispose();
-        _menu = null;
-    }
 }
 
diff --git a/Content.Client/Bed/Cryostorage/CryostorageBoundUserInterface.cs b/Content.Client/Bed/Cryostorage/CryostorageBoundUserInterface.cs
index ffab1625483..09f3cec8fbf 100644
--- a/Content.Client/Bed/Cryostorage/CryostorageBoundUserInterface.cs
+++ b/Content.Client/Bed/Cryostorage/CryostorageBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Bed.Cryostorage;
 using JetBrains.Annotations;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Bed.Cryostorage;
 
@@ -17,9 +18,7 @@ protected override void Open()
     {
         base.Open();
 
-        _menu = new();
-
-        _menu.OnClose += Close;
+        _menu = this.CreateWindow<CryostorageMenu>();
 
         _menu.SlotRemoveButtonPressed += (ent, slot) =>
         {
@@ -30,8 +29,6 @@ protected override void Open()
         {
             SendMessage(new CryostorageRemoveItemBuiMessage(ent, hand, CryostorageRemoveItemBuiMessage.RemovalType.Hand));
         };
-
-        _menu.OpenCentered();
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -45,12 +42,4 @@ protected override void UpdateState(BoundUserInterfaceState state)
                 break;
         }
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing)
-            return;
-        _menu?.Dispose();
-    }
 }
diff --git a/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs b/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs
index d3365702bcf..44c40143d83 100644
--- a/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs
+++ b/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Client.Cargo.UI;
 using Content.Shared.Cargo.Components;
 using JetBrains.Annotations;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Cargo.BUI;
 
@@ -18,9 +19,7 @@ protected override void Open()
     {
         base.Open();
 
-        _menu = new();
-
-        _menu.OnClose += Close;
+        _menu = this.CreateWindow<CargoBountyMenu>();
 
         _menu.OnLabelButtonPressed += id =>
         {
@@ -31,8 +30,6 @@ protected override void Open()
         {
             SendMessage(new BountySkipMessage(id));
         };
-
-        _menu.OpenCentered();
     }
 
     protected override void UpdateState(BoundUserInterfaceState message)
@@ -44,14 +41,4 @@ protected override void UpdateState(BoundUserInterfaceState message)
 
         _menu?.UpdateEntries(state.Bounties, state.UntilNextSkip);
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-
-        if (!disposing)
-            return;
-
-        _menu?.Dispose();
-    }
 }
diff --git a/Content.Client/Cargo/BUI/CargoPalletConsoleBoundUserInterface.cs b/Content.Client/Cargo/BUI/CargoPalletConsoleBoundUserInterface.cs
index 20c23a48a0d..2461dafb5f3 100644
--- a/Content.Client/Cargo/BUI/CargoPalletConsoleBoundUserInterface.cs
+++ b/Content.Client/Cargo/BUI/CargoPalletConsoleBoundUserInterface.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Cargo.BUI;
 using Content.Shared.Cargo.Events;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Cargo.BUI;
 
@@ -18,21 +19,9 @@ protected override void Open()
     {
         base.Open();
 
-        _menu = new CargoPalletMenu();
+        _menu = this.CreateWindow<CargoPalletMenu>();
         _menu.AppraiseRequested += OnAppraisal;
         _menu.SellRequested += OnSell;
-        _menu.OnClose += Close;
-
-        _menu.OpenCentered();
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (disposing)
-        {
-            _menu?.Dispose();
-        }
     }
 
     private void OnAppraisal()
diff --git a/Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs b/Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs
index 422d03707a0..02b721b9020 100644
--- a/Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs
+++ b/Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Cargo.BUI;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.Cargo.BUI;
@@ -9,6 +10,8 @@ namespace Content.Client.Cargo.BUI;
 [UsedImplicitly]
 public sealed class CargoShuttleConsoleBoundUserInterface : BoundUserInterface
 {
+    [Dependency] private readonly IPrototypeManager _protoManager = default!;
+
     [ViewVariables]
     private CargoShuttleMenu? _menu;
 
@@ -19,24 +22,7 @@ public CargoShuttleConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base
     protected override void Open()
     {
         base.Open();
-        var collection = IoCManager.Instance;
-
-        if (collection == null)
-            return;
-
-        _menu = new CargoShuttleMenu(collection.Resolve<IPrototypeManager>(), collection.Resolve<IEntitySystemManager>().GetEntitySystem<SpriteSystem>());
-        _menu.OnClose += Close;
-
-        _menu.OpenCentered();
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (disposing)
-        {
-            _menu?.Dispose();
-        }
+        _menu = this.CreateWindow<CargoShuttleMenu>();
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -45,6 +31,6 @@ protected override void UpdateState(BoundUserInterfaceState state)
         if (state is not CargoShuttleConsoleBoundUserInterfaceState cargoState) return;
         _menu?.SetAccountName(cargoState.AccountName);
         _menu?.SetShuttleName(cargoState.ShuttleName);
-        _menu?.SetOrders(cargoState.Orders);
+        _menu?.SetOrders(EntMan.System<SpriteSystem>(), _protoManager, cargoState.Orders);
     }
 }
diff --git a/Content.Client/Cargo/UI/CargoShuttleMenu.xaml.cs b/Content.Client/Cargo/UI/CargoShuttleMenu.xaml.cs
index c591f917da3..43b00089e16 100644
--- a/Content.Client/Cargo/UI/CargoShuttleMenu.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoShuttleMenu.xaml.cs
@@ -12,14 +12,9 @@ namespace Content.Client.Cargo.UI
     [GenerateTypedNameReferences]
     public sealed partial class CargoShuttleMenu : FancyWindow
     {
-        private readonly IPrototypeManager _protoManager;
-        private readonly SpriteSystem _spriteSystem;
-
-        public CargoShuttleMenu(IPrototypeManager protoManager, SpriteSystem spriteSystem)
+        public CargoShuttleMenu()
         {
             RobustXamlLoader.Load(this);
-            _protoManager = protoManager;
-            _spriteSystem = spriteSystem;
             Title = Loc.GetString("cargo-shuttle-console-menu-title");
         }
 
@@ -33,19 +28,19 @@ public void SetShuttleName(string name)
             ShuttleNameLabel.Text = name;
         }
 
-        public void SetOrders(List<CargoOrderData> orders)
+        public void SetOrders(SpriteSystem sprites, IPrototypeManager protoManager, List<CargoOrderData> orders)
         {
             Orders.DisposeAllChildren();
 
             foreach (var order in orders)
             {
-                 var product = _protoManager.Index<EntityPrototype>(order.ProductId);
+                 var product = protoManager.Index<EntityPrototype>(order.ProductId);
                  var productName = product.Name;
 
                  var row = new CargoOrderRow
                  {
                      Order = order,
-                     Icon = { Texture = _spriteSystem.Frame0(product) },
+                     Icon = { Texture = sprites.Frame0(product) },
                      ProductName =
                      {
                          Text = Loc.GetString(
diff --git a/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml.cs b/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml.cs
index f3b2d373d74..2d4d192ea8a 100644
--- a/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml.cs
+++ b/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml.cs
@@ -31,7 +31,7 @@ public void UpdateState(NewsArticle article, int targetNum, int totalNum, bool n
         Author.Visible = true;
 
         PageName.Text = article.Title;
-        PageText.SetMarkup(article.Content);
+        PageText.SetMarkupPermissive(article.Content);
 
         PageNum.Text = $"{targetNum}/{totalNum}";
 
diff --git a/Content.Client/Chat/TypingIndicator/TypingIndicatorVisualizerSystem.cs b/Content.Client/Chat/TypingIndicator/TypingIndicatorVisualizerSystem.cs
index d04c9d661dd..e89f7ab5002 100644
--- a/Content.Client/Chat/TypingIndicator/TypingIndicatorVisualizerSystem.cs
+++ b/Content.Client/Chat/TypingIndicator/TypingIndicatorVisualizerSystem.cs
@@ -2,21 +2,36 @@
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Shared.Prototypes;
+using Content.Shared.Inventory;
 
 namespace Content.Client.Chat.TypingIndicator;
 
 public sealed class TypingIndicatorVisualizerSystem : VisualizerSystem<TypingIndicatorComponent>
 {
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly InventorySystem _inventory = default!;
+
 
     protected override void OnAppearanceChange(EntityUid uid, TypingIndicatorComponent component, ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null)
             return;
 
-        if (!_prototypeManager.TryIndex<TypingIndicatorPrototype>(component.Prototype, out var proto))
+        var currentTypingIndicator = component.TypingIndicatorPrototype;
+
+        var evt = new BeforeShowTypingIndicatorEvent();
+
+        if (TryComp<InventoryComponent>(uid, out var inventoryComp))
+            _inventory.RelayEvent((uid, inventoryComp), ref evt);
+
+        var overrideIndicator = evt.GetMostRecentIndicator();
+
+        if (overrideIndicator != null)
+            currentTypingIndicator = overrideIndicator.Value;
+
+        if (!_prototypeManager.TryIndex(currentTypingIndicator, out var proto))
         {
-            Log.Error($"Unknown typing indicator id: {component.Prototype}");
+            Log.Error($"Unknown typing indicator id: {component.TypingIndicatorPrototype}");
             return;
         }
 
diff --git a/Content.Client/Chat/UI/SpeechBubble.cs b/Content.Client/Chat/UI/SpeechBubble.cs
index 68c937a7885..adb61d10e62 100644
--- a/Content.Client/Chat/UI/SpeechBubble.cs
+++ b/Content.Client/Chat/UI/SpeechBubble.cs
@@ -16,6 +16,7 @@ public abstract class SpeechBubble : Control
         [Dependency] private readonly IEyeManager _eyeManager = default!;
         [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] protected readonly IConfigurationManager ConfigManager = default!;
+        private readonly SharedTransformSystem _transformSystem;
 
         public enum SpeechType : byte
         {
@@ -83,6 +84,7 @@ public SpeechBubble(ChatMessage message, EntityUid senderEntity, string speechSt
         {
             IoCManager.InjectDependencies(this);
             _senderEntity = senderEntity;
+            _transformSystem = _entityManager.System<SharedTransformSystem>();
 
             // Use text clipping so new messages don't overlap old ones being pushed up.
             RectClipContent = true;
@@ -140,7 +142,7 @@ protected override void FrameUpdate(FrameEventArgs args)
             }
 
             var offset = (-_eyeManager.CurrentEye.Rotation).ToWorldVec() * -EntityVerticalOffset;
-            var worldPos = xform.WorldPosition + offset;
+            var worldPos = _transformSystem.GetWorldPosition(xform) + offset;
 
             var lowerCenter = _eyeManager.WorldToScreen(worldPos) / UIScale;
             var screenPos = lowerCenter - new Vector2(ContentSize.X / 2, ContentSize.Y + _verticalOffsetAchieved);
diff --git a/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs b/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs
index 988fea7978b..3ef7f0ae73e 100644
--- a/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs
+++ b/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Containers.ItemSlots;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Chemistry.UI
 {
@@ -27,13 +28,8 @@ protected override void Open()
             base.Open();
 
             // Setup window layout/elements
-            _window = new ChemMasterWindow
-            {
-                Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName,
-            };
-
-            _window.OpenCentered();
-            _window.OnClose += Close;
+            _window = this.CreateWindow<ChemMasterWindow>();
+            _window.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
 
             // Setup static button actions.
             _window.InputEjectButton.OnPressed += _ => SendMessage(
@@ -75,15 +71,5 @@ protected override void UpdateState(BoundUserInterfaceState state)
 
             _window?.UpdateState(castState); // Update window state
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            if (disposing)
-            {
-                _window?.Dispose();
-            }
-        }
     }
 }
diff --git a/Content.Client/Chemistry/UI/ReagentDispenserBoundUserInterface.cs b/Content.Client/Chemistry/UI/ReagentDispenserBoundUserInterface.cs
index 99e5a3d3953..2ad1b718887 100644
--- a/Content.Client/Chemistry/UI/ReagentDispenserBoundUserInterface.cs
+++ b/Content.Client/Chemistry/UI/ReagentDispenserBoundUserInterface.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Containers.ItemSlots;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Chemistry.UI
 {
@@ -15,9 +16,6 @@ public sealed class ReagentDispenserBoundUserInterface : BoundUserInterface
         [ViewVariables]
         private ReagentDispenserWindow? _window;
 
-        [ViewVariables]
-        private ReagentDispenserBoundUserInterfaceState? _lastState;
-
         public ReagentDispenserBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
         {
         }
@@ -32,14 +30,9 @@ protected override void Open()
             base.Open();
 
             // Setup window layout/elements
-            _window = new()
-            {
-                Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName,
-                HelpGuidebookIds = EntMan.GetComponent<GuideHelpComponent>(Owner).Guides
-            };
-
-            _window.OpenCentered();
-            _window.OnClose += Close;
+            _window = this.CreateWindow<ReagentDispenserWindow>();
+            _window.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
+            _window.HelpGuidebookIds = EntMan.GetComponent<GuideHelpComponent>(Owner).Guides;
 
             // Setup static button actions.
             _window.EjectButton.OnPressed += _ => SendMessage(new ItemSlotButtonPressedEvent(SharedReagentDispenser.OutputSlotName));
@@ -63,19 +56,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
             base.UpdateState(state);
 
             var castState = (ReagentDispenserBoundUserInterfaceState) state;
-            _lastState = castState;
-
             _window?.UpdateState(castState); //Update window state
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            if (disposing)
-            {
-                _window?.Dispose();
-            }
-        }
     }
 }
diff --git a/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs b/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs
index 35df131312d..1bc1c0dba9a 100644
--- a/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs
+++ b/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs
@@ -1,24 +1,33 @@
 using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Components;
 using Content.Shared.FixedPoint;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Chemistry.UI
 {
     [UsedImplicitly]
     public sealed class TransferAmountBoundUserInterface : BoundUserInterface
     {
+        private IEntityManager _entManager;
+        private EntityUid _owner;
         [ViewVariables]
         private TransferAmountWindow? _window;
 
         public TransferAmountBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
         {
+          _owner = owner;
+          _entManager = IoCManager.Resolve<IEntityManager>();
         }
 
         protected override void Open()
         {
             base.Open();
-            _window = new TransferAmountWindow();
+            _window = this.CreateWindow<TransferAmountWindow>();
+
+            if (_entManager.TryGetComponent<SolutionTransferComponent>(_owner, out var comp))
+                _window.SetBounds(comp.MinimumTransferAmount.Int(), comp.MaximumTransferAmount.Int());
 
             _window.ApplyButton.OnPressed += _ =>
             {
@@ -28,15 +37,6 @@ protected override void Open()
                     _window.Close();
                 }
             };
-            _window.OnClose += Close;
-            _window.OpenCentered();
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing) return;
-            _window?.Dispose();
         }
     }
 }
diff --git a/Content.Client/Chemistry/UI/TransferAmountWindow.xaml b/Content.Client/Chemistry/UI/TransferAmountWindow.xaml
index 3d787c69c10..c73d86b10f1 100644
--- a/Content.Client/Chemistry/UI/TransferAmountWindow.xaml
+++ b/Content.Client/Chemistry/UI/TransferAmountWindow.xaml
@@ -6,6 +6,10 @@
         <BoxContainer Orientation="Horizontal">
             <LineEdit Name="AmountLineEdit" Access="Public" HorizontalExpand="True" PlaceHolder="{Loc 'ui-transfer-amount-line-edit-placeholder'}"/>
         </BoxContainer>
+        <BoxContainer Orientation="Horizontal">
+          <Label Name="MinimumAmount" Access="Public" HorizontalExpand="True" />
+          <Label Name="MaximumAmount" Access="Public" />
+        </BoxContainer>
         <Button Name="ApplyButton" Access="Public" Text="{Loc 'ui-transfer-amount-apply'}"/>
     </BoxContainer>
 </DefaultWindow>
diff --git a/Content.Client/Chemistry/UI/TransferAmountWindow.xaml.cs b/Content.Client/Chemistry/UI/TransferAmountWindow.xaml.cs
index 767e5cc8230..6bae0444415 100644
--- a/Content.Client/Chemistry/UI/TransferAmountWindow.xaml.cs
+++ b/Content.Client/Chemistry/UI/TransferAmountWindow.xaml.cs
@@ -8,9 +8,29 @@ namespace Content.Client.Chemistry.UI
     [GenerateTypedNameReferences]
     public sealed partial class TransferAmountWindow : DefaultWindow
     {
+        private int _max = Int32.MaxValue;
+        private int _min = 1;
+
         public TransferAmountWindow()
         {
             RobustXamlLoader.Load(this);
+            AmountLineEdit.OnTextChanged += OnValueChanged;
+        }
+
+        public void SetBounds(int min, int max)
+        {
+          _min = min;
+          _max = max;
+          MinimumAmount.Text = Loc.GetString("comp-solution-transfer-set-amount-min", ("amount", _min));
+          MaximumAmount.Text = Loc.GetString("comp-solution-transfer-set-amount-max", ("amount", _max));
+        }
+
+        private void OnValueChanged(LineEdit.LineEditEventArgs args)
+        {
+            if (!int.TryParse(AmountLineEdit.Text, out var amount)  || amount > _max || amount < _min)
+                ApplyButton.Disabled = true;
+            else 
+                ApplyButton.Disabled = false; 
         }
     }
 }
diff --git a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs
index 17b88fb5a8f..010bfb31845 100644
--- a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs
+++ b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs
@@ -2,6 +2,8 @@
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Clothing;
+using Content.Shared.Clothing.Components;
 using Content.Shared.Hands;
 using Content.Shared.Item;
 using Content.Shared.Rounding;
@@ -20,6 +22,7 @@ public override void Initialize()
         base.Initialize();
         SubscribeLocalEvent<SolutionContainerVisualsComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<SolutionContainerVisualsComponent, GetInhandVisualsEvent>(OnGetHeldVisuals);
+        SubscribeLocalEvent<SolutionContainerVisualsComponent, GetEquipmentVisualsEvent>(OnGetClothingVisuals);
     }
 
     private void OnMapInit(EntityUid uid, SolutionContainerVisualsComponent component, MapInitEvent args)
@@ -174,4 +177,41 @@ private void OnGetHeldVisuals(EntityUid uid, SolutionContainerVisualsComponent c
             args.Layers.Add((key, layer));
         }
     }
+
+    private void OnGetClothingVisuals(Entity<SolutionContainerVisualsComponent> ent, ref GetEquipmentVisualsEvent args)
+    {
+        if (ent.Comp.EquippedFillBaseName == null)
+            return;
+
+        if (!TryComp<AppearanceComponent>(ent, out var appearance))
+            return;
+
+        if (!TryComp<ClothingComponent>(ent, out var clothing))
+            return;
+
+        if (!AppearanceSystem.TryGetData<float>(ent, SolutionContainerVisuals.FillFraction, out var fraction, appearance))
+            return;
+
+        var closestFillSprite = ContentHelpers.RoundToLevels(fraction, 1, ent.Comp.EquippedMaxFillLevels + 1);
+
+        if (closestFillSprite > 0)
+        {
+            var layer = new PrototypeLayerData();
+
+            var equippedPrefix = clothing.EquippedPrefix == null ? $"equipped-{args.Slot}" : $" {clothing.EquippedPrefix}-equipped-{args.Slot}";
+            var key = equippedPrefix + ent.Comp.EquippedFillBaseName + closestFillSprite;
+
+            // Make sure the sprite state is valid so we don't show a big red error message
+            // This saves us from having to make fill level sprites for every possible slot the item could be in (including pockets).
+            if (!TryComp<SpriteComponent>(ent, out var sprite) || sprite.BaseRSI == null || !sprite.BaseRSI.TryGetState(key, out _))
+                return;
+
+            layer.State = key;
+
+            if (ent.Comp.ChangeColor && AppearanceSystem.TryGetData<Color>(ent, SolutionContainerVisuals.Color, out var color, appearance))
+                layer.Color = color;
+
+            args.Layers.Add((key, layer));
+        }
+    }
 }
diff --git a/Content.Client/Clickable/ClickableComponent.cs b/Content.Client/Clickable/ClickableComponent.cs
index 6f75df46830..da81ed4c841 100644
--- a/Content.Client/Clickable/ClickableComponent.cs
+++ b/Content.Client/Clickable/ClickableComponent.cs
@@ -1,145 +1,17 @@
-using System.Numerics;
-using Robust.Client.GameObjects;
-using Robust.Client.Graphics;
-using Robust.Client.Utility;
-using Robust.Shared.Graphics;
-using static Robust.Client.GameObjects.SpriteComponent;
-using Direction = Robust.Shared.Maths.Direction;
+namespace Content.Client.Clickable;
 
-namespace Content.Client.Clickable
+[RegisterComponent]
+public sealed partial class ClickableComponent : Component
 {
-    [RegisterComponent]
-    public sealed partial class ClickableComponent : Component
-    {
-        [Dependency] private readonly IClickMapManager _clickMapManager = default!;
-
-        [DataField("bounds")] public DirBoundData? Bounds;
-
-        /// <summary>
-        /// Used to check whether a click worked. Will first check if the click falls inside of some explicit bounding
-        /// boxes (see <see cref="Bounds"/>). If that fails, attempts to use automatically generated click maps.
-        /// </summary>
-        /// <param name="worldPos">The world position that was clicked.</param>
-        /// <param name="drawDepth">
-        /// The draw depth for the sprite that captured the click.
-        /// </param>
-        /// <returns>True if the click worked, false otherwise.</returns>
-        public bool CheckClick(SpriteComponent sprite, TransformComponent transform, EntityQuery<TransformComponent> xformQuery, Vector2 worldPos, IEye eye, out int drawDepth, out uint renderOrder, out float bottom)
-        {
-            if (!sprite.Visible)
-            {
-                drawDepth = default;
-                renderOrder = default;
-                bottom = default;
-                return false;
-            }
-
-            drawDepth = sprite.DrawDepth;
-            renderOrder = sprite.RenderOrder;
-            var (spritePos, spriteRot) = transform.GetWorldPositionRotation(xformQuery);
-            var spriteBB = sprite.CalculateRotatedBoundingBox(spritePos, spriteRot, eye.Rotation);
-            bottom = Matrix3Helpers.CreateRotation(eye.Rotation).TransformBox(spriteBB).Bottom;
-
-            Matrix3x2.Invert(sprite.GetLocalMatrix(), out var invSpriteMatrix);
-
-            // This should have been the rotation of the sprite relative to the screen, but this is not the case with no-rot or directional sprites.
-            var relativeRotation = (spriteRot + eye.Rotation).Reduced().FlipPositive();
-
-            Angle cardinalSnapping = sprite.SnapCardinals ? relativeRotation.GetCardinalDir().ToAngle() : Angle.Zero;
-
-            // First we get `localPos`, the clicked location in the sprite-coordinate frame.
-            var entityXform = Matrix3Helpers.CreateInverseTransform(transform.WorldPosition, sprite.NoRotation ? -eye.Rotation : spriteRot - cardinalSnapping);
-            var localPos = Vector2.Transform(Vector2.Transform(worldPos, entityXform), invSpriteMatrix);
-
-            // Check explicitly defined click-able bounds
-            if (CheckDirBound(sprite, relativeRotation, localPos))
-                return true;
-
-            // Next check each individual sprite layer using automatically computed click maps.
-            foreach (var spriteLayer in sprite.AllLayers)
-            {
-                if (!spriteLayer.Visible || spriteLayer is not Layer layer)
-                    continue;
-
-                // Check the layer's texture, if it has one
-                if (layer.Texture != null)
-                {
-                    // Convert to image coordinates
-                    var imagePos = (Vector2i) (localPos * EyeManager.PixelsPerMeter * new Vector2(1, -1) + layer.Texture.Size / 2f);
-
-                    if (_clickMapManager.IsOccluding(layer.Texture, imagePos))
-                        return true;
-                }
-
-                // Either we weren't clicking on the texture, or there wasn't one. In which case: check the RSI next
-                if (layer.ActualRsi is not { } rsi || !rsi.TryGetState(layer.State, out var rsiState))
-                    continue;
-
-                var dir = Layer.GetDirection(rsiState.RsiDirections, relativeRotation);
+    [DataField] public DirBoundData? Bounds;
 
-                // convert to layer-local coordinates
-                layer.GetLayerDrawMatrix(dir, out var matrix);
-                Matrix3x2.Invert(matrix, out var inverseMatrix);
-                var layerLocal = Vector2.Transform(localPos, inverseMatrix);
-
-                // Convert to image coordinates
-                var layerImagePos = (Vector2i) (layerLocal * EyeManager.PixelsPerMeter * new Vector2(1, -1) + rsiState.Size / 2f);
-
-                // Next, to get the right click map we need the "direction" of this layer that is actually being used to draw the sprite on the screen.
-                // This **can** differ from the dir defined before, but can also just be the same.
-                if (sprite.EnableDirectionOverride)
-                    dir = sprite.DirectionOverride.Convert(rsiState.RsiDirections);
-                dir = dir.OffsetRsiDir(layer.DirOffset);
-
-                if (_clickMapManager.IsOccluding(layer.ActualRsi!, layer.State, dir, layer.AnimationFrame, layerImagePos))
-                    return true;
-            }
-
-            drawDepth = default;
-            renderOrder = default;
-            bottom = default;
-            return false;
-        }
-
-        public bool CheckDirBound(SpriteComponent sprite, Angle relativeRotation, Vector2 localPos)
-        {
-            if (Bounds == null)
-                return false;
-
-            // These explicit bounds only work for either 1 or 4 directional sprites.
-
-            // This would be the orientation of a 4-directional sprite.
-            var direction = relativeRotation.GetCardinalDir();
-
-            var modLocalPos = sprite.NoRotation
-                ? localPos
-                : direction.ToAngle().RotateVec(localPos);
-
-            // First, check the bounding box that is valid for all orientations
-            if (Bounds.All.Contains(modLocalPos))
-                return true;
-
-            // Next, get and check the appropriate bounding box for the current sprite orientation
-            var boundsForDir = (sprite.EnableDirectionOverride ? sprite.DirectionOverride : direction) switch
-            {
-                Direction.East => Bounds.East,
-                Direction.North => Bounds.North,
-                Direction.South => Bounds.South,
-                Direction.West => Bounds.West,
-                _ => throw new InvalidOperationException()
-            };
-
-            return boundsForDir.Contains(modLocalPos);
-        }
-
-        [DataDefinition]
-        public sealed partial class DirBoundData
-        {
-            [DataField("all")] public Box2 All;
-            [DataField("north")] public Box2 North;
-            [DataField("south")] public Box2 South;
-            [DataField("east")] public Box2 East;
-            [DataField("west")] public Box2 West;
-        }
+    [DataDefinition]
+    public sealed partial class DirBoundData
+    {
+        [DataField] public Box2 All;
+        [DataField] public Box2 North;
+        [DataField] public Box2 South;
+        [DataField] public Box2 East;
+        [DataField] public Box2 West;
     }
 }
diff --git a/Content.Client/Clickable/ClickableSystem.cs b/Content.Client/Clickable/ClickableSystem.cs
new file mode 100644
index 00000000000..15d13df625c
--- /dev/null
+++ b/Content.Client/Clickable/ClickableSystem.cs
@@ -0,0 +1,168 @@
+using System.Numerics;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Client.Utility;
+using Robust.Shared.Graphics;
+
+namespace Content.Client.Clickable;
+
+/// <summary>
+/// Handles click detection for sprites.
+/// </summary>
+public sealed class ClickableSystem : EntitySystem
+{
+    [Dependency] private readonly IClickMapManager _clickMapManager = default!;
+    [Dependency] private readonly SharedTransformSystem _transforms = default!;
+    [Dependency] private readonly SpriteSystem _sprites = default!;
+
+    private EntityQuery<ClickableComponent> _clickableQuery;
+    private EntityQuery<TransformComponent> _xformQuery;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        _clickableQuery = GetEntityQuery<ClickableComponent>();
+        _xformQuery = GetEntityQuery<TransformComponent>();
+    }
+
+    /// <summary>
+    /// Used to check whether a click worked. Will first check if the click falls inside of some explicit bounding
+    /// boxes (see <see cref="Bounds"/>). If that fails, attempts to use automatically generated click maps.
+    /// </summary>
+    /// <param name="worldPos">The world position that was clicked.</param>
+    /// <param name="drawDepth">
+    /// The draw depth for the sprite that captured the click.
+    /// </param>
+    /// <returns>True if the click worked, false otherwise.</returns>
+    public bool CheckClick(Entity<ClickableComponent?, SpriteComponent, TransformComponent?> entity, Vector2 worldPos, IEye eye, out int drawDepth, out uint renderOrder, out float bottom)
+    {
+        if (!_clickableQuery.Resolve(entity.Owner, ref entity.Comp1, false))
+        {
+            drawDepth = default;
+            renderOrder = default;
+            bottom = default;
+            return false;
+        }
+
+        if (!_xformQuery.Resolve(entity.Owner, ref entity.Comp3))
+        {
+            drawDepth = default;
+            renderOrder = default;
+            bottom = default;
+            return false;
+        }
+
+        var sprite = entity.Comp2;
+        var transform = entity.Comp3;
+
+        if (!sprite.Visible)
+        {
+            drawDepth = default;
+            renderOrder = default;
+            bottom = default;
+            return false;
+        }
+
+        drawDepth = sprite.DrawDepth;
+        renderOrder = sprite.RenderOrder;
+        var (spritePos, spriteRot) = _transforms.GetWorldPositionRotation(transform);
+        var spriteBB = sprite.CalculateRotatedBoundingBox(spritePos, spriteRot, eye.Rotation);
+        bottom = Matrix3Helpers.CreateRotation(eye.Rotation).TransformBox(spriteBB).Bottom;
+
+        Matrix3x2.Invert(sprite.GetLocalMatrix(), out var invSpriteMatrix);
+
+        // This should have been the rotation of the sprite relative to the screen, but this is not the case with no-rot or directional sprites.
+        var relativeRotation = (spriteRot + eye.Rotation).Reduced().FlipPositive();
+
+        var cardinalSnapping = sprite.SnapCardinals ? relativeRotation.GetCardinalDir().ToAngle() : Angle.Zero;
+
+        // First we get `localPos`, the clicked location in the sprite-coordinate frame.
+        var entityXform = Matrix3Helpers.CreateInverseTransform(spritePos, sprite.NoRotation ? -eye.Rotation : spriteRot - cardinalSnapping);
+        var localPos = Vector2.Transform(Vector2.Transform(worldPos, entityXform), invSpriteMatrix);
+
+        // Check explicitly defined click-able bounds
+        if (CheckDirBound((entity.Owner, entity.Comp1, entity.Comp2), relativeRotation, localPos))
+            return true;
+
+        // Next check each individual sprite layer using automatically computed click maps.
+        foreach (var spriteLayer in sprite.AllLayers)
+        {
+            if (spriteLayer is not SpriteComponent.Layer layer || !_sprites.IsVisible(layer))
+            {
+                continue;
+            }
+
+            // Check the layer's texture, if it has one
+            if (layer.Texture != null)
+            {
+                // Convert to image coordinates
+                var imagePos = (Vector2i) (localPos * EyeManager.PixelsPerMeter * new Vector2(1, -1) + layer.Texture.Size / 2f);
+
+                if (_clickMapManager.IsOccluding(layer.Texture, imagePos))
+                    return true;
+            }
+
+            // Either we weren't clicking on the texture, or there wasn't one. In which case: check the RSI next
+            if (layer.ActualRsi is not { } rsi || !rsi.TryGetState(layer.State, out var rsiState))
+                continue;
+
+            var dir = SpriteComponent.Layer.GetDirection(rsiState.RsiDirections, relativeRotation);
+
+            // convert to layer-local coordinates
+            layer.GetLayerDrawMatrix(dir, out var matrix);
+            Matrix3x2.Invert(matrix, out var inverseMatrix);
+            var layerLocal = Vector2.Transform(localPos, inverseMatrix);
+
+            // Convert to image coordinates
+            var layerImagePos = (Vector2i) (layerLocal * EyeManager.PixelsPerMeter * new Vector2(1, -1) + rsiState.Size / 2f);
+
+            // Next, to get the right click map we need the "direction" of this layer that is actually being used to draw the sprite on the screen.
+            // This **can** differ from the dir defined before, but can also just be the same.
+            if (sprite.EnableDirectionOverride)
+                dir = sprite.DirectionOverride.Convert(rsiState.RsiDirections);
+            dir = dir.OffsetRsiDir(layer.DirOffset);
+
+            if (_clickMapManager.IsOccluding(layer.ActualRsi!, layer.State, dir, layer.AnimationFrame, layerImagePos))
+                return true;
+        }
+
+        drawDepth = default;
+        renderOrder = default;
+        bottom = default;
+        return false;
+    }
+
+    public bool CheckDirBound(Entity<ClickableComponent, SpriteComponent> entity, Angle relativeRotation, Vector2 localPos)
+    {
+        var clickable = entity.Comp1;
+        var sprite = entity.Comp2;
+
+        if (clickable.Bounds == null)
+            return false;
+
+        // These explicit bounds only work for either 1 or 4 directional sprites.
+
+        // This would be the orientation of a 4-directional sprite.
+        var direction = relativeRotation.GetCardinalDir();
+
+        var modLocalPos = sprite.NoRotation
+            ? localPos
+            : direction.ToAngle().RotateVec(localPos);
+
+        // First, check the bounding box that is valid for all orientations
+        if (clickable.Bounds.All.Contains(modLocalPos))
+            return true;
+
+        // Next, get and check the appropriate bounding box for the current sprite orientation
+        var boundsForDir = (sprite.EnableDirectionOverride ? sprite.DirectionOverride : direction) switch
+        {
+            Direction.East => clickable.Bounds.East,
+            Direction.North => clickable.Bounds.North,
+            Direction.South => clickable.Bounds.South,
+            Direction.West => clickable.Bounds.West,
+            _ => throw new InvalidOperationException()
+        };
+
+        return boundsForDir.Contains(modLocalPos);
+    }
+}
diff --git a/Content.Client/Clock/ClockSystem.cs b/Content.Client/Clock/ClockSystem.cs
new file mode 100644
index 00000000000..7097ada9df6
--- /dev/null
+++ b/Content.Client/Clock/ClockSystem.cs
@@ -0,0 +1,26 @@
+using Content.Shared.Clock;
+using Robust.Client.GameObjects;
+
+namespace Content.Client.Clock;
+
+public sealed class ClockSystem : SharedClockSystem
+{
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<ClockComponent, SpriteComponent>();
+        while (query.MoveNext(out var uid, out var comp, out var sprite))
+        {
+            if (!sprite.LayerMapTryGet(ClockVisualLayers.HourHand, out var hourLayer) ||
+                !sprite.LayerMapTryGet(ClockVisualLayers.MinuteHand, out var minuteLayer))
+                continue;
+
+            var time = GetClockTime((uid, comp));
+            var hourState = $"{comp.HoursBase}{time.Hours % 12}";
+            var minuteState = $"{comp.MinutesBase}{time.Minutes / 5}";
+            sprite.LayerSetState(hourLayer, hourState);
+            sprite.LayerSetState(minuteLayer, minuteState);
+        }
+    }
+}
diff --git a/Content.Client/CloningConsole/UI/CloningConsoleBoundUserInterface.cs b/Content.Client/CloningConsole/UI/CloningConsoleBoundUserInterface.cs
index 26f0994701e..62a02f37186 100644
--- a/Content.Client/CloningConsole/UI/CloningConsoleBoundUserInterface.cs
+++ b/Content.Client/CloningConsole/UI/CloningConsoleBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Content.Shared.Cloning.CloningConsole;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.CloningConsole.UI
 {
@@ -17,13 +18,11 @@ public CloningConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owne
         protected override void Open()
         {
             base.Open();
-            _window = new CloningConsoleWindow
-            {
-                Title = Loc.GetString("cloning-console-window-title")
-            };
-            _window.OnClose += Close;
+
+            _window = this.CreateWindow<CloningConsoleWindow>();
+            _window.Title = Loc.GetString("cloning-console-window-title");
+
             _window.CloneButton.OnPressed += _ => SendMessage(new UiButtonPressedMessage(UiButton.Clone));
-            _window.OpenCentered();
         }
 
         protected override void UpdateState(BoundUserInterfaceState state)
@@ -32,19 +31,5 @@ protected override void UpdateState(BoundUserInterfaceState state)
 
             _window?.Populate((CloningConsoleBoundUserInterfaceState) state);
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing)
-                return;
-
-            if (_window != null)
-            {
-                _window.OnClose -= Close;
-                _window.CloneButton.OnPressed -= _ => SendMessage(new UiButtonPressedMessage(UiButton.Clone));
-            }
-            _window?.Dispose();
-        }
     }
 }
diff --git a/Content.Client/Clothing/ClientClothingSystem.cs b/Content.Client/Clothing/ClientClothingSystem.cs
index 1c0d831226d..96bbcc54f2a 100644
--- a/Content.Client/Clothing/ClientClothingSystem.cs
+++ b/Content.Client/Clothing/ClientClothingSystem.cs
@@ -1,10 +1,12 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Numerics;
+using Content.Client.DisplacementMap;
 using Content.Client.Inventory;
 using Content.Shared.Clothing;
 using Content.Shared.Clothing.Components;
 using Content.Shared.Clothing.EntitySystems;
+using Content.Shared.DisplacementMap;
 using Content.Shared.Humanoid;
 using Content.Shared.Inventory;
 using Content.Shared.Inventory.Events;
@@ -50,6 +52,7 @@ public sealed class ClientClothingSystem : ClothingSystem
     [Dependency] private readonly IResourceCache _cache = default!;
     [Dependency] private readonly ISerializationManager _serialization = default!;
     [Dependency] private readonly InventorySystem _inventorySystem = default!;
+    [Dependency] private readonly DisplacementMapSystem _displacement = default!;
 
     public override void Initialize()
     {
@@ -64,15 +67,14 @@ public override void Initialize()
 
     private void OnAppearanceUpdate(EntityUid uid, InventoryComponent component, ref AppearanceChangeEvent args)
     {
-        // May need to update jumpsuit stencils if the sex changed. Also required to properly set the stencil on init
+        // May need to update displacement maps if the sex changed. Also required to properly set the stencil on init
         if (args.Sprite == null)
             return;
 
-        if (_inventorySystem.TryGetSlotEntity(uid, Jumpsuit, out var suit, component)
-            && TryComp(suit, out ClothingComponent? clothing))
+        var enumerator = _inventorySystem.GetSlotEnumerator((uid, component));
+        while (enumerator.NextItem(out var item, out var slot))
         {
-            SetGenderedMask(uid, args.Sprite, clothing);
-            return;
+            RenderEquipment(uid, item, slot.Name, component);
         }
 
         // No clothing equipped -> make sure the layer is hidden, though this should already be handled by on-unequip.
@@ -179,14 +181,6 @@ private void OnVisualsChanged(EntityUid uid, InventoryComponent component, Visua
 
     private void OnDidUnequip(EntityUid uid, SpriteComponent component, DidUnequipEvent args)
     {
-        // Hide jumpsuit mask layer.
-        if (args.Slot == Jumpsuit
-            && TryComp(uid, out SpriteComponent? sprite)
-            && sprite.LayerMapTryGet(HumanoidVisualLayers.StencilMask, out var maskLayer))
-        {
-                sprite.LayerSetVisible(maskLayer, false);
-        }
-
         if (!TryComp(uid, out InventorySlotsComponent? inventorySlots))
             return;
 
@@ -231,9 +225,6 @@ private void RenderEquipment(EntityUid equipee, EntityUid equipment, string slot
             return;
         }
 
-        if (slot == Jumpsuit)
-            SetGenderedMask(equipee, sprite, clothingComponent);
-
         if (!_inventorySystem.TryGetSlot(equipee, slot, out var slotDef, inventory))
             return;
 
@@ -265,7 +256,25 @@ private void RenderEquipment(EntityUid equipee, EntityUid equipment, string slot
         // temporary, until layer draw depths get added. Basically: a layer with the key "slot" is being used as a
         // bookmark to determine where in the list of layers we should insert the clothing layers.
         bool slotLayerExists = sprite.LayerMapTryGet(slot, out var index);
-        var displacementData = inventory.Displacements.GetValueOrDefault(slot);
+
+        // Select displacement maps
+        var displacementData = inventory.Displacements.GetValueOrDefault(slot); //Default unsexed map
+
+        var equipeeSex = CompOrNull<HumanoidAppearanceComponent>(equipee)?.Sex;
+        if (equipeeSex != null)
+        {
+            switch (equipeeSex)
+            {
+                case Sex.Male:
+                    if (inventory.MaleDisplacements.Count > 0)
+                        displacementData = inventory.MaleDisplacements.GetValueOrDefault(slot);
+                    break;
+                case Sex.Female:
+                    if (inventory.FemaleDisplacements.Count > 0)
+                        displacementData = inventory.FemaleDisplacements.GetValueOrDefault(slot);
+                    break;
+            }
+        }
 
         // add the new layers
         foreach (var (key, layerData) in ev.Layers)
@@ -292,7 +301,7 @@ private void RenderEquipment(EntityUid equipee, EntityUid equipment, string slot
                 index = sprite.LayerMapReserveBlank(key);
 
             if (sprite[index] is not Layer layer)
-                return;
+                continue;
 
             // In case no RSI is given, use the item's base RSI as a default. This cuts down on a lot of unnecessary yaml entries.
             if (layerData.RsiPath == null
@@ -303,78 +312,19 @@ private void RenderEquipment(EntityUid equipee, EntityUid equipment, string slot
                 layer.SetRsi(clothingSprite.BaseRSI);
             }
 
-            // Another "temporary" fix for clothing stencil masks.
-            // Sprite layer redactor when
-            // Sprite "redactor" just a week away.
-            if (slot == Jumpsuit)
-                layerData.Shader ??= "StencilDraw";
-
             sprite.LayerSetData(index, layerData);
             layer.Offset += slotDef.Offset;
 
-            if (displacementData != null)
+            if (displacementData is not null)
             {
-                if (displacementData.ShaderOverride != null)
-                    sprite.LayerSetShader(index, displacementData.ShaderOverride);
-
-                var displacementKey = $"{key}-displacement";
-                if (!revealedLayers.Add(displacementKey))
-                {
-                    Log.Warning($"Duplicate key for clothing visuals DISPLACEMENT: {displacementKey}.");
+                //Checking that the state is not tied to the current race. In this case we don't need to use the displacement maps.
+                if (layerData.State is not null && inventory.SpeciesId is not null && layerData.State.EndsWith(inventory.SpeciesId))
                     continue;
-                }
-
-                var displacementLayer = _serialization.CreateCopy(displacementData.Layer, notNullableOverride: true);
-                displacementLayer.CopyToShaderParameters!.LayerKey = key;
 
-                // Add before main layer for this item.
-                sprite.AddLayer(displacementLayer, index);
-                sprite.LayerMapSet(displacementKey, index);
-
-                revealedLayers.Add(displacementKey);
+                _displacement.TryAddDisplacement(displacementData, sprite, index, key, revealedLayers);
             }
         }
 
         RaiseLocalEvent(equipment, new EquipmentVisualsUpdatedEvent(equipee, slot, revealedLayers), true);
     }
-
-
-    /// <summary>
-    ///     Sets a sprite's gendered mask based on gender (obviously).
-    /// </summary>
-    /// <param name="sprite">Sprite to modify</param>
-    /// <param name="humanoid">Humanoid, to get gender from</param>
-    /// <param name="clothing">Clothing component, to get mask sprite type</param>
-    private void SetGenderedMask(EntityUid uid, SpriteComponent sprite, ClothingComponent clothing)
-    {
-        if (!sprite.LayerMapTryGet(HumanoidVisualLayers.StencilMask, out var layer))
-            return;
-
-        ClothingMask mask;
-        string prefix;
-
-        switch (CompOrNull<HumanoidAppearanceComponent>(uid)?.Sex)
-        {
-            case Sex.Male:
-                mask = clothing.MaleMask;
-                prefix = "male_";
-                break;
-            case Sex.Female:
-                mask = clothing.FemaleMask;
-                prefix = "female_";
-                break;
-            default:
-                mask = clothing.UnisexMask;
-                prefix = "unisex_";
-                break;
-        }
-
-        sprite.LayerSetState(layer, mask switch
-        {
-            ClothingMask.NoMask => $"{prefix}none",
-            ClothingMask.UniformTop => $"{prefix}top",
-            _ => $"{prefix}full",
-        });
-        sprite.LayerSetVisible(layer, true);
-    }
 }
diff --git a/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs b/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs
index 5b0d5fcf21f..83f6ba15662 100644
--- a/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs
+++ b/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Clothing.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Clothing.UI;
 
@@ -22,10 +23,8 @@ protected override void Open()
     {
         base.Open();
 
-        _menu = new ChameleonMenu();
-        _menu.OnClose += Close;
+        _menu = this.CreateWindow<ChameleonMenu>();
         _menu.OnIdSelected += OnIdSelected;
-        _menu.OpenCentered();
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -42,15 +41,4 @@ private void OnIdSelected(string selectedId)
     {
         SendMessage(new ChameleonPrototypeSelectedMessage(selectedId));
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-
-        if (disposing)
-        {
-            _menu?.Close();
-            _menu = null;
-        }
-    }
 }
diff --git a/Content.Client/Commands/HideMechanismsCommand.cs b/Content.Client/Commands/HideMechanismsCommand.cs
index 5f9afc78b98..97d792628a6 100644
--- a/Content.Client/Commands/HideMechanismsCommand.cs
+++ b/Content.Client/Commands/HideMechanismsCommand.cs
@@ -30,7 +30,7 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
             sprite.ContainerOccluded = false;
 
             var tempParent = uid;
-            while (containerSys.TryGetContainingContainer(tempParent, out var container))
+            while (containerSys.TryGetContainingContainer((tempParent, null, null), out var container))
             {
                 if (!container.ShowContents)
                 {
diff --git a/Content.Client/Commands/ZoomCommand.cs b/Content.Client/Commands/ZoomCommand.cs
index 2bdc85e1fee..c63eeea8369 100644
--- a/Content.Client/Commands/ZoomCommand.cs
+++ b/Content.Client/Commands/ZoomCommand.cs
@@ -20,7 +20,7 @@ public sealed class ZoomCommand : LocalizedCommands
     public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         Vector2 zoom;
-        if (args.Length is not (1 or 2))
+        if (args.Length is not (1 or 2 or 3))
         {
             shell.WriteLine(Help);
             return;
@@ -57,11 +57,18 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
             }
         }
 
+        var scalePvs = true;
+        if (args.Length == 3 && !bool.TryParse(args[2], out scalePvs))
+        {
+            shell.WriteError(LocalizationManager.GetString("cmd-parse-failure-bool", ("arg", args[2])));
+            return;
+        }
+
         var player = _playerManager.LocalSession?.AttachedEntity;
 
         if (_entityManager.TryGetComponent<ContentEyeComponent>(player, out var content))
         {
-            _entityManager.System<ContentEyeSystem>().RequestZoom(player.Value, zoom, true, content);
+            _entityManager.System<ContentEyeSystem>().RequestZoom(player.Value, zoom, true, scalePvs, content);
             return;
         }
 
diff --git a/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs b/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs
index 1c94d32bf8d..0310e91eeb0 100644
--- a/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs
+++ b/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.CCVar;
 using Content.Shared.Chat;
 using Content.Shared.Communications;
+using Robust.Client.UserInterface;
 using Robust.Shared.Configuration;
 using Robust.Shared.Timing;
 
@@ -8,34 +9,11 @@ namespace Content.Client.Communications.UI
 {
     public sealed class CommunicationsConsoleBoundUserInterface : BoundUserInterface
     {
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
 
         [ViewVariables]
         private CommunicationsConsoleMenu? _menu;
 
-        [ViewVariables]
-        public bool CanAnnounce { get; private set; }
-        [ViewVariables]
-        public bool CanBroadcast { get; private set; }
-
-        [ViewVariables]
-        public bool CanCall { get; private set; }
-
-        [ViewVariables]
-        public bool CountdownStarted { get; private set; }
-
-        [ViewVariables]
-        public bool AlertLevelSelectable { get; private set; }
-
-        [ViewVariables]
-        public string CurrentLevel { get; private set; } = default!;
-
-        [ViewVariables]
-        private TimeSpan? _expectedCountdownTime;
-
-        public int Countdown => _expectedCountdownTime == null ? 0 : Math.Max((int) _expectedCountdownTime.Value.Subtract(_gameTiming.CurTime).TotalSeconds, 0);
-
         public CommunicationsConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
         {
         }
@@ -44,23 +22,25 @@ protected override void Open()
         {
             base.Open();
 
-            _menu = new CommunicationsConsoleMenu(this);
-            _menu.OnClose += Close;
-            _menu.OpenCentered();
+            _menu = this.CreateWindow<CommunicationsConsoleMenu>();
+            _menu.OnAnnounce += AnnounceButtonPressed;
+            _menu.OnBroadcast += BroadcastButtonPressed;
+            _menu.OnAlertLevel += AlertLevelSelected;
+            _menu.OnEmergencyLevel += EmergencyShuttleButtonPressed;
         }
 
         public void AlertLevelSelected(string level)
         {
-            if (AlertLevelSelectable)
+            if (_menu!.AlertLevelSelectable)
             {
-                CurrentLevel = level;
+                _menu.CurrentLevel = level;
                 SendMessage(new CommunicationsConsoleSelectAlertLevelMessage(level));
             }
         }
 
         public void EmergencyShuttleButtonPressed()
         {
-            if (CountdownStarted)
+            if (_menu!.CountdownStarted)
                 RecallShuttle();
             else
                 CallShuttle();
@@ -95,31 +75,23 @@ protected override void UpdateState(BoundUserInterfaceState state)
             if (state is not CommunicationsConsoleInterfaceState commsState)
                 return;
 
-            CanAnnounce = commsState.CanAnnounce;
-            CanBroadcast = commsState.CanBroadcast;
-            CanCall = commsState.CanCall;
-            _expectedCountdownTime = commsState.ExpectedCountdownEnd;
-            CountdownStarted = commsState.CountdownStarted;
-            AlertLevelSelectable = commsState.AlertLevels != null && !float.IsNaN(commsState.CurrentAlertDelay) && commsState.CurrentAlertDelay <= 0;
-            CurrentLevel = commsState.CurrentAlert;
-
             if (_menu != null)
             {
+                _menu.CanAnnounce = commsState.CanAnnounce;
+                _menu.CanBroadcast = commsState.CanBroadcast;
+                _menu.CanCall = commsState.CanCall;
+                _menu.CountdownStarted = commsState.CountdownStarted;
+                _menu.AlertLevelSelectable = commsState.AlertLevels != null && !float.IsNaN(commsState.CurrentAlertDelay) && commsState.CurrentAlertDelay <= 0;
+                _menu.CurrentLevel = commsState.CurrentAlert;
+                _menu.CountdownEnd = commsState.ExpectedCountdownEnd;
+
                 _menu.UpdateCountdown();
-                _menu.UpdateAlertLevels(commsState.AlertLevels, CurrentLevel);
-                _menu.AlertLevelButton.Disabled = !AlertLevelSelectable;
-                _menu.EmergencyShuttleButton.Disabled = !CanCall;
-                _menu.AnnounceButton.Disabled = !CanAnnounce;
-                _menu.BroadcastButton.Disabled = !CanBroadcast;
+                _menu.UpdateAlertLevels(commsState.AlertLevels, _menu.CurrentLevel);
+                _menu.AlertLevelButton.Disabled = !_menu.AlertLevelSelectable;
+                _menu.EmergencyShuttleButton.Disabled = !_menu.CanCall;
+                _menu.AnnounceButton.Disabled = !_menu.CanAnnounce;
+                _menu.BroadcastButton.Disabled = !_menu.CanBroadcast;
             }
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing) return;
-
-            _menu?.Dispose();
-        }
     }
 }
diff --git a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs
index 4d8dd86a4dc..56604ba526d 100644
--- a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs
+++ b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs
@@ -1,31 +1,40 @@
-using Content.Client.UserInterface.Controls;
-using System.Threading;
+using System.Globalization;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.CCVar;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Configuration;
+using Robust.Shared.Timing;
 using Robust.Shared.Utility;
-using Timer = Robust.Shared.Timing.Timer;
 
 namespace Content.Client.Communications.UI
 {
     [GenerateTypedNameReferences]
     public sealed partial class CommunicationsConsoleMenu : FancyWindow
     {
-        private CommunicationsConsoleBoundUserInterface Owner { get; set; }
-        private readonly CancellationTokenSource _timerCancelTokenSource = new();
-
         [Dependency] private readonly IConfigurationManager _cfg = default!;
-
-        public CommunicationsConsoleMenu(CommunicationsConsoleBoundUserInterface owner)
+        [Dependency] private readonly IGameTiming _timing = default!;
+        [Dependency] private readonly ILocalizationManager _loc = default!;
+
+        public bool CanAnnounce;
+        public bool CanBroadcast;
+        public bool CanCall;
+        public bool AlertLevelSelectable;
+        public bool CountdownStarted;
+        public string CurrentLevel = string.Empty;
+        public TimeSpan? CountdownEnd;
+
+        public event Action? OnEmergencyLevel;
+        public event Action<string>? OnAlertLevel;
+        public event Action<string>? OnAnnounce;
+        public event Action<string>? OnBroadcast;
+
+        public CommunicationsConsoleMenu()
         {
             IoCManager.InjectDependencies(this);
             RobustXamlLoader.Load(this);
 
-            Owner = owner;
-
-            var loc = IoCManager.Resolve<ILocalizationManager>();
-            MessageInput.Placeholder = new Rope.Leaf(loc.GetString("comms-console-menu-announcement-placeholder"));
+            MessageInput.Placeholder = new Rope.Leaf(_loc.GetString("comms-console-menu-announcement-placeholder"));
 
             var maxAnnounceLength = _cfg.GetCVar(CCVars.ChatMaxAnnouncementLength);
             MessageInput.OnTextChanged += (args) =>
@@ -37,33 +46,38 @@ public CommunicationsConsoleMenu(CommunicationsConsoleBoundUserInterface owner)
                 }
                 else
                 {
-                    AnnounceButton.Disabled = !owner.CanAnnounce;
+                    AnnounceButton.Disabled = !CanAnnounce;
                     AnnounceButton.ToolTip = null;
 
                 }
             };
 
-            AnnounceButton.OnPressed += (_) => Owner.AnnounceButtonPressed(Rope.Collapse(MessageInput.TextRope));
-            AnnounceButton.Disabled = !owner.CanAnnounce;
+            AnnounceButton.OnPressed += _ => OnAnnounce?.Invoke(Rope.Collapse(MessageInput.TextRope));
+            AnnounceButton.Disabled = !CanAnnounce;
 
-            BroadcastButton.OnPressed += (_) => Owner.BroadcastButtonPressed(Rope.Collapse(MessageInput.TextRope));
-            BroadcastButton.Disabled = !owner.CanBroadcast;
+            BroadcastButton.OnPressed += _ => OnBroadcast?.Invoke(Rope.Collapse(MessageInput.TextRope));
+            BroadcastButton.Disabled = !CanBroadcast;
 
             AlertLevelButton.OnItemSelected += args =>
             {
                 var metadata = AlertLevelButton.GetItemMetadata(args.Id);
                 if (metadata != null && metadata is string cast)
                 {
-                    Owner.AlertLevelSelected(cast);
+                    OnAlertLevel?.Invoke(cast);
                 }
             };
-            AlertLevelButton.Disabled = !owner.AlertLevelSelectable;
 
-            EmergencyShuttleButton.OnPressed += (_) => Owner.EmergencyShuttleButtonPressed();
-            EmergencyShuttleButton.Disabled = !owner.CanCall;
 
+            AlertLevelButton.Disabled = !AlertLevelSelectable;
+
+            EmergencyShuttleButton.OnPressed += _ => OnEmergencyLevel?.Invoke();
+            EmergencyShuttleButton.Disabled = !CanCall;
+        }
+
+        protected override void FrameUpdate(FrameEventArgs args)
+        {
+            base.FrameUpdate(args);
             UpdateCountdown();
-            Timer.SpawnRepeating(1000, UpdateCountdown, _timerCancelTokenSource.Token);
         }
 
         // The current alert could make levels unselectable, so we need to ensure that the UI reacts properly.
@@ -105,30 +119,19 @@ public void UpdateAlertLevels(List<string>? alerts, string currentAlert)
 
         public void UpdateCountdown()
         {
-            if (!Owner.CountdownStarted)
+            if (!CountdownStarted)
             {
-                CountdownLabel.SetMessage("");
+                CountdownLabel.SetMessage(string.Empty);
                 EmergencyShuttleButton.Text = Loc.GetString("comms-console-menu-call-shuttle");
                 return;
             }
 
-            EmergencyShuttleButton.Text = Loc.GetString("comms-console-menu-recall-shuttle");
-            CountdownLabel.SetMessage($"Time remaining\n{Owner.Countdown.ToString()}s");
-        }
-
-        public override void Close()
-        {
-            base.Close();
-
-            _timerCancelTokenSource.Cancel();
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
+            var diff = MathHelper.Max((CountdownEnd - _timing.CurTime) ?? TimeSpan.Zero, TimeSpan.Zero);
 
-            if (disposing)
-                _timerCancelTokenSource.Cancel();
+            EmergencyShuttleButton.Text = Loc.GetString("comms-console-menu-recall-shuttle");
+            var infoText = Loc.GetString($"comms-console-menu-time-remaining",
+                ("time", diff.ToString(@"hh\:mm\:ss", CultureInfo.CurrentCulture)));
+            CountdownLabel.SetMessage(infoText);
         }
     }
 }
diff --git a/Content.Client/Computer/ComputerBoundUserInterface.cs b/Content.Client/Computer/ComputerBoundUserInterface.cs
index bdbfe03fa10..11c26b252e9 100644
--- a/Content.Client/Computer/ComputerBoundUserInterface.cs
+++ b/Content.Client/Computer/ComputerBoundUserInterface.cs
@@ -1,4 +1,5 @@
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.CustomControls;
 
 namespace Content.Client.Computer
@@ -19,10 +20,8 @@ protected override void Open()
         {
             base.Open();
 
-            _window = (TWindow) _dynamicTypeFactory.CreateInstance(typeof(TWindow));
+            _window = this.CreateWindow<TWindow>();
             _window.SetupComputerWindow(this);
-            _window.OnClose += Close;
-            _window.OpenCentered();
         }
 
         // Alas, this constructor has to be copied to the subclass. :(
@@ -42,16 +41,6 @@ protected override void UpdateState(BoundUserInterfaceState state)
             _window.UpdateState((TState) state);
         }
 
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            if (disposing)
-            {
-                _window?.Dispose();
-            }
-        }
-
         protected override void ReceiveMessage(BoundUserInterfaceMessage message)
         {
             _window?.ReceiveMessage(message);
diff --git a/Content.Client/Configurable/UI/ConfigurationBoundUserInterface.cs b/Content.Client/Configurable/UI/ConfigurationBoundUserInterface.cs
index 4fea44f2253..e4966f1ec43 100644
--- a/Content.Client/Configurable/UI/ConfigurationBoundUserInterface.cs
+++ b/Content.Client/Configurable/UI/ConfigurationBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using System.Text.RegularExpressions;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using static Content.Shared.Configurable.ConfigurationComponent;
 
 namespace Content.Client.Configurable.UI
@@ -9,9 +10,6 @@ public sealed class ConfigurationBoundUserInterface : BoundUserInterface
         [ViewVariables]
         private ConfigurationMenu? _menu;
 
-        [ViewVariables]
-        public Regex? Validation { get; internal set; }
-
         public ConfigurationBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
         {
         }
@@ -19,10 +17,8 @@ public ConfigurationBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner
         protected override void Open()
         {
             base.Open();
-            _menu = new ConfigurationMenu(this);
-
-            _menu.OnClose += Close;
-            _menu.OpenCentered();
+            _menu = this.CreateWindow<ConfigurationMenu>();
+            _menu.OnConfiguration += SendConfiguration;
         }
 
         protected override void UpdateState(BoundUserInterfaceState state)
@@ -30,9 +26,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
             base.UpdateState(state);
 
             if (state is not ConfigurationBoundUserInterfaceState configurationState)
-            {
                 return;
-            }
 
             _menu?.Populate(configurationState);
         }
@@ -41,9 +35,12 @@ protected override void ReceiveMessage(BoundUserInterfaceMessage message)
         {
             base.ReceiveMessage(message);
 
+            if (_menu == null)
+                return;
+
             if (message is ValidationUpdateMessage msg)
             {
-                Validation = new Regex(msg.ValidationString, RegexOptions.Compiled);
+                _menu.Validation = new Regex(msg.ValidationString, RegexOptions.Compiled);
             }
         }
 
@@ -51,16 +48,5 @@ public void SendConfiguration(Dictionary<string, string> config)
         {
             SendMessage(new ConfigurationUpdatedMessage(config));
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            if (disposing && _menu != null)
-            {
-                _menu.OnClose -= Close;
-                _menu.Close();
-            }
-        }
     }
 }
diff --git a/Content.Client/Configurable/UI/ConfigurationMenu.cs b/Content.Client/Configurable/UI/ConfigurationMenu.cs
index cc24af28692..29217eef7be 100644
--- a/Content.Client/Configurable/UI/ConfigurationMenu.cs
+++ b/Content.Client/Configurable/UI/ConfigurationMenu.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Numerics;
+using System.Text.RegularExpressions;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
@@ -13,23 +14,25 @@ namespace Content.Client.Configurable.UI
 {
     public sealed class ConfigurationMenu : DefaultWindow
     {
-        public ConfigurationBoundUserInterface Owner { get; }
-
         private readonly BoxContainer _column;
         private readonly BoxContainer _row;
 
         private readonly List<(string  name, LineEdit input)> _inputs;
 
-        public ConfigurationMenu(ConfigurationBoundUserInterface owner)
+        [ViewVariables]
+        public Regex? Validation { get; internal set; }
+
+        public event Action<Dictionary<string, string>>? OnConfiguration;
+
+        public ConfigurationMenu()
         {
             MinSize = SetSize = new Vector2(300, 250);
-            Owner = owner;
 
             _inputs = new List<(string name, LineEdit input)>();
 
             Title = Loc.GetString("configuration-menu-device-title");
 
-            BoxContainer baseContainer = new BoxContainer
+            var baseContainer = new BoxContainer
             {
                 Orientation = LayoutOrientation.Vertical,
                 VerticalExpand = true,
@@ -116,14 +119,13 @@ public void Populate(ConfigurationBoundUserInterfaceState state)
         private void OnConfirm(ButtonEventArgs args)
         {
             var config = GenerateDictionary(_inputs, "Text");
-
-            Owner.SendConfiguration(config);
+            OnConfiguration?.Invoke(config);
             Close();
         }
 
         private bool Validate(string value)
         {
-            return Owner.Validation == null || Owner.Validation.IsMatch(value);
+            return Validation?.IsMatch(value) != false;
         }
 
         private Dictionary<string, string> GenerateDictionary(IEnumerable<(string name, LineEdit input)> inputs, string propertyName)
diff --git a/Content.Client/Construction/ConstructionSystem.cs b/Content.Client/Construction/ConstructionSystem.cs
index 453658bebf9..f909b23423d 100644
--- a/Content.Client/Construction/ConstructionSystem.cs
+++ b/Content.Client/Construction/ConstructionSystem.cs
@@ -26,7 +26,6 @@ public sealed class ConstructionSystem : SharedConstructionSystem
     {
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
         [Dependency] private readonly ExamineSystemShared _examineSystem = default!;
         [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
         [Dependency] private readonly PopupSystem _popupSystem = default!;
@@ -48,11 +47,11 @@ public override void Initialize()
 
             CommandBinds.Builder
                 .Bind(ContentKeyFunctions.OpenCraftingMenu,
-                    new PointerInputCmdHandler(HandleOpenCraftingMenu, outsidePrediction:true))
+                    new PointerInputCmdHandler(HandleOpenCraftingMenu, outsidePrediction: true))
                 .Bind(EngineKeyFunctions.Use,
                     new PointerInputCmdHandler(HandleUse, outsidePrediction: true))
                 .Bind(ContentKeyFunctions.EditorFlipObject,
-                    new PointerInputCmdHandler(HandleFlip, outsidePrediction:true))
+                    new PointerInputCmdHandler(HandleFlip, outsidePrediction: true))
                 .Register<ConstructionSystem>();
 
             SubscribeLocalEvent<ConstructionGhostComponent, ExaminedEvent>(HandleConstructionGhostExamined);
@@ -196,7 +195,7 @@ public bool TrySpawnGhost(
             if (GhostPresent(loc))
                 return false;
 
-            var predicate = GetPredicate(prototype.CanBuildInImpassable, loc.ToMap(EntityManager, _transformSystem));
+            var predicate = GetPredicate(prototype.CanBuildInImpassable, _transformSystem.ToMapCoordinates(loc));
             if (!_examineSystem.InRangeUnOccluded(user, loc, 20f, predicate: predicate))
                 return false;
 
diff --git a/Content.Client/Construction/UI/FlatpackCreatorBoundUserInterface.cs b/Content.Client/Construction/UI/FlatpackCreatorBoundUserInterface.cs
index 86f1b8b83c7..887492955e9 100644
--- a/Content.Client/Construction/UI/FlatpackCreatorBoundUserInterface.cs
+++ b/Content.Client/Construction/UI/FlatpackCreatorBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Construction.Components;
 using JetBrains.Annotations;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Construction.UI
 {
@@ -17,8 +18,8 @@ protected override void Open()
         {
             base.Open();
 
-            _menu = new FlatpackCreatorMenu(Owner);
-            _menu.OnClose += Close;
+            _menu = this.CreateWindow<FlatpackCreatorMenu>();
+            _menu.SetEntity(Owner);
 
             _menu.PackButtonPressed += () =>
             {
@@ -27,14 +28,5 @@ protected override void Open()
 
             _menu.OpenCentered();
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing)
-                return;
-
-            _menu?.Dispose();
-        }
     }
 }
diff --git a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs
index 00261632378..2a386a03de6 100644
--- a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs
+++ b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs
@@ -25,7 +25,7 @@ public sealed partial class FlatpackCreatorMenu : FancyWindow
     private readonly MaterialStorageSystem _materialStorage;
     private readonly SpriteSystem _spriteSystem;
 
-    private readonly EntityUid _owner;
+    private EntityUid _owner;
 
     [ValidatePrototypeId<EntityPrototype>]
     public const string NoBoardEffectId = "FlatpackerNoBoardEffect";
@@ -35,7 +35,7 @@ public sealed partial class FlatpackCreatorMenu : FancyWindow
 
     public event Action? PackButtonPressed;
 
-    public FlatpackCreatorMenu(EntityUid uid)
+    public FlatpackCreatorMenu()
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
@@ -45,14 +45,17 @@ public FlatpackCreatorMenu(EntityUid uid)
         _materialStorage = _entityManager.System<MaterialStorageSystem>();
         _spriteSystem = _entityManager.System<SpriteSystem>();
 
-        _owner = uid;
-
         PackButton.OnPressed += _ => PackButtonPressed?.Invoke();
 
-        MaterialStorageControl.SetOwner(uid);
         InsertLabel.SetMarkup(Loc.GetString("flatpacker-ui-insert-board"));
     }
 
+    public void SetEntity(EntityUid uid)
+    {
+        _owner = uid;
+        MaterialStorageControl.SetOwner(uid);
+    }
+
     protected override void FrameUpdate(FrameEventArgs args)
     {
         base.FrameUpdate(args);
diff --git a/Content.Client/ContextMenu/UI/EntityMenuUIController.cs b/Content.Client/ContextMenu/UI/EntityMenuUIController.cs
index a60619baa35..0462c095ba8 100644
--- a/Content.Client/ContextMenu/UI/EntityMenuUIController.cs
+++ b/Content.Client/ContextMenu/UI/EntityMenuUIController.cs
@@ -170,7 +170,7 @@ private bool HandleOpenEntityMenu(in PointerInputCmdHandler.PointerInputCmdArgs
             if (_combatMode.IsInCombatMode(args.Session?.AttachedEntity))
                 return false;
 
-            var coords = args.Coordinates.ToMap(_entityManager, _xform);
+            var coords = _xform.ToMapCoordinates(args.Coordinates);
 
             if (_verbSystem.TryGetEntityMenuEntities(coords, out var entities))
                 OpenRootMenu(entities);
diff --git a/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs b/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs
index e2c4d51ecd1..e5be0b1811f 100644
--- a/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs
+++ b/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs
@@ -2,12 +2,15 @@
 using Content.Shared.Crayon;
 using Content.Shared.Decals;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.Crayon.UI
 {
     public sealed class CrayonBoundUserInterface : BoundUserInterface
     {
+        [Dependency] private readonly IPrototypeManager _protoManager = default!;
+
         [ViewVariables]
         private CrayonWindow? _menu;
 
@@ -18,15 +21,29 @@ public CrayonBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey
         protected override void Open()
         {
             base.Open();
-            _menu = new CrayonWindow(this);
-
-            _menu.OnClose += Close;
-            var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
-            var crayonDecals = prototypeManager.EnumeratePrototypes<DecalPrototype>().Where(x => x.Tags.Contains("crayon"));
-            _menu.Populate(crayonDecals);
+            _menu = this.CreateWindow<CrayonWindow>();
+            _menu.OnColorSelected += SelectColor;
+            _menu.OnSelected += Select;
+            PopulateCrayons();
             _menu.OpenCenteredLeft();
         }
 
+        private void PopulateCrayons()
+        {
+            var crayonDecals = _protoManager.EnumeratePrototypes<DecalPrototype>().Where(x => x.Tags.Contains("crayon"));
+            _menu?.Populate(crayonDecals);
+        }
+
+        public override void OnProtoReload(PrototypesReloadedEventArgs args)
+        {
+            base.OnProtoReload(args);
+
+            if (!args.WasModified<DecalPrototype>())
+                return;
+
+            PopulateCrayons();
+        }
+
         protected override void UpdateState(BoundUserInterfaceState state)
         {
             base.UpdateState(state);
@@ -43,16 +60,5 @@ public void SelectColor(Color color)
         {
             SendMessage(new CrayonColorMessage(color));
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            if (disposing)
-            {
-                _menu?.Close();
-                _menu = null;
-            }
-        }
     }
 }
diff --git a/Content.Client/Crayon/UI/CrayonWindow.xaml.cs b/Content.Client/Crayon/UI/CrayonWindow.xaml.cs
index 2a5801ccf2d..6ef282d219a 100644
--- a/Content.Client/Crayon/UI/CrayonWindow.xaml.cs
+++ b/Content.Client/Crayon/UI/CrayonWindow.xaml.cs
@@ -18,18 +18,17 @@ namespace Content.Client.Crayon.UI
     [GenerateTypedNameReferences]
     public sealed partial class CrayonWindow : DefaultWindow
     {
-        public CrayonBoundUserInterface Owner { get; }
-
         private Dictionary<string, Texture>? _decals;
         private string? _selected;
         private Color _color;
 
-        public CrayonWindow(CrayonBoundUserInterface owner)
+        public event Action<Color>? OnColorSelected;
+        public event Action<string>? OnSelected;
+
+        public CrayonWindow()
         {
             RobustXamlLoader.Load(this);
 
-            Owner = owner;
-
             Search.OnTextChanged += _ => RefreshList();
             ColorSelector.OnColorChanged += SelectColor;
         }
@@ -38,16 +37,16 @@ private void SelectColor(Color color)
         {
             _color = color;
 
-            Owner.SelectColor(color);
-
+            OnColorSelected?.Invoke(color);
             RefreshList();
         }
 
         private void RefreshList()
         {
             // Clear
-            Grid.RemoveAllChildren();
-            if (_decals == null) return;
+            Grid.DisposeAllChildren();
+            if (_decals == null)
+                return;
 
             var filter = Search.Text;
             foreach (var (decal, tex) in _decals)
@@ -89,8 +88,8 @@ private void ButtonOnPressed(ButtonEventArgs obj)
         {
             if (obj.Button.Name == null) return;
 
-            Owner.Select(obj.Button.Name);
             _selected = obj.Button.Name;
+            OnSelected?.Invoke(_selected);
             RefreshList();
         }
 
diff --git a/Content.Client/CrewManifest/UI/CrewManifestSection.cs b/Content.Client/CrewManifest/UI/CrewManifestSection.cs
index 4b1b02cb755..29cf850e2b9 100644
--- a/Content.Client/CrewManifest/UI/CrewManifestSection.cs
+++ b/Content.Client/CrewManifest/UI/CrewManifestSection.cs
@@ -51,7 +51,7 @@ public CrewManifestSection(
             title.SetMessage(entry.JobTitle);
 
 
-            if (prototypeManager.TryIndex<StatusIconPrototype>(entry.JobIcon, out var jobIcon))
+            if (prototypeManager.TryIndex<JobIconPrototype>(entry.JobIcon, out var jobIcon))
             {
                 var icon = new TextureRect()
                 {
diff --git a/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs b/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs
index b259e08e723..21aa54c9622 100644
--- a/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs
+++ b/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs
@@ -7,10 +7,12 @@
 using Content.Shared.StationRecords;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Player;
+using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
+using System.Linq;
 
 namespace Content.Client.CriminalRecords;
 
@@ -36,7 +38,6 @@ public sealed partial class CriminalRecordsConsoleWindow : FancyWindow
     public Action<SecurityStatus, string>? OnDialogConfirmed;
 
     private uint _maxLength;
-    private bool _isPopulating;
     private bool _access;
     private uint? _selectedKey;
     private CriminalRecord? _selectedRecord;
@@ -74,7 +75,7 @@ public CriminalRecordsConsoleWindow(EntityUid console, uint maxLength, IPlayerMa
 
         RecordListing.OnItemSelected += args =>
         {
-            if (_isPopulating || RecordListing[args.ItemIndex].Metadata is not uint cast)
+            if (RecordListing[args.ItemIndex].Metadata is not uint cast)
                 return;
 
             OnKeySelected?.Invoke(cast);
@@ -82,8 +83,7 @@ public CriminalRecordsConsoleWindow(EntityUid console, uint maxLength, IPlayerMa
 
         RecordListing.OnItemDeselected += _ =>
         {
-            if (!_isPopulating)
-                OnKeySelected?.Invoke(null);
+            OnKeySelected?.Invoke(null);
         };
 
         FilterType.OnItemSelected += eventArgs =>
@@ -133,13 +133,8 @@ public void UpdateState(CriminalRecordsConsoleState state)
 
         FilterType.SelectId((int)_currentFilterType);
 
-        // set up the records listing panel
-        RecordListing.Clear();
-
-        var hasRecords = state.RecordListing != null && state.RecordListing.Count > 0;
-        NoRecords.Visible = !hasRecords;
-        if (hasRecords)
-            PopulateRecordListing(state.RecordListing!);
+        NoRecords.Visible = state.RecordListing == null || state.RecordListing.Count == 0;
+        PopulateRecordListing(state.RecordListing);
 
         // set up the selected person's record
         var selected = _selectedKey != null;
@@ -167,19 +162,59 @@ public void UpdateState(CriminalRecordsConsoleState state)
         }
     }
 
-    private void PopulateRecordListing(Dictionary<uint, string> listing)
+    private void PopulateRecordListing(Dictionary<uint, string>? listing)
     {
-        _isPopulating = true;
+        if (listing == null)
+        {
+            RecordListing.Clear();
+            return;
+        }
+
+        var entries = listing.ToList();
+        entries.Sort((a, b) => string.Compare(a.Value, b.Value, StringComparison.Ordinal));
+        // `entries` now contains the definitive list of items which should be in
+        // our list of records and is in the order we want to present those items.
+
+        // Walk through the existing items in RecordListing and in the updated listing
+        // in parallel to synchronize the items in RecordListing with `entries`.
+        int i = RecordListing.Count - 1;
+        int j = entries.Count - 1;
+        while(i >= 0 && j >= 0)
+        {
+            var strcmp = string.Compare(RecordListing[i].Text, entries[j].Value, StringComparison.Ordinal);
+            if (strcmp == 0)
+            {
+                // This item exists in both RecordListing and `entries`. Nothing to do.
+                i--;
+                j--;
+            }
+            else if (strcmp > 0)
+            {
+                // Item exists in RecordListing, but not in `entries`. Remove it.
+                RecordListing.RemoveAt(i);
+                i--;
+            }
+            else if (strcmp < 0)
+            {
+                // A new entry which doesn't exist in RecordListing. Create it.
+                RecordListing.Insert(i + 1, new ItemList.Item(RecordListing){Text = entries[j].Value, Metadata = entries[j].Key});
+                j--;
+            }
+        }
 
-        foreach (var (key, name) in listing)
+        // Any remaining items in RecordListing don't exist in `entries`, so remove them
+        while (i >= 0)
         {
-            var item = RecordListing.AddItem(name);
-            item.Metadata = key;
-            item.Selected = key == _selectedKey;
+            RecordListing.RemoveAt(i);
+            i--;
         }
-        _isPopulating = false;
 
-        RecordListing.SortItemsByText();
+        // And finally, any remaining items in `entries`, don't exist in RecordListing. Create them.
+        while (j >= 0)
+        {
+            RecordListing.Insert(0, new ItemList.Item(RecordListing){Text = entries[j].Value, Metadata = entries[j].Key});
+            j--;
+        }
     }
 
     private void PopulateRecordContainer(GeneralStationRecord stationRecord, CriminalRecord criminalRecord)
@@ -211,10 +246,7 @@ private void AddStatusSelect(SecurityStatus status)
 
     private void FilterListingOfRecords(string text = "")
     {
-        if (!_isPopulating)
-        {
-            OnFiltersChanged?.Invoke(_currentFilterType, text);
-        }
+        OnFiltersChanged?.Invoke(_currentFilterType, text);
     }
 
     private void SetStatus(SecurityStatus status)
diff --git a/Content.Client/DisplacementMap/DisplacementMapSystem.cs b/Content.Client/DisplacementMap/DisplacementMapSystem.cs
new file mode 100644
index 00000000000..6db164a09f0
--- /dev/null
+++ b/Content.Client/DisplacementMap/DisplacementMapSystem.cs
@@ -0,0 +1,65 @@
+using Content.Shared.DisplacementMap;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Shared.Serialization.Manager;
+
+namespace Content.Client.DisplacementMap;
+
+public sealed class DisplacementMapSystem : EntitySystem
+{
+    [Dependency] private readonly ISerializationManager _serialization = default!;
+
+    public bool TryAddDisplacement(DisplacementData data, SpriteComponent sprite, int index, string key, HashSet<string> revealedLayers)
+    {
+        if (data.ShaderOverride != null)
+            sprite.LayerSetShader(index, data.ShaderOverride);
+
+        var displacementKey = $"{key}-displacement";
+        if (!revealedLayers.Add(displacementKey))
+        {
+            Log.Warning($"Duplicate key for DISPLACEMENT: {displacementKey}.");
+            return false;
+        }
+
+        //allows you not to write it every time in the YML
+        foreach (var pair in data.SizeMaps)
+        {
+            pair.Value.CopyToShaderParameters??= new()
+            {
+                LayerKey = "dummy",
+                ParameterTexture = "displacementMap",
+                ParameterUV = "displacementUV",
+            };
+        }
+
+        if (!data.SizeMaps.ContainsKey(32))
+        {
+            Log.Error($"DISPLACEMENT: {displacementKey} don't have 32x32 default displacement map");
+            return false;
+        }
+
+        // We choose a displacement map from the possible ones, matching the size with the original layer size.
+        // If there is no such a map, we use a standard 32 by 32 one
+        var displacementDataLayer = data.SizeMaps[EyeManager.PixelsPerMeter];
+        var actualRSI = sprite.LayerGetActualRSI(index);
+        if (actualRSI is not null)
+        {
+            if (actualRSI.Size.X != actualRSI.Size.Y)
+                Log.Warning($"DISPLACEMENT: {displacementKey} has a resolution that is not 1:1, things can look crooked");
+
+            var layerSize = actualRSI.Size.X;
+            if (data.SizeMaps.ContainsKey(layerSize))
+                displacementDataLayer = data.SizeMaps[layerSize];
+        }
+
+        var displacementLayer = _serialization.CreateCopy(displacementDataLayer, notNullableOverride: true);
+        displacementLayer.CopyToShaderParameters!.LayerKey = key;
+
+        sprite.AddLayer(displacementLayer, index);
+        sprite.LayerMapSet(displacementKey, index);
+
+        revealedLayers.Add(displacementKey);
+
+        return true;
+    }
+}
diff --git a/Content.Client/Disposal/UI/DisposalRouterBoundUserInterface.cs b/Content.Client/Disposal/UI/DisposalRouterBoundUserInterface.cs
index e8e77217ea5..296e71d3a95 100644
--- a/Content.Client/Disposal/UI/DisposalRouterBoundUserInterface.cs
+++ b/Content.Client/Disposal/UI/DisposalRouterBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using static Content.Shared.Disposal.Components.SharedDisposalRouterComponent;
 
 namespace Content.Client.Disposal.UI
@@ -21,20 +22,16 @@ protected override void Open()
         {
             base.Open();
 
-            _window = new DisposalRouterWindow();
-
-            _window.OpenCentered();
-            _window.OnClose += Close;
+            _window = this.CreateWindow<DisposalRouterWindow>();
 
             _window.Confirm.OnPressed += _ => ButtonPressed(UiAction.Ok, _window.TagInput.Text);
             _window.TagInput.OnTextEntered += args => ButtonPressed(UiAction.Ok, args.Text);
-
         }
 
         private void ButtonPressed(UiAction action, string tag)
         {
             SendMessage(new UiActionMessage(action, tag));
-            _window?.Close();
+            Close();
         }
 
         protected override void UpdateState(BoundUserInterfaceState state)
@@ -48,18 +45,5 @@ protected override void UpdateState(BoundUserInterfaceState state)
 
             _window?.UpdateState(cast);
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            if (disposing)
-            {
-                _window?.Dispose();
-            }
-        }
-
-
     }
-
 }
diff --git a/Content.Client/Disposal/UI/DisposalTaggerBoundUserInterface.cs b/Content.Client/Disposal/UI/DisposalTaggerBoundUserInterface.cs
index 3aeed8dc802..7fc0eb85401 100644
--- a/Content.Client/Disposal/UI/DisposalTaggerBoundUserInterface.cs
+++ b/Content.Client/Disposal/UI/DisposalTaggerBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using static Content.Shared.Disposal.Components.SharedDisposalTaggerComponent;
 
 namespace Content.Client.Disposal.UI
@@ -21,20 +22,17 @@ protected override void Open()
         {
             base.Open();
 
-            _window = new DisposalTaggerWindow();
-
-            _window.OpenCentered();
-            _window.OnClose += Close;
+            _window = this.CreateWindow<DisposalTaggerWindow>();
 
             _window.Confirm.OnPressed += _ => ButtonPressed(UiAction.Ok, _window.TagInput.Text);
             _window.TagInput.OnTextEntered += args => ButtonPressed(UiAction.Ok, args.Text);
-
         }
 
         private void ButtonPressed(UiAction action, string tag)
         {
+            // TODO: This looks copy-pasted with the other mailing stuff...
             SendMessage(new UiActionMessage(action, tag));
-            _window?.Close();
+            Close();
         }
 
         protected override void UpdateState(BoundUserInterfaceState state)
@@ -48,18 +46,5 @@ protected override void UpdateState(BoundUserInterfaceState state)
 
             _window?.UpdateState(cast);
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            if (disposing)
-            {
-                _window?.Dispose();
-            }
-        }
-
-
     }
-
 }
diff --git a/Content.Client/Disposal/UI/MailingUnitWindow.xaml.cs b/Content.Client/Disposal/UI/MailingUnitWindow.xaml.cs
index 797e20ae7d2..489d749a0cf 100644
--- a/Content.Client/Disposal/UI/MailingUnitWindow.xaml.cs
+++ b/Content.Client/Disposal/UI/MailingUnitWindow.xaml.cs
@@ -2,6 +2,7 @@
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Timing;
 
 namespace Content.Client.Disposal.UI
 {
@@ -11,6 +12,8 @@ namespace Content.Client.Disposal.UI
     [GenerateTypedNameReferences]
     public sealed partial class MailingUnitWindow : DefaultWindow
     {
+        public TimeSpan FullPressure;
+
         public MailingUnitWindow()
         {
             RobustXamlLoader.Load(this);
@@ -26,6 +29,7 @@ public bool UpdateState(MailingUnitBoundUserInterfaceState state)
 
             Title = Loc.GetString("ui-mailing-unit-window-title", ("tag", state.Tag ?? " "));
             UnitState.Text = disposalState.UnitState;
+            FullPressure = disposalState.FullPressureTime;
             var pressureReached = PressureBar.UpdatePressure(disposalState.FullPressureTime);
             Power.Pressed = disposalState.Powered;
             Engage.Pressed = disposalState.Engaged;
@@ -42,9 +46,10 @@ public bool UpdateState(MailingUnitBoundUserInterfaceState state)
             return !disposalState.Powered || pressureReached;
         }
 
-        public bool UpdatePressure(TimeSpan stateFullPressureTime)
+        protected override void FrameUpdate(FrameEventArgs args)
         {
-            return PressureBar.UpdatePressure(stateFullPressureTime);
+            base.FrameUpdate(args);
+            PressureBar.UpdatePressure(FullPressure);
         }
     }
 }
diff --git a/Content.Client/Doors/Electronics/DoorElectronicsBoundUserInterface.cs b/Content.Client/Doors/Electronics/DoorElectronicsBoundUserInterface.cs
index cd7ea717ce3..9b7e23c03aa 100644
--- a/Content.Client/Doors/Electronics/DoorElectronicsBoundUserInterface.cs
+++ b/Content.Client/Doors/Electronics/DoorElectronicsBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Access;
 using Content.Shared.Doors.Electronics;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.Doors.Electronics;
@@ -18,6 +19,23 @@ public DoorElectronicsBoundUserInterface(EntityUid owner, Enum uiKey) : base(own
     protected override void Open()
     {
         base.Open();
+        _window = this.CreateWindow<DoorElectronicsConfigurationMenu>();
+        _window.OnAccessChanged += UpdateConfiguration;
+        Reset();
+    }
+
+    public override void OnProtoReload(PrototypesReloadedEventArgs args)
+    {
+        base.OnProtoReload(args);
+
+        if (!args.WasModified<AccessLevelPrototype>())
+            return;
+
+        Reset();
+    }
+
+    private void Reset()
+    {
         List<ProtoId<AccessLevelPrototype>> accessLevels = new();
 
         foreach (var accessLevel in _prototypeManager.EnumeratePrototypes<AccessLevelPrototype>())
@@ -29,10 +47,7 @@ protected override void Open()
         }
 
         accessLevels.Sort();
-
-        _window = new DoorElectronicsConfigurationMenu(this, accessLevels, _prototypeManager);
-        _window.OnClose += Close;
-        _window.OpenCentered();
+        _window?.Reset(_prototypeManager, accessLevels);
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -44,14 +59,6 @@ protected override void UpdateState(BoundUserInterfaceState state)
         _window?.UpdateState(castState);
     }
 
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing) return;
-
-        _window?.Dispose();
-    }
-
     public void UpdateConfiguration(List<ProtoId<AccessLevelPrototype>> newAccessList)
     {
         SendMessage(new DoorElectronicsUpdateConfigurationMessage(newAccessList));
diff --git a/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml.cs b/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml.cs
index c01f13a462e..2112a562971 100644
--- a/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml.cs
+++ b/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml.cs
@@ -15,22 +15,23 @@ namespace Content.Client.Doors.Electronics;
 [GenerateTypedNameReferences]
 public sealed partial class DoorElectronicsConfigurationMenu : FancyWindow
 {
-    private readonly DoorElectronicsBoundUserInterface _owner;
-    private AccessLevelControl _buttonsList = new();
+    private readonly AccessLevelControl _buttonsList = new();
 
-    public DoorElectronicsConfigurationMenu(DoorElectronicsBoundUserInterface ui, List<ProtoId<AccessLevelPrototype>> accessLevels, IPrototypeManager prototypeManager)
+    public event Action<List<ProtoId<AccessLevelPrototype>>>? OnAccessChanged;
+
+    public DoorElectronicsConfigurationMenu()
     {
         RobustXamlLoader.Load(this);
-
-        _owner = ui;
-
-        _buttonsList.Populate(accessLevels, prototypeManager);
         AccessLevelControlContainer.AddChild(_buttonsList);
+    }
+
+    public void Reset(IPrototypeManager protoManager, List<ProtoId<AccessLevelPrototype>> accessLevels)
+    {
+        _buttonsList.Populate(accessLevels, protoManager);
 
-        foreach (var (id, button) in _buttonsList.ButtonsList)
+        foreach (var button in _buttonsList.ButtonsList.Values)
         {
-            button.OnPressed += _ => _owner.UpdateConfiguration(
-                _buttonsList.ButtonsList.Where(x => x.Value.Pressed).Select(x => x.Key).ToList());
+            button.OnPressed += _ => OnAccessChanged?.Invoke(_buttonsList.ButtonsList.Where(x => x.Value.Pressed).Select(x => x.Key).ToList());
         }
     }
 
diff --git a/Content.Client/Drowsiness/DrowsinessOverlay.cs b/Content.Client/Drowsiness/DrowsinessOverlay.cs
new file mode 100644
index 00000000000..a316f31ae64
--- /dev/null
+++ b/Content.Client/Drowsiness/DrowsinessOverlay.cs
@@ -0,0 +1,80 @@
+using Content.Shared.Drowsiness;
+using Content.Shared.StatusEffect;
+using Robust.Client.Graphics;
+using Robust.Client.Player;
+using Robust.Shared.Enums;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Client.Drowsiness;
+
+public sealed class DrowsinessOverlay : Overlay
+{
+    [Dependency] private readonly IEntityManager _entityManager = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly IEntitySystemManager _sysMan = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    public override OverlaySpace Space => OverlaySpace.WorldSpace;
+    public override bool RequestScreenTexture => true;
+    private readonly ShaderInstance _drowsinessShader;
+
+    public float CurrentPower = 0.0f;
+
+    private const float PowerDivisor = 250.0f;
+    private const float Intensity = 0.2f; // for adjusting the visual scale
+    private float _visualScale = 0; // between 0 and 1
+
+    public DrowsinessOverlay()
+    {
+        IoCManager.InjectDependencies(this);
+        _drowsinessShader = _prototypeManager.Index<ShaderPrototype>("Drowsiness").InstanceUnique();
+    }
+
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        var playerEntity = _playerManager.LocalEntity;
+
+        if (playerEntity == null)
+            return;
+
+        if (!_entityManager.HasComponent<DrowsinessComponent>(playerEntity)
+            || !_entityManager.TryGetComponent<StatusEffectsComponent>(playerEntity, out var status))
+            return;
+
+        var statusSys = _sysMan.GetEntitySystem<StatusEffectsSystem>();
+        if (!statusSys.TryGetTime(playerEntity.Value, SharedDrowsinessSystem.DrowsinessKey, out var time, status))
+            return;
+
+        var curTime = _timing.CurTime;
+        var timeLeft = (float)(time.Value.Item2 - curTime).TotalSeconds;
+
+        CurrentPower += 8f * (0.5f * timeLeft - CurrentPower) * args.DeltaSeconds / (timeLeft + 1);
+    }
+
+    protected override bool BeforeDraw(in OverlayDrawArgs args)
+    {
+        if (!_entityManager.TryGetComponent(_playerManager.LocalEntity, out EyeComponent? eyeComp))
+            return false;
+
+        if (args.Viewport.Eye != eyeComp.Eye)
+            return false;
+
+        _visualScale = Math.Clamp(CurrentPower / PowerDivisor, 0.0f, 1.0f);
+        return _visualScale > 0;
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        if (ScreenTexture == null)
+            return;
+
+        var handle = args.WorldHandle;
+        _drowsinessShader.SetParameter("SCREEN_TEXTURE", ScreenTexture);
+        _drowsinessShader.SetParameter("Strength", _visualScale * Intensity);
+        handle.UseShader(_drowsinessShader);
+        handle.DrawRect(args.WorldBounds, Color.White);
+        handle.UseShader(null);
+    }
+}
diff --git a/Content.Client/Drowsiness/DrowsinessSystem.cs b/Content.Client/Drowsiness/DrowsinessSystem.cs
new file mode 100644
index 00000000000..bc8862b19d2
--- /dev/null
+++ b/Content.Client/Drowsiness/DrowsinessSystem.cs
@@ -0,0 +1,53 @@
+using Content.Shared.Drowsiness;
+using Robust.Client.Graphics;
+using Robust.Client.Player;
+using Robust.Shared.Player;
+
+namespace Content.Client.Drowsiness;
+
+public sealed class DrowsinessSystem : SharedDrowsinessSystem
+{
+    [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IOverlayManager _overlayMan = default!;
+
+    private DrowsinessOverlay _overlay = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DrowsinessComponent, ComponentInit>(OnDrowsinessInit);
+        SubscribeLocalEvent<DrowsinessComponent, ComponentShutdown>(OnDrowsinessShutdown);
+
+        SubscribeLocalEvent<DrowsinessComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
+        SubscribeLocalEvent<DrowsinessComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);
+
+        _overlay = new();
+    }
+
+    private void OnPlayerAttached(EntityUid uid, DrowsinessComponent component, LocalPlayerAttachedEvent args)
+    {
+        _overlayMan.AddOverlay(_overlay);
+    }
+
+    private void OnPlayerDetached(EntityUid uid, DrowsinessComponent component, LocalPlayerDetachedEvent args)
+    {
+        _overlay.CurrentPower = 0;
+        _overlayMan.RemoveOverlay(_overlay);
+    }
+
+    private void OnDrowsinessInit(EntityUid uid, DrowsinessComponent component, ComponentInit args)
+    {
+        if (_player.LocalEntity == uid)
+            _overlayMan.AddOverlay(_overlay);
+    }
+
+    private void OnDrowsinessShutdown(EntityUid uid, DrowsinessComponent component, ComponentShutdown args)
+    {
+        if (_player.LocalEntity == uid)
+        {
+            _overlay.CurrentPower = 0;
+            _overlayMan.RemoveOverlay(_overlay);
+        }
+    }
+}
diff --git a/Content.Client/Explosion/ExplosionOverlay.cs b/Content.Client/Explosion/ExplosionOverlay.cs
index 8cf7447a5d8..a005d0317b1 100644
--- a/Content.Client/Explosion/ExplosionOverlay.cs
+++ b/Content.Client/Explosion/ExplosionOverlay.cs
@@ -16,15 +16,19 @@ public sealed class ExplosionOverlay : Overlay
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
     [Dependency] private readonly IEntityManager _entMan = default!;
     [Dependency] private readonly IPrototypeManager _proto = default!;
+    private readonly SharedTransformSystem _transformSystem;
+    private SharedAppearanceSystem _appearance;
 
     public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowFOV;
 
     private ShaderInstance _shader;
 
-    public ExplosionOverlay()
+    public ExplosionOverlay(SharedAppearanceSystem appearanceSystem)
     {
         IoCManager.InjectDependencies(this);
         _shader = _proto.Index<ShaderPrototype>("unshaded").Instance();
+        _transformSystem = _entMan.System<SharedTransformSystem>();
+        _appearance = appearanceSystem;
     }
 
     protected override void Draw(in OverlayDrawArgs args)
@@ -33,15 +37,14 @@ protected override void Draw(in OverlayDrawArgs args)
         drawHandle.UseShader(_shader);
 
         var xforms = _entMan.GetEntityQuery<TransformComponent>();
-        var query = _entMan
-            .EntityQuery<ExplosionVisualsComponent, ExplosionVisualsTexturesComponent, AppearanceComponent>(true);
+        var query = _entMan.EntityQueryEnumerator<ExplosionVisualsComponent, ExplosionVisualsTexturesComponent>();
 
-        foreach (var (visuals, textures, appearance) in query)
+        while (query.MoveNext(out var uid, out var visuals, out var textures))
         {
             if (visuals.Epicenter.MapId != args.MapId)
                 continue;
 
-            if (!appearance.TryGetData(ExplosionAppearanceData.Progress, out int index))
+            if (!_appearance.TryGetData(uid, ExplosionAppearanceData.Progress, out int index))
                 continue;
 
             index = Math.Min(index, visuals.Intensity.Count - 1);
@@ -67,7 +70,7 @@ private void DrawExplosion(
                 continue;
 
             var xform = xforms.GetComponent(gridId);
-            var (_, _, worldMatrix, invWorldMatrix) = xform.GetWorldPositionRotationMatrixWithInv(xforms);
+            var (_, _, worldMatrix, invWorldMatrix) = _transformSystem.GetWorldPositionRotationMatrixWithInv(xform, xforms);
 
             gridBounds = invWorldMatrix.TransformBox(worldBounds).Enlarged(grid.TileSize * 2);
             drawHandle.SetTransform(worldMatrix);
diff --git a/Content.Client/Explosion/ExplosionOverlaySystem.cs b/Content.Client/Explosion/ExplosionOverlaySystem.cs
index fe552af0e79..7e43bbdc38c 100644
--- a/Content.Client/Explosion/ExplosionOverlaySystem.cs
+++ b/Content.Client/Explosion/ExplosionOverlaySystem.cs
@@ -20,6 +20,7 @@ public sealed class ExplosionOverlaySystem : EntitySystem
     [Dependency] private readonly IOverlayManager _overlayMan = default!;
     [Dependency] private readonly SharedPointLightSystem _lights = default!;
     [Dependency] private readonly IMapManager _mapMan = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
 
     public override void Initialize()
     {
@@ -28,7 +29,7 @@ public override void Initialize()
         SubscribeLocalEvent<ExplosionVisualsComponent, ComponentInit>(OnExplosionInit);
         SubscribeLocalEvent<ExplosionVisualsComponent, ComponentRemove>(OnCompRemove);
         SubscribeLocalEvent<ExplosionVisualsComponent, ComponentHandleState>(OnExplosionHandleState);
-        _overlayMan.AddOverlay(new ExplosionOverlay());
+        _overlayMan.AddOverlay(new ExplosionOverlay(_appearance));
     }
 
     private void OnExplosionHandleState(EntityUid uid, ExplosionVisualsComponent component, ref ComponentHandleState args)
diff --git a/Content.Client/Explosion/ExplosionSystem.cs b/Content.Client/Explosion/ExplosionSystem.cs
new file mode 100644
index 00000000000..a2ed2d50e0d
--- /dev/null
+++ b/Content.Client/Explosion/ExplosionSystem.cs
@@ -0,0 +1,8 @@
+using Content.Shared.Explosion.EntitySystems;
+
+namespace Content.Client.Explosion.EntitySystems;
+
+public sealed class ExplosionSystem : SharedExplosionSystem
+{
+
+}
diff --git a/Content.Client/Extinguisher/FireExtinguisherComponent.cs b/Content.Client/Extinguisher/FireExtinguisherComponent.cs
deleted file mode 100644
index 324b05a93d4..00000000000
--- a/Content.Client/Extinguisher/FireExtinguisherComponent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using Content.Shared.Extinguisher;
-using Robust.Shared.GameStates;
-
-namespace Content.Client.Extinguisher;
-
-[RegisterComponent]
-public sealed partial class FireExtinguisherComponent : SharedFireExtinguisherComponent;
diff --git a/Content.Client/Fax/AdminUI/AdminFaxEui.cs b/Content.Client/Fax/AdminUI/AdminFaxEui.cs
index ace3f3eb7b3..452c54eb797 100644
--- a/Content.Client/Fax/AdminUI/AdminFaxEui.cs
+++ b/Content.Client/Fax/AdminUI/AdminFaxEui.cs
@@ -16,7 +16,7 @@ public AdminFaxEui()
         _window.OnClose += () => SendMessage(new AdminFaxEuiMsg.Close());
         _window.OnFollowFax += entity => SendMessage(new AdminFaxEuiMsg.Follow(entity));
         _window.OnMessageSend += args => SendMessage(new AdminFaxEuiMsg.Send(args.entity, args.title,
-                    args.stampedBy, args.message, args.stampSprite, args.stampColor));
+                    args.stampedBy, args.message, args.stampSprite, args.stampColor, args.locked));
     }
 
     public override void Opened()
diff --git a/Content.Client/Fax/AdminUI/AdminFaxWindow.xaml b/Content.Client/Fax/AdminUI/AdminFaxWindow.xaml
index d469a0e9d38..dc4092a3b53 100644
--- a/Content.Client/Fax/AdminUI/AdminFaxWindow.xaml
+++ b/Content.Client/Fax/AdminUI/AdminFaxWindow.xaml
@@ -23,7 +23,7 @@
         </BoxContainer>
         <Label Text="{Loc admin-fax-stamp-color}" />
         <ColorSelectorSliders Margin="12 0 0 0" Name="StampColorSelector" Color="#BB3232"/>
-        <Control MinHeight="10" />
-        <Button Name="SendButton" Text="{Loc admin-fax-send}"></Button>
+        <CheckBox Name="LockPageCheckbox" Text="{Loc admin-fax-lock-page}" ToolTip="{Loc admin-fax-lock-page-tooltip}"/>
+        <Button Name="SendButton" Text="{Loc admin-fax-send}" Margin="0 10 0 0" />
     </BoxContainer>
 </DefaultWindow>
diff --git a/Content.Client/Fax/AdminUI/AdminFaxWindow.xaml.cs b/Content.Client/Fax/AdminUI/AdminFaxWindow.xaml.cs
index c1fba483094..698b3114b7d 100644
--- a/Content.Client/Fax/AdminUI/AdminFaxWindow.xaml.cs
+++ b/Content.Client/Fax/AdminUI/AdminFaxWindow.xaml.cs
@@ -14,7 +14,7 @@ public sealed partial class AdminFaxWindow : DefaultWindow
 {
     private const string StampsRsiPath = "/Textures/Objects/Misc/bureaucracy.rsi";
 
-    public Action<(NetEntity entity, string title, string stampedBy, string message, string stampSprite, Color stampColor)>? OnMessageSend;
+    public Action<(NetEntity entity, string title, string stampedBy, string message, string stampSprite, Color stampColor, bool locked)>? OnMessageSend;
     public Action<NetEntity>? OnFollowFax;
 
     [Dependency] private readonly IResourceCache _resCache = default!;
@@ -98,6 +98,7 @@ private void SendMessage(BaseButton.ButtonEventArgs obj)
 
         var from = FromEdit.Text;
         var stampColor = StampColorSelector.Color;
-        OnMessageSend?.Invoke((faxEntity.Value, title, from, message, stamp, stampColor));
+        var locked = LockPageCheckbox.Pressed;
+        OnMessageSend?.Invoke((faxEntity.Value, title, from, message, stamp, stampColor, locked));
     }
 }
diff --git a/Content.Client/Fax/System/FaxVisualsSystem.cs b/Content.Client/Fax/System/FaxVisualsSystem.cs
index 892aec1d954..e752fbf48e6 100644
--- a/Content.Client/Fax/System/FaxVisualsSystem.cs
+++ b/Content.Client/Fax/System/FaxVisualsSystem.cs
@@ -25,24 +25,30 @@ private void OnAppearanceChanged(EntityUid uid, FaxMachineComponent component, r
         if (args.Sprite == null)
             return;
 
-        if (_appearance.TryGetData(uid, FaxMachineVisuals.VisualState, out FaxMachineVisualState visuals) && visuals == FaxMachineVisualState.Inserting)
+        if (_player.HasRunningAnimation(uid, "faxecute"))
+            return;
+
+        if (_appearance.TryGetData(uid, FaxMachineVisuals.VisualState, out FaxMachineVisualState visuals) &&
+            visuals == FaxMachineVisualState.Inserting)
         {
-            _player.Play(uid, new Animation()
-            {
-                Length = TimeSpan.FromSeconds(2.4),
-                AnimationTracks =
+            _player.Play(uid,
+                new Animation()
                 {
-                    new AnimationTrackSpriteFlick()
+                    Length = TimeSpan.FromSeconds(2.4),
+                    AnimationTracks =
                     {
-                        LayerKey = FaxMachineVisuals.VisualState,
-                        KeyFrames =
+                        new AnimationTrackSpriteFlick()
                         {
-                            new AnimationTrackSpriteFlick.KeyFrame(component.InsertingState, 0f),
-                            new AnimationTrackSpriteFlick.KeyFrame("icon", 2.4f),
-                        }
-                    }
-                }
-            }, "faxecute");
+                            LayerKey = FaxMachineVisuals.VisualState,
+                            KeyFrames =
+                            {
+                                new AnimationTrackSpriteFlick.KeyFrame(component.InsertingState, 0f),
+                                new AnimationTrackSpriteFlick.KeyFrame("icon", 2.4f),
+                            },
+                        },
+                    },
+                },
+                "faxecute");
         }
     }
 }
diff --git a/Content.Client/Fax/UI/FaxBoundUi.cs b/Content.Client/Fax/UI/FaxBoundUi.cs
index a95066a3b58..ca2e834b4fe 100644
--- a/Content.Client/Fax/UI/FaxBoundUi.cs
+++ b/Content.Client/Fax/UI/FaxBoundUi.cs
@@ -25,10 +25,7 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new FaxWindow();
-        _window.OpenCentered();
-
-        _window.OnClose += Close;
+        _window = this.CreateWindow<FaxWindow>();
         _window.FileButtonPressed += OnFileButtonPressed;
         _window.CopyButtonPressed += OnCopyButtonPressed;
         _window.SendButtonPressed += OnSendButtonPressed;
@@ -104,11 +101,4 @@ protected override void UpdateState(BoundUserInterfaceState state)
 
         _window.UpdateState(cast);
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (disposing)
-            _window?.Dispose();
-    }
 }
diff --git a/Content.Client/Flash/FlashOverlay.cs b/Content.Client/Flash/FlashOverlay.cs
index 9ea00275e84..046be2aa621 100644
--- a/Content.Client/Flash/FlashOverlay.cs
+++ b/Content.Client/Flash/FlashOverlay.cs
@@ -1,27 +1,22 @@
 using Content.Shared.Flash;
 using Content.Shared.Flash.Components;
 using Content.Shared.StatusEffect;
-using Content.Client.Viewport;
 using Robust.Client.Graphics;
-using Robust.Client.State;
 using Robust.Client.Player;
 using Robust.Shared.Enums;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
-using SixLabors.ImageSharp.PixelFormats;
 
 namespace Content.Client.Flash
 {
     public sealed class FlashOverlay : Overlay
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly IClyde _displayManager = default!;
-        [Dependency] private readonly IStateManager _stateManager = default!;
         [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IGameTiming _timing = default!;
 
-       private readonly StatusEffectsSystem _statusSys;
+        private readonly StatusEffectsSystem _statusSys;
 
         public override OverlaySpace Space => OverlaySpace.WorldSpace;
         private readonly ShaderInstance _shader;
@@ -56,20 +51,6 @@ protected override void FrameUpdate(FrameEventArgs args)
             PercentComplete = timeDone / lastsFor;
         }
 
-        public void ReceiveFlash()
-        {
-            if (_stateManager.CurrentState is IMainViewportState state)
-            {
-                // take a screenshot
-                // note that the callback takes a while and ScreenshotTexture will be null the first few Draws
-                state.Viewport.Viewport.Screenshot(image =>
-                {
-                    var rgba32Image = image.CloneAs<Rgba32>(SixLabors.ImageSharp.Configuration.Default);
-                    ScreenshotTexture = _displayManager.LoadTextureFromImage(rgba32Image);
-                });
-            }
-        }
-
         protected override bool BeforeDraw(in OverlayDrawArgs args)
         {
             if (!_entityManager.TryGetComponent(_playerManager.LocalEntity, out EyeComponent? eyeComp))
@@ -82,6 +63,11 @@ protected override bool BeforeDraw(in OverlayDrawArgs args)
 
         protected override void Draw(in OverlayDrawArgs args)
         {
+            if (RequestScreenTexture && ScreenTexture != null)
+            {
+                ScreenshotTexture = ScreenTexture;
+                RequestScreenTexture = false; // we only need the first frame, so we can stop the request now for performance reasons
+            }
             if (ScreenshotTexture == null)
                 return;
 
@@ -96,7 +82,6 @@ protected override void DisposeBehavior()
         {
             base.DisposeBehavior();
             ScreenshotTexture = null;
-            PercentComplete = 1.0f;
         }
     }
 }
diff --git a/Content.Client/Flash/FlashSystem.cs b/Content.Client/Flash/FlashSystem.cs
index 9a0579f6aa3..146d84b990f 100644
--- a/Content.Client/Flash/FlashSystem.cs
+++ b/Content.Client/Flash/FlashSystem.cs
@@ -22,7 +22,6 @@ public override void Initialize()
         SubscribeLocalEvent<FlashedComponent, ComponentShutdown>(OnShutdown);
         SubscribeLocalEvent<FlashedComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
         SubscribeLocalEvent<FlashedComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);
-        SubscribeLocalEvent<FlashedComponent, StatusEffectAddedEvent>(OnStatusAdded);
 
         _overlay = new();
     }
@@ -34,8 +33,8 @@ private void OnPlayerAttached(EntityUid uid, FlashedComponent component, LocalPl
 
     private void OnPlayerDetached(EntityUid uid, FlashedComponent component, LocalPlayerDetachedEvent args)
     {
-        _overlay.PercentComplete = 1.0f;
         _overlay.ScreenshotTexture = null;
+        _overlay.RequestScreenTexture = false;
         _overlayMan.RemoveOverlay(_overlay);
     }
 
@@ -43,6 +42,7 @@ private void OnInit(EntityUid uid, FlashedComponent component, ComponentInit arg
     {
         if (_player.LocalEntity == uid)
         {
+            _overlay.RequestScreenTexture = true;
             _overlayMan.AddOverlay(_overlay);
         }
     }
@@ -51,17 +51,9 @@ private void OnShutdown(EntityUid uid, FlashedComponent component, ComponentShut
     {
         if (_player.LocalEntity == uid)
         {
-            _overlay.PercentComplete = 1.0f;
             _overlay.ScreenshotTexture = null;
+            _overlay.RequestScreenTexture = false;
             _overlayMan.RemoveOverlay(_overlay);
         }
     }
-
-    private void OnStatusAdded(EntityUid uid, FlashedComponent component, StatusEffectAddedEvent args)
-    {
-        if (_player.LocalEntity == uid && args.Key == FlashedKey)
-        {
-            _overlay.ReceiveFlash();
-        }
-    }
 }
diff --git a/Content.Client/Fluids/PuddleOverlay.cs b/Content.Client/Fluids/PuddleOverlay.cs
index a8c1d355105..caa5a925807 100644
--- a/Content.Client/Fluids/PuddleOverlay.cs
+++ b/Content.Client/Fluids/PuddleOverlay.cs
@@ -14,6 +14,7 @@ public sealed class PuddleOverlay : Overlay
     [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
     private readonly PuddleDebugOverlaySystem _debugOverlaySystem;
+    private readonly SharedTransformSystem _transformSystem;
 
     private readonly Color _heavyPuddle = new(0, 255, 255, 50);
     private readonly Color _mediumPuddle = new(0, 150, 255, 50);
@@ -29,6 +30,7 @@ public PuddleOverlay()
         _debugOverlaySystem = _entitySystemManager.GetEntitySystem<PuddleDebugOverlaySystem>();
         var cache = IoCManager.Resolve<IResourceCache>();
         _font = new VectorFont(cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Regular.ttf"), 8);
+        _transformSystem = _entityManager.System<SharedTransformSystem>();
     }
 
     protected override void Draw(in OverlayDrawArgs args)
@@ -56,7 +58,7 @@ private void DrawWorld(in OverlayDrawArgs args)
                 continue;
 
             var gridXform = xformQuery.GetComponent(gridId);
-            var (_, _, worldMatrix, invWorldMatrix) = gridXform.GetWorldPositionRotationMatrixWithInv(xformQuery);
+            var (_, _, worldMatrix, invWorldMatrix) = _transformSystem.GetWorldPositionRotationMatrixWithInv(gridXform, xformQuery);
             gridBounds = invWorldMatrix.TransformBox(args.WorldBounds).Enlarged(mapGrid.TileSize * 2);
             drawHandle.SetTransform(worldMatrix);
 
@@ -89,7 +91,7 @@ private void DrawScreen(in OverlayDrawArgs args)
                 continue;
 
             var gridXform = xformQuery.GetComponent(gridId);
-            var (_, _, matrix, invMatrix) = gridXform.GetWorldPositionRotationMatrixWithInv(xformQuery);
+            var (_, _, matrix, invMatrix) = _transformSystem.GetWorldPositionRotationMatrixWithInv(gridXform, xformQuery);
             var gridBounds = invMatrix.TransformBox(args.WorldBounds).Enlarged(mapGrid.TileSize * 2);
 
             foreach (var debugOverlayData in _debugOverlaySystem.GetData(gridId))
diff --git a/Content.Client/Forensics/ForensicScannerBoundUserInterface.cs b/Content.Client/Forensics/ForensicScannerBoundUserInterface.cs
index ba49f11ea0f..08596b04e6e 100644
--- a/Content.Client/Forensics/ForensicScannerBoundUserInterface.cs
+++ b/Content.Client/Forensics/ForensicScannerBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Robust.Client.GameObjects;
 using Robust.Shared.Timing;
 using Content.Shared.Forensics;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Forensics
 {
@@ -21,11 +22,9 @@ public ForensicScannerBoundUserInterface(EntityUid owner, Enum uiKey) : base(own
         protected override void Open()
         {
             base.Open();
-            _window = new ForensicScannerMenu();
-            _window.OnClose += Close;
+            _window = this.CreateWindow<ForensicScannerMenu>();
             _window.Print.OnPressed += _ => Print();
             _window.Clear.OnPressed += _ => Clear();
-            _window.OpenCentered();
         }
 
         private void Print()
@@ -62,6 +61,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
 
             _printCooldown = cast.PrintCooldown;
 
+            // TODO: Fix this
             if (cast.PrintReadyAt > _gameTiming.CurTime)
                 Timer.Spawn(cast.PrintReadyAt - _gameTiming.CurTime, () =>
                 {
@@ -71,14 +71,5 @@ protected override void UpdateState(BoundUserInterfaceState state)
 
             _window.UpdateState(cast);
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing)
-                return;
-
-            _window?.Dispose();
-        }
     }
 }
diff --git a/Content.Client/Forensics/ForensicScannerMenu.xaml.cs b/Content.Client/Forensics/ForensicScannerMenu.xaml.cs
index 5f7f8e0056c..dd013ed2357 100644
--- a/Content.Client/Forensics/ForensicScannerMenu.xaml.cs
+++ b/Content.Client/Forensics/ForensicScannerMenu.xaml.cs
@@ -54,10 +54,16 @@ public void UpdateState(ForensicScannerBoundUserInterfaceState msg)
             }
             text.AppendLine();
             text.AppendLine(Loc.GetString("forensic-scanner-interface-dnas"));
-            foreach (var dna in msg.DNAs)
+            foreach (var dna in msg.TouchDNAs)
             {
                 text.AppendLine(dna);
             }
+            foreach (var dna in msg.SolutionDNAs)
+            {
+                if (msg.TouchDNAs.Contains(dna))
+                    continue;
+                text.AppendLine(dna);
+            }
             text.AppendLine();
             text.AppendLine(Loc.GetString("forensic-scanner-interface-residues"));
             foreach (var residue in msg.Residues)
diff --git a/Content.Client/Gameplay/GameplayStateBase.cs b/Content.Client/Gameplay/GameplayStateBase.cs
index 6236cd8e958..1e6fd485b38 100644
--- a/Content.Client/Gameplay/GameplayStateBase.cs
+++ b/Content.Client/Gameplay/GameplayStateBase.cs
@@ -2,6 +2,7 @@
 using System.Numerics;
 using Content.Client.Clickable;
 using Content.Client.UserInterface;
+using Content.Client.Viewport;
 using Content.Shared.Input;
 using Robust.Client.ComponentTrees;
 using Robust.Client.GameObjects;
@@ -13,11 +14,13 @@
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Console;
+using Robust.Shared.Graphics;
 using Robust.Shared.Input;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Map;
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
+using YamlDotNet.Serialization.TypeInspectors;
 
 namespace Content.Client.Gameplay
 {
@@ -98,17 +101,40 @@ private bool HandleInspect(ICommonSession? session, EntityCoordinates coords, En
 
         public EntityUid? GetClickedEntity(MapCoordinates coordinates)
         {
-            var first = GetClickableEntities(coordinates).FirstOrDefault();
+            return GetClickedEntity(coordinates, _eyeManager.CurrentEye);
+        }
+
+        public EntityUid? GetClickedEntity(MapCoordinates coordinates, IEye? eye)
+        {
+            if (eye == null)
+                return null;
+
+            var first = GetClickableEntities(coordinates, eye).FirstOrDefault();
             return first.IsValid() ? first : null;
         }
 
         public IEnumerable<EntityUid> GetClickableEntities(EntityCoordinates coordinates)
         {
-            return GetClickableEntities(coordinates.ToMap(_entityManager, _entitySystemManager.GetEntitySystem<SharedTransformSystem>()));
+            var transformSystem = _entitySystemManager.GetEntitySystem<SharedTransformSystem>();
+            return GetClickableEntities(transformSystem.ToMapCoordinates(coordinates));
         }
 
         public IEnumerable<EntityUid> GetClickableEntities(MapCoordinates coordinates)
         {
+            return GetClickableEntities(coordinates, _eyeManager.CurrentEye);
+        }
+
+        public IEnumerable<EntityUid> GetClickableEntities(MapCoordinates coordinates, IEye? eye)
+        {
+            /*
+             * TODO:
+             * 1. Stuff like MeleeWeaponSystem need an easy way to hook into viewport specific entities / entities under mouse
+             * 2. Cleanup the mess around InteractionOutlineSystem + below the keybind click detection.
+             */
+
+            if (eye == null)
+                return Array.Empty<EntityUid>();
+
             // Find all the entities intersecting our click
             var spriteTree = _entityManager.EntitySysManager.GetEntitySystem<SpriteTreeSystem>();
             var entities = spriteTree.QueryAabb(coordinates.MapId, Box2.CenteredAround(coordinates.Position, new Vector2(1, 1)));
@@ -116,15 +142,12 @@ public IEnumerable<EntityUid> GetClickableEntities(MapCoordinates coordinates)
             // Check the entities against whether or not we can click them
             var foundEntities = new List<(EntityUid, int, uint, float)>(entities.Count);
             var clickQuery = _entityManager.GetEntityQuery<ClickableComponent>();
-            var xformQuery = _entityManager.GetEntityQuery<TransformComponent>();
-
-            // TODO: Smelly
-            var eye = _eyeManager.CurrentEye;
+            var clickables = _entityManager.System<ClickableSystem>();
 
             foreach (var entity in entities)
             {
                 if (clickQuery.TryGetComponent(entity.Uid, out var component) &&
-                    component.CheckClick(entity.Component, entity.Transform, xformQuery, coordinates.Position, eye,  out var drawDepthClicked, out var renderOrder, out var bottom))
+                    clickables.CheckClick((entity.Uid, component, entity.Component, entity.Transform), coordinates.Position, eye,  out var drawDepthClicked, out var renderOrder, out var bottom))
                 {
                     foundEntities.Add((entity.Uid, drawDepthClicked, renderOrder, bottom));
                 }
@@ -184,15 +207,27 @@ protected virtual void OnKeyBindStateChanged(ViewportBoundKeyEventArgs args)
 
             EntityCoordinates coordinates = default;
             EntityUid? entityToClick = null;
-            if (args.Viewport is IViewportControl vp)
+            if (args.Viewport is IViewportControl vp && kArgs.PointerLocation.IsValid)
             {
                 var mousePosWorld = vp.PixelToMap(kArgs.PointerLocation.Position);
-                entityToClick = GetClickedEntity(mousePosWorld);
+
+                if (vp is ScalingViewport svp)
+                {
+                    entityToClick = GetClickedEntity(mousePosWorld, svp.Eye);
+                }
+                else
+                {
+                    entityToClick = GetClickedEntity(mousePosWorld);
+                }
 
                 coordinates = _mapManager.TryFindGridAt(mousePosWorld, out _, out var grid) ?
                     grid.MapToGrid(mousePosWorld) :
                     EntityCoordinates.FromMap(_mapManager, mousePosWorld);
             }
+            else
+            {
+                coordinates = EntityCoordinates.Invalid;
+            }
 
             var message = new ClientFullInputCmdMessage(_timing.CurTick, _timing.TickFraction, funcId)
             {
diff --git a/Content.Client/Gateway/UI/GatewayBoundUserInterface.cs b/Content.Client/Gateway/UI/GatewayBoundUserInterface.cs
index fdb3cdbc010..457b70ca7ca 100644
--- a/Content.Client/Gateway/UI/GatewayBoundUserInterface.cs
+++ b/Content.Client/Gateway/UI/GatewayBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Gateway;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Gateway.UI;
 
@@ -17,24 +18,13 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new GatewayWindow(EntMan.GetNetEntity(Owner));
+        _window = this.CreateWindow<GatewayWindow>();
+        _window.SetEntity(EntMan.GetNetEntity(Owner));
 
         _window.OpenPortal += destination =>
         {
             SendMessage(new GatewayOpenPortalMessage(destination));
         };
-        _window.OnClose += Close;
-        _window?.OpenCentered();
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (disposing)
-        {
-            _window?.Dispose();
-            _window = null;
-        }
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
diff --git a/Content.Client/Gateway/UI/GatewayWindow.xaml.cs b/Content.Client/Gateway/UI/GatewayWindow.xaml.cs
index 889dd6e1759..1c779b2b350 100644
--- a/Content.Client/Gateway/UI/GatewayWindow.xaml.cs
+++ b/Content.Client/Gateway/UI/GatewayWindow.xaml.cs
@@ -22,7 +22,7 @@ public sealed partial class GatewayWindow : FancyWindow,
     public event Action<NetEntity>? OpenPortal;
     private List<GatewayDestinationData> _destinations = new();
 
-    public readonly NetEntity Owner;
+    public NetEntity Owner;
 
     private NetEntity? _current;
     private TimeSpan _nextReady;
@@ -46,16 +46,20 @@ public sealed partial class GatewayWindow : FancyWindow,
     /// </summary>
     private bool _isCooldownPending = true;
 
-    public GatewayWindow(NetEntity netEntity)
+    public GatewayWindow()
     {
         RobustXamlLoader.Load(this);
         var dependencies = IoCManager.Instance!;
         _timing = dependencies.Resolve<IGameTiming>();
-        Owner = netEntity;
 
         NextUnlockBar.ForegroundStyleBoxOverride = new StyleBoxFlat(Color.FromHex("#C74EBD"));
     }
 
+    public void SetEntity(NetEntity entity)
+    {
+
+    }
+
     public void UpdateState(GatewayBoundUserInterfaceState state)
     {
         _destinations = state.Destinations;
diff --git a/Content.Client/Ghost/GhostRoleRadioBoundUserInterface.cs b/Content.Client/Ghost/GhostRoleRadioBoundUserInterface.cs
new file mode 100644
index 00000000000..52ea835f4a8
--- /dev/null
+++ b/Content.Client/Ghost/GhostRoleRadioBoundUserInterface.cs
@@ -0,0 +1,29 @@
+using Content.Shared.Ghost.Roles;
+using Robust.Client.UserInterface;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.Ghost;
+
+public sealed class GhostRoleRadioBoundUserInterface : BoundUserInterface
+{
+    private GhostRoleRadioMenu? _ghostRoleRadioMenu;
+
+    public GhostRoleRadioBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    {
+        IoCManager.InjectDependencies(this);
+    }
+
+    protected override void Open()
+    {
+        base.Open();
+
+        _ghostRoleRadioMenu = this.CreateWindow<GhostRoleRadioMenu>();
+        _ghostRoleRadioMenu.SetEntity(Owner);
+        _ghostRoleRadioMenu.SendGhostRoleRadioMessageAction += SendGhostRoleRadioMessage;
+    }
+
+    private void SendGhostRoleRadioMessage(ProtoId<GhostRolePrototype> protoId)
+    {
+        SendMessage(new GhostRoleRadioMessage(protoId));
+    }
+}
diff --git a/Content.Client/Ghost/GhostRoleRadioMenu.xaml b/Content.Client/Ghost/GhostRoleRadioMenu.xaml
new file mode 100644
index 00000000000..c35ee128c52
--- /dev/null
+++ b/Content.Client/Ghost/GhostRoleRadioMenu.xaml
@@ -0,0 +1,8 @@
+<ui:RadialMenu
+    xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
+    CloseButtonStyleClass="RadialMenuCloseButton"
+    VerticalExpand="True"
+    HorizontalExpand="True">
+    <ui:RadialContainer Name="Main">
+    </ui:RadialContainer>
+</ui:RadialMenu>
diff --git a/Content.Client/Ghost/GhostRoleRadioMenu.xaml.cs b/Content.Client/Ghost/GhostRoleRadioMenu.xaml.cs
new file mode 100644
index 00000000000..3897b1b949c
--- /dev/null
+++ b/Content.Client/Ghost/GhostRoleRadioMenu.xaml.cs
@@ -0,0 +1,106 @@
+using Content.Client.UserInterface.Controls;
+using Content.Shared.Ghost.Roles;
+using Content.Shared.Ghost.Roles.Components;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+using System.Numerics;
+
+namespace Content.Client.Ghost;
+
+public sealed partial class GhostRoleRadioMenu : RadialMenu
+{
+    [Dependency] private readonly EntityManager _entityManager = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+    public event Action<ProtoId<GhostRolePrototype>>? SendGhostRoleRadioMessageAction;
+
+    public EntityUid Entity { get; set; }
+
+    public GhostRoleRadioMenu()
+    {
+        IoCManager.InjectDependencies(this);
+        RobustXamlLoader.Load(this);
+    }
+
+    public void SetEntity(EntityUid uid)
+    {
+        Entity = uid;
+        RefreshUI();
+    }
+
+    private void RefreshUI()
+    {
+        // The main control that will contain all the clickable options
+        var main = FindControl<RadialContainer>("Main");
+
+        // The purpose of this radial UI is for ghost role radios that allow you to select
+        // more than one potential option, such as with kobolds/lizards.
+        // This means that it won't show anything if SelectablePrototypes is empty.
+        if (!_entityManager.TryGetComponent<GhostRoleMobSpawnerComponent>(Entity, out var comp))
+            return;
+
+        foreach (var ghostRoleProtoString in comp.SelectablePrototypes)
+        {
+            // For each prototype we find we want to create a button that uses the name of the ghost role
+            // as the hover tooltip, and the icon is taken from either the ghost role entityprototype
+            // or the indicated icon entityprototype.
+            if (!_prototypeManager.TryIndex<GhostRolePrototype>(ghostRoleProtoString, out var ghostRoleProto))
+                continue;
+
+            var button = new GhostRoleRadioMenuButton()
+            {
+                StyleClasses = { "RadialMenuButton" },
+                SetSize = new Vector2(64, 64),
+                ToolTip = Loc.GetString(ghostRoleProto.Name),
+                ProtoId = ghostRoleProto.ID,
+            };
+
+            var entProtoView = new EntityPrototypeView()
+            {
+                SetSize = new Vector2(48, 48),
+                VerticalAlignment = VAlignment.Center,
+                HorizontalAlignment = HAlignment.Center,
+                Stretch = SpriteView.StretchMode.Fill
+            };
+
+            // pick the icon if it exists, otherwise fallback to the ghost role's entity
+            if (_prototypeManager.TryIndex(ghostRoleProto.IconPrototype, out var iconProto))
+                entProtoView.SetPrototype(iconProto);
+            else
+                entProtoView.SetPrototype(ghostRoleProto.EntityPrototype);
+
+            button.AddChild(entProtoView);
+            main.AddChild(button);
+            AddGhostRoleRadioMenuButtonOnClickActions(main);
+        }
+    }
+
+    private void AddGhostRoleRadioMenuButtonOnClickActions(Control control)
+    {
+        var mainControl = control as RadialContainer;
+
+        if (mainControl == null)
+            return;
+
+        foreach (var child in mainControl.Children)
+        {
+            var castChild = child as GhostRoleRadioMenuButton;
+
+            if (castChild == null)
+                continue;
+
+            castChild.OnButtonUp += _ =>
+            {
+                SendGhostRoleRadioMessageAction?.Invoke(castChild.ProtoId);
+                Close();
+            };
+        }
+    }
+}
+
+public sealed class GhostRoleRadioMenuButton : RadialMenuTextureButton
+{
+    public ProtoId<GhostRolePrototype> ProtoId { get; set; }
+}
diff --git a/Content.Client/Gravity/UI/GravityGeneratorBoundUserInterface.cs b/Content.Client/Gravity/UI/GravityGeneratorBoundUserInterface.cs
index d72da3e8120..32b40747d55 100644
--- a/Content.Client/Gravity/UI/GravityGeneratorBoundUserInterface.cs
+++ b/Content.Client/Gravity/UI/GravityGeneratorBoundUserInterface.cs
@@ -1,6 +1,6 @@
 using Content.Shared.Gravity;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Gravity.UI
 {
@@ -18,17 +18,8 @@ protected override void Open()
         {
             base.Open();
 
-            _window = new GravityGeneratorWindow(this);
-
-            /*
-            _window.Switch.OnPressed += _ =>
-            {
-                SendMessage(new SharedGravityGeneratorComponent.SwitchGeneratorMessage(!IsOn));
-            };
-            */
-
-            _window.OpenCentered();
-            _window.OnClose += Close;
+            _window = this.CreateWindow<GravityGeneratorWindow>();
+            _window.SetEntity(Owner);
         }
 
         protected override void UpdateState(BoundUserInterfaceState state)
@@ -39,14 +30,6 @@ protected override void UpdateState(BoundUserInterfaceState state)
             _window?.UpdateState(castState);
         }
 
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing) return;
-
-            _window?.Dispose();
-        }
-
         public void SetPowerSwitch(bool on)
         {
             SendMessage(new SharedGravityGeneratorComponent.SwitchGeneratorMessage(on));
diff --git a/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs b/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs
index 75f8eb479b5..6f04133b594 100644
--- a/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs
+++ b/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs
@@ -12,22 +12,23 @@ public sealed partial class GravityGeneratorWindow : FancyWindow
     {
         private readonly ButtonGroup _buttonGroup = new();
 
-        private readonly GravityGeneratorBoundUserInterface _owner;
+        public event Action<bool>? OnPowerSwitch;
 
-        public GravityGeneratorWindow(GravityGeneratorBoundUserInterface owner)
+        public GravityGeneratorWindow()
         {
             RobustXamlLoader.Load(this);
             IoCManager.InjectDependencies(this);
 
-            _owner = owner;
-
             OnButton.Group = _buttonGroup;
             OffButton.Group = _buttonGroup;
 
-            OnButton.OnPressed += _ => _owner.SetPowerSwitch(true);
-            OffButton.OnPressed += _ => _owner.SetPowerSwitch(false);
+            OnButton.OnPressed += _ => OnPowerSwitch?.Invoke(true);
+            OffButton.OnPressed += _ => OnPowerSwitch?.Invoke(false);
+        }
 
-            EntityView.SetEntity(owner.Owner);
+        public void SetEntity(EntityUid uid)
+        {
+            EntityView.SetEntity(uid);
         }
 
         public void UpdateState(SharedGravityGeneratorComponent.GeneratorState state)
diff --git a/Content.Client/Guidebook/Controls/GuidebookError.xaml b/Content.Client/Guidebook/Controls/GuidebookError.xaml
new file mode 100644
index 00000000000..b84d527ea0a
--- /dev/null
+++ b/Content.Client/Guidebook/Controls/GuidebookError.xaml
@@ -0,0 +1,41 @@
+<BoxContainer xmlns="https://spacestation14.io"
+              xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+              Margin="5 5 5 5"
+              MinHeight="200">
+    <PanelContainer HorizontalExpand="True">
+        <PanelContainer.PanelOverride>
+            <gfx:StyleBoxFlat BorderThickness="2" BorderColor="White" />
+        </PanelContainer.PanelOverride>
+        <BoxContainer Orientation="Vertical">
+
+            <PanelContainer>
+                <PanelContainer.PanelOverride>
+                    <gfx:StyleBoxFlat BorderThickness="0 0 0 1" BackgroundColor="DarkRed" BorderColor="Black" />
+                </PanelContainer.PanelOverride>
+                <Label Margin="5" StyleClasses="bold" Text="{Loc 'guidebook-parser-error'}" />
+            </PanelContainer>
+
+            <OutputPanel Margin="5" MinHeight="75" VerticalExpand="True" Name="Original">
+                <OutputPanel.StyleBoxOverride>
+                    <gfx:StyleBoxFlat BorderThickness="0 0 0 1" BorderColor="Gray"
+                                      ContentMarginLeftOverride="3" ContentMarginRightOverride="3"
+                                      ContentMarginBottomOverride="3" ContentMarginTopOverride="3" />
+                </OutputPanel.StyleBoxOverride>
+            </OutputPanel>
+
+            <Collapsible Margin="5" MinHeight="75" VerticalExpand="True">
+                <CollapsibleHeading Title="{Loc 'guidebook-error-message' }" />
+                <CollapsibleBody VerticalExpand="True">
+                    <OutputPanel Name="Error" VerticalExpand="True" MinHeight="100">
+                        <OutputPanel.StyleBoxOverride>
+                            <gfx:StyleBoxFlat
+                                ContentMarginLeftOverride="3" ContentMarginRightOverride="3"
+                                ContentMarginBottomOverride="3" ContentMarginTopOverride="3" />
+                        </OutputPanel.StyleBoxOverride>
+                    </OutputPanel>
+                </CollapsibleBody>
+            </Collapsible>
+
+        </BoxContainer>
+    </PanelContainer>
+</BoxContainer>
diff --git a/Content.Client/Guidebook/Controls/GuidebookError.xaml.cs b/Content.Client/Guidebook/Controls/GuidebookError.xaml.cs
new file mode 100644
index 00000000000..461f196c838
--- /dev/null
+++ b/Content.Client/Guidebook/Controls/GuidebookError.xaml.cs
@@ -0,0 +1,23 @@
+using JetBrains.Annotations;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Guidebook.Controls;
+
+[UsedImplicitly] [GenerateTypedNameReferences]
+public sealed partial class GuidebookError : BoxContainer
+{
+    public GuidebookError()
+    {
+        RobustXamlLoader.Load(this);
+    }
+
+    public GuidebookError(string original, string? error) : this()
+    {
+        Original.AddText(original);
+
+        if (error is not null)
+            Error.AddText(error);
+    }
+}
diff --git a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs
index f5ee1200cc6..469b0ed2224 100644
--- a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs
+++ b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs
@@ -16,15 +16,18 @@ namespace Content.Client.Guidebook.Controls;
 [GenerateTypedNameReferences]
 public sealed partial class GuidebookWindow : FancyWindow, ILinkClickHandler
 {
-    [Dependency] private readonly IResourceManager _resourceManager = default!;
     [Dependency] private readonly DocumentParsingManager _parsingMan = default!;
+    [Dependency] private readonly IResourceManager _resourceManager = default!;
 
     private Dictionary<ProtoId<GuideEntryPrototype>, GuideEntry> _entries = new();
 
+    private readonly ISawmill _sawmill;
+
     public GuidebookWindow()
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
+        _sawmill = Logger.GetSawmill("Guidebook");
 
         Tree.OnSelectedItemChanged += OnSelectionChanged;
 
@@ -34,6 +37,20 @@ public GuidebookWindow()
         };
     }
 
+    public void HandleClick(string link)
+    {
+        if (!_entries.TryGetValue(link, out var entry))
+            return;
+
+        if (Tree.TryGetIndexFromMetadata(entry, out var index))
+        {
+            Tree.ExpandParentEntries(index.Value);
+            Tree.SetSelectedIndex(index);
+        }
+        else
+            ShowGuide(entry);
+    }
+
     private void OnSelectionChanged(TreeItem? item)
     {
         if (item != null && item.Metadata is GuideEntry entry)
@@ -69,8 +86,9 @@ private void ShowGuide(GuideEntry entry)
 
         if (!_parsingMan.TryAddMarkup(EntryContainer, file.ReadToEnd()))
         {
-            EntryContainer.AddChild(new Label() { Text = "ERROR: Failed to parse document." });
-            Logger.Error($"Failed to parse contents of guide document {entry.Id}.");
+            // The guidebook will automatically display the in-guidebook error if it fails
+
+            _sawmill.Error($"Failed to parse contents of guide document {entry.Id}.");
         }
     }
 
@@ -122,8 +140,10 @@ private IEnumerable<GuideEntry> GetSortedEntries(List<ProtoId<GuideEntryPrototyp
 
                     entry.Children = sortedChildren;
                 }
+
                 entries.ExceptWith(entry.Children);
             }
+
             rootEntries = entries.ToList();
         }
 
@@ -133,21 +153,25 @@ private IEnumerable<GuideEntry> GetSortedEntries(List<ProtoId<GuideEntryPrototyp
             .ThenBy(rootEntry => Loc.GetString(rootEntry.Name));
     }
 
-    private void RepopulateTree(List<ProtoId<GuideEntryPrototype>>? roots = null, ProtoId<GuideEntryPrototype>? forcedRoot = null)
+    private void RepopulateTree(List<ProtoId<GuideEntryPrototype>>? roots = null,
+        ProtoId<GuideEntryPrototype>? forcedRoot = null)
     {
         Tree.Clear();
 
         HashSet<ProtoId<GuideEntryPrototype>> addedEntries = new();
 
-        TreeItem? parent = forcedRoot == null ? null : AddEntry(forcedRoot.Value, null, addedEntries);
+        var parent = forcedRoot == null ? null : AddEntry(forcedRoot.Value, null, addedEntries);
         foreach (var entry in GetSortedEntries(roots))
         {
             AddEntry(entry.Id, parent, addedEntries);
         }
+
         Tree.SetAllExpanded(true);
     }
 
-    private TreeItem? AddEntry(ProtoId<GuideEntryPrototype> id, TreeItem? parent, HashSet<ProtoId<GuideEntryPrototype>> addedEntries)
+    private TreeItem? AddEntry(ProtoId<GuideEntryPrototype> id,
+        TreeItem? parent,
+        HashSet<ProtoId<GuideEntryPrototype>> addedEntries)
     {
         if (!_entries.TryGetValue(id, out var entry))
             return null;
@@ -177,22 +201,6 @@ private void RepopulateTree(List<ProtoId<GuideEntryPrototype>>? roots = null, Pr
         return item;
     }
 
-    public void HandleClick(string link)
-    {
-        if (!_entries.TryGetValue(link, out var entry))
-            return;
-
-        if (Tree.TryGetIndexFromMetadata(entry, out var index))
-        {
-            Tree.ExpandParentEntries(index.Value);
-            Tree.SetSelectedIndex(index);
-        }
-        else
-        {
-            ShowGuide(entry);
-        }
-    }
-
     private void HandleFilter()
     {
         var emptySearch = SearchBar.Text.Trim().Length == 0;
@@ -206,6 +214,5 @@ private void HandleFilter()
                 element.SetHiddenState(true, SearchBar.Text.Trim());
             }
         }
-
     }
 }
diff --git a/Content.Client/Guidebook/DocumentParsingManager.cs b/Content.Client/Guidebook/DocumentParsingManager.cs
index e8a0743b9e0..857ae552024 100644
--- a/Content.Client/Guidebook/DocumentParsingManager.cs
+++ b/Content.Client/Guidebook/DocumentParsingManager.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using Content.Client.Guidebook.Controls;
 using Content.Client.Guidebook.Richtext;
 using Content.Shared.Guidebook;
 using Pidgin;
@@ -7,6 +8,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Reflection;
 using Robust.Shared.Sandboxing;
+using Robust.Shared.Utility;
 using static Pidgin.Parser;
 
 namespace Content.Client.Guidebook;
@@ -22,8 +24,10 @@ public sealed partial class DocumentParsingManager
     [Dependency] private readonly ISandboxHelper _sandboxHelper = default!;
 
     private readonly Dictionary<string, Parser<char, Control>> _tagControlParsers = new();
-    private Parser<char, Control> _tagParser = default!;
     private Parser<char, Control> _controlParser = default!;
+
+    private ISawmill _sawmill = default!;
+    private Parser<char, Control> _tagParser = default!;
     public Parser<char, IEnumerable<Control>> ControlParser = default!;
 
     public void Initialize()
@@ -32,7 +36,8 @@ public void Initialize()
             .Assert(_tagControlParsers.ContainsKey, tag => $"unknown tag: {tag}")
             .Bind(tag => _tagControlParsers[tag]);
 
-        _controlParser = OneOf(_tagParser, TryHeaderControl, ListControlParser, TextControlParser).Before(SkipWhitespaces);
+        _controlParser = OneOf(_tagParser, TryHeaderControl, ListControlParser, TextControlParser)
+            .Before(SkipWhitespaces);
 
         foreach (var typ in _reflectionManager.GetAllChildren<IDocumentTag>())
         {
@@ -40,6 +45,8 @@ public void Initialize()
         }
 
         ControlParser = SkipWhitespaces.Then(_controlParser.Many());
+
+        _sawmill = Logger.GetSawmill("Guidebook");
     }
 
     public bool TryAddMarkup(Control control, ProtoId<GuideEntryPrototype> entryId, bool log = true)
@@ -68,37 +75,57 @@ public bool TryAddMarkup(Control control, string text, bool log = true)
         }
         catch (Exception e)
         {
-            if (log)
-                Logger.Error($"Encountered error while generating markup controls: {e}");
+            _sawmill.Error($"Encountered error while generating markup controls: {e}");
+
+            control.AddChild(new GuidebookError(text, e.ToStringBetter()));
+
             return false;
         }
 
         return true;
     }
 
-    private Parser<char, Control> CreateTagControlParser(string tagId, Type tagType, ISandboxHelper sandbox) => Map(
-        (args, controls) =>
-        {
-            var tag = (IDocumentTag) sandbox.CreateInstance(tagType);
-            if (!tag.TryParseTag(args, out var control))
-            {
-                Logger.Error($"Failed to parse {tagId} args");
-                return new Control();
-            }
+    private Parser<char, Control> CreateTagControlParser(string tagId, Type tagType, ISandboxHelper sandbox)
+    {
+        return Map(
+                (args, controls) =>
+                {
+                    try
+                    {
+                        var tag = (IDocumentTag) sandbox.CreateInstance(tagType);
+                        if (!tag.TryParseTag(args, out var control))
+                        {
+                            _sawmill.Error($"Failed to parse {tagId} args");
+                            return new GuidebookError(args.ToString() ?? tagId, $"Failed to parse {tagId} args");
+                        }
 
-            foreach (var child in controls)
-            {
-                control.AddChild(child);
-            }
-            return control;
-        },
-        ParseTagArgs(tagId),
-        TagContentParser(tagId)).Labelled($"{tagId} control");
+                        foreach (var child in controls)
+                        {
+                            control.AddChild(child);
+                        }
+
+                        return control;
+                    }
+                    catch (Exception e)
+                    {
+                        var output = args.Aggregate(string.Empty,
+                            (current, pair) => current + $"{pair.Key}=\"{pair.Value}\" ");
+
+                        _sawmill.Error($"Tag: {tagId} \n Arguments: {output}/>");
+                        return new GuidebookError($"Tag: {tagId}\nArguments: {output}", e.ToString());
+                    }
+                },
+                ParseTagArgs(tagId),
+                TagContentParser(tagId))
+            .Labelled($"{tagId} control");
+    }
 
     // Parse a bunch of controls until we encounter a matching closing tag.
-    private Parser<char, IEnumerable<Control>> TagContentParser(string tag) =>
-    OneOf(
-        Try(ImmediateTagEnd).ThenReturn(Enumerable.Empty<Control>()),
-        TagEnd.Then(_controlParser.Until(TryTagTerminator(tag)).Labelled($"{tag} children"))
-    );
+    private Parser<char, IEnumerable<Control>> TagContentParser(string tag)
+    {
+        return OneOf(
+            Try(ImmediateTagEnd).ThenReturn(Enumerable.Empty<Control>()),
+            TagEnd.Then(_controlParser.Until(TryTagTerminator(tag)).Labelled($"{tag} children"))
+        );
+    }
 }
diff --git a/Content.Client/Guidebook/DocumentParsingManager.static.cs b/Content.Client/Guidebook/DocumentParsingManager.static.cs
index ab38fcb1546..5d25d8f6452 100644
--- a/Content.Client/Guidebook/DocumentParsingManager.static.cs
+++ b/Content.Client/Guidebook/DocumentParsingManager.static.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using Content.Client.Guidebook.Controls;
 using Pidgin;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -14,92 +15,142 @@ public sealed partial class DocumentParsingManager
 {
     private const string ListBullet = "  › ";
 
-    #region Text Parsing
-    #region Basic Text Parsing
-    // Try look for an escaped character. If found, skip the escaping slash and return the character.
-    private static readonly Parser<char, char> TryEscapedChar = Try(Char('\\').Then(OneOf(
-     Try(Char('<')),
-     Try(Char('>')),
-     Try(Char('\\')),
-     Try(Char('-')),
-     Try(Char('=')),
-     Try(Char('"')),
-     Try(Char(' ')),
-     Try(Char('n')).ThenReturn('\n'),
-     Try(Char('t')).ThenReturn('\t')
-     )));
+    // Parser that consumes a - and then just parses normal rich text with some prefix text (a bullet point).
+    private static readonly Parser<char, char> TryEscapedChar = Try(Char('\\')
+        .Then(OneOf(
+            Try(Char('<')),
+            Try(Char('>')),
+            Try(Char('\\')),
+            Try(Char('-')),
+            Try(Char('=')),
+            Try(Char('"')),
+            Try(Char(' ')),
+            Try(Char('n')).ThenReturn('\n'),
+            Try(Char('t')).ThenReturn('\t')
+        )));
 
     private static readonly Parser<char, Unit> SkipNewline = Whitespace.SkipUntil(Char('\n'));
 
-    private static readonly Parser<char, char> TrySingleNewlineToSpace = Try(SkipNewline).Then(SkipWhitespaces).ThenReturn(' ');
+    private static readonly Parser<char, char> TrySingleNewlineToSpace =
+        Try(SkipNewline).Then(SkipWhitespaces).ThenReturn(' ');
 
     private static readonly Parser<char, char> TextChar = OneOf(
         TryEscapedChar, // consume any backslashed being used to escape text
         TrySingleNewlineToSpace, // turn single newlines into spaces
         Any // just return the character.
-        );
+    );
 
-    // like TextChar, but not skipping whitespace around newlines
     private static readonly Parser<char, char> QuotedTextChar = OneOf(TryEscapedChar, Any);
 
+    private static readonly Parser<char, string> QuotedText =
+        Char('"').Then(QuotedTextChar.Until(Try(Char('"'))).Select(string.Concat)).Labelled("quoted text");
+
+    private static readonly Parser<char, Unit> TryStartList =
+        Try(SkipNewline.Then(SkipWhitespaces).Then(Char('-'))).Then(SkipWhitespaces);
+
+    private static readonly Parser<char, Unit> TryStartTag = Try(Char('<')).Then(SkipWhitespaces);
+
+    private static readonly Parser<char, Unit> TryStartParagraph =
+        Try(SkipNewline.Then(SkipNewline)).Then(SkipWhitespaces);
+
+    private static readonly Parser<char, Unit> TryLookTextEnd =
+        Lookahead(OneOf(TryStartTag, TryStartList, TryStartParagraph, Try(Whitespace.SkipUntil(End))));
+
+    private static readonly Parser<char, string> TextParser =
+        TextChar.AtLeastOnceUntil(TryLookTextEnd).Select(string.Concat);
+
+    private static readonly Parser<char, Control> TextControlParser = Try(Map<char, string, Control>(text =>
+                {
+                    var rt = new RichTextLabel
+                    {
+                        HorizontalExpand = true,
+                        Margin = new Thickness(0, 0, 0, 15.0f)
+                    };
+
+                    var msg = new FormattedMessage();
+                    // THANK YOU RICHTEXT VERY COOL
+                    // (text doesn't default to white).
+                    msg.PushColor(Color.White);
+
+                    // If the parsing fails, don't throw an error and instead make an inline error message
+                    string? error;
+                    if (!msg.TryAddMarkup(text, out error))
+                    {
+                        Logger.GetSawmill("Guidebook").Error("Failed to parse RichText in Guidebook");
+
+                        return new GuidebookError(text, error);
+                    }
+
+                    msg.Pop();
+                    rt.SetMessage(msg);
+                    return rt;
+                },
+                TextParser)
+            .Cast<Control>())
+        .Labelled("richtext");
+
+    private static readonly Parser<char, Control> HeaderControlParser = Try(Char('#'))
+        .Then(SkipWhitespaces.Then(Map(text => new Label
+                {
+                    Text = text,
+                    StyleClasses = { "LabelHeadingBigger" }
+                },
+                AnyCharExcept('\n').AtLeastOnceString())
+            .Cast<Control>()))
+        .Labelled("header");
+
+    private static readonly Parser<char, Control> SubHeaderControlParser = Try(String("##"))
+        .Then(SkipWhitespaces.Then(Map(text => new Label
+                {
+                    Text = text,
+                    StyleClasses = { "LabelHeading" }
+                },
+                AnyCharExcept('\n').AtLeastOnceString())
+            .Cast<Control>()))
+        .Labelled("subheader");
+
+    private static readonly Parser<char, Control> TryHeaderControl = OneOf(SubHeaderControlParser, HeaderControlParser);
+
+    private static readonly Parser<char, Control> ListControlParser = Try(Char('-'))
+        .Then(SkipWhitespaces)
+        .Then(Map(
+                control => new BoxContainer
+                {
+                    Children = { new Label { Text = ListBullet, VerticalAlignment = VAlignment.Top }, control },
+                    Orientation = LayoutOrientation.Horizontal
+                },
+                TextControlParser)
+            .Cast<Control>())
+        .Labelled("list");
+
+    #region Text Parsing
+
+    #region Basic Text Parsing
+
+    // Try look for an escaped character. If found, skip the escaping slash and return the character.
+
+
+    // like TextChar, but not skipping whitespace around newlines
+
+
     // Quoted text
-    private static readonly Parser<char, string> QuotedText = Char('"').Then(QuotedTextChar.Until(Try(Char('"'))).Select(string.Concat)).Labelled("quoted text");
+
     #endregion
 
     #region rich text-end markers
-    private static readonly Parser<char, Unit> TryStartList = Try(SkipNewline.Then(SkipWhitespaces).Then(Char('-'))).Then(SkipWhitespaces);
-    private static readonly Parser<char, Unit> TryStartTag = Try(Char('<')).Then(SkipWhitespaces);
-    private static readonly Parser<char, Unit> TryStartParagraph = Try(SkipNewline.Then(SkipNewline)).Then(SkipWhitespaces);
-    private static readonly Parser<char, Unit> TryLookTextEnd = Lookahead(OneOf(TryStartTag, TryStartList, TryStartParagraph, Try(Whitespace.SkipUntil(End))));
+
     #endregion
 
     // parses text characters until it hits a text-end
-    private static readonly Parser<char, string> TextParser = TextChar.AtLeastOnceUntil(TryLookTextEnd).Select(string.Concat);
 
-    private static readonly Parser<char, Control> TextControlParser = Try(Map(text =>
-    {
-        var rt = new RichTextLabel()
-        {
-            HorizontalExpand = true,
-            Margin = new Thickness(0, 0, 0, 15.0f),
-        };
-
-        var msg = new FormattedMessage();
-        // THANK YOU RICHTEXT VERY COOL
-        // (text doesn't default to white).
-        msg.PushColor(Color.White);
-        msg.AddMarkup(text);
-        msg.Pop();
-        rt.SetMessage(msg);
-        return rt;
-    }, TextParser).Cast<Control>()).Labelled("richtext");
     #endregion
 
     #region Headers
-    private static readonly Parser<char, Control> HeaderControlParser = Try(Char('#')).Then(SkipWhitespaces.Then(Map(text => new Label()
-    {
-        Text = text,
-        StyleClasses = { "LabelHeadingBigger" }
-    }, AnyCharExcept('\n').AtLeastOnceString()).Cast<Control>())).Labelled("header");
 
-    private static readonly Parser<char, Control> SubHeaderControlParser = Try(String("##")).Then(SkipWhitespaces.Then(Map(text => new Label()
-    {
-        Text = text,
-        StyleClasses = { "LabelHeading" }
-    }, AnyCharExcept('\n').AtLeastOnceString()).Cast<Control>())).Labelled("subheader");
-
-    private static readonly Parser<char, Control> TryHeaderControl = OneOf(SubHeaderControlParser, HeaderControlParser);
     #endregion
 
-    // Parser that consumes a - and then just parses normal rich text with some prefix text (a bullet point).
-    private static readonly Parser<char, Control> ListControlParser = Try(Char('-')).Then(SkipWhitespaces).Then(Map(
-        control => new BoxContainer()
-        {
-            Children = { new Label() { Text = ListBullet, VerticalAlignment = VAlignment.Top, }, control },
-            Orientation = LayoutOrientation.Horizontal,
-        }, TextControlParser).Cast<Control>()).Labelled("list");
-
     #region Tag Parsing
+
     // closing brackets for tags
     private static readonly Parser<char, Unit> TagEnd = Char('>').Then(SkipWhitespaces);
     private static readonly Parser<char, Unit> ImmediateTagEnd = String("/>").Then(SkipWhitespaces);
@@ -107,20 +158,24 @@ public sealed partial class DocumentParsingManager
     private static readonly Parser<char, Unit> TryLookTagEnd = Lookahead(OneOf(Try(TagEnd), Try(ImmediateTagEnd)));
 
     //parse tag argument key. any normal text character up until we hit a "="
-    private static readonly Parser<char, string> TagArgKey = LetterOrDigit.Until(Char('=')).Select(string.Concat).Labelled("tag argument key");
+    private static readonly Parser<char, string> TagArgKey =
+        LetterOrDigit.Until(Char('=')).Select(string.Concat).Labelled("tag argument key");
 
     // parser for a singular tag argument. Note that each TryQuoteOrChar will consume a whole quoted block before the Until() looks for whitespace
-    private static readonly Parser<char, (string, string)> TagArgParser = Map((key, value) => (key, value), TagArgKey, QuotedText).Before(SkipWhitespaces);
+    private static readonly Parser<char, (string, string)> TagArgParser =
+        Map((key, value) => (key, value), TagArgKey, QuotedText).Before(SkipWhitespaces);
 
     // parser for all tag arguments
-    private static readonly Parser<char, IEnumerable<(string, string)>> TagArgsParser = TagArgParser.Until(TryLookTagEnd);
+    private static readonly Parser<char, IEnumerable<(string, string)>> TagArgsParser =
+        TagArgParser.Until(TryLookTagEnd);
 
     // parser for an opening tag.
     private static readonly Parser<char, string> TryOpeningTag =
         Try(Char('<'))
-        .Then(SkipWhitespaces)
-        .Then(TextChar.Until(OneOf(Whitespace.SkipAtLeastOnce(), TryLookTagEnd)))
-        .Select(string.Concat).Labelled($"opening tag");
+            .Then(SkipWhitespaces)
+            .Then(TextChar.Until(OneOf(Whitespace.SkipAtLeastOnce(), TryLookTagEnd)))
+            .Select(string.Concat)
+            .Labelled("opening tag");
 
     private static Parser<char, Dictionary<string, string>> ParseTagArgs(string tag)
     {
@@ -138,5 +193,6 @@ private static Parser<char, Unit> TryTagTerminator(string tag)
             .Then(TagEnd)
             .Labelled($"closing {tag} tag");
     }
+
     #endregion
 }
diff --git a/Content.Client/Hands/Systems/HandsSystem.cs b/Content.Client/Hands/Systems/HandsSystem.cs
index 7319b97b42b..ffa6dfd29d6 100644
--- a/Content.Client/Hands/Systems/HandsSystem.cs
+++ b/Content.Client/Hands/Systems/HandsSystem.cs
@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using Content.Client.DisplacementMap;
 using Content.Client.Examine;
 using Content.Client.Strip;
 using Content.Client.Verbs.UI;
@@ -28,6 +29,7 @@ public sealed class HandsSystem : SharedHandsSystem
         [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
         [Dependency] private readonly StrippableSystem _stripSys = default!;
         [Dependency] private readonly ExamineSystem _examine = default!;
+        [Dependency] private readonly DisplacementMapSystem _displacement = default!;
 
         public event Action<string, HandLocation>? OnPlayerAddHand;
         public event Action<string>? OnPlayerRemoveHand;
@@ -345,6 +347,10 @@ private void UpdateHandVisuals(EntityUid uid, EntityUid held, Hand hand, HandsCo
                 }
 
                 sprite.LayerSetData(index, layerData);
+
+                //Add displacement maps
+                if (handComp.HandDisplacement is not null)
+                    _displacement.TryAddDisplacement(handComp.HandDisplacement, sprite, index, key, revealedLayers);
             }
 
             RaiseLocalEvent(held, new HeldVisualsUpdatedEvent(uid, revealedLayers), true);
diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs
index dc0a3e9fccd..38760f4aa3c 100644
--- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs
+++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs
@@ -1,6 +1,6 @@
 using Content.Shared.MedicalScanner;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.HealthAnalyzer.UI
 {
@@ -17,12 +17,9 @@ public HealthAnalyzerBoundUserInterface(EntityUid owner, Enum uiKey) : base(owne
         protected override void Open()
         {
             base.Open();
-            _window = new HealthAnalyzerWindow
-            {
-                Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName,
-            };
-            _window.OnClose += Close;
-            _window.OpenCentered();
+            _window = this.CreateWindow<HealthAnalyzerWindow>();
+
+            _window.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
         }
 
         protected override void ReceiveMessage(BoundUserInterfaceMessage message)
@@ -35,17 +32,5 @@ protected override void ReceiveMessage(BoundUserInterfaceMessage message)
 
             _window.Populate(cast);
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing)
-                return;
-
-            if (_window != null)
-                _window.OnClose -= Close;
-
-            _window?.Dispose();
-        }
     }
 }
diff --git a/Content.Client/Humanoid/HumanoidMarkingModifierBoundUserInterface.cs b/Content.Client/Humanoid/HumanoidMarkingModifierBoundUserInterface.cs
index a8872604a4c..53977eb636b 100644
--- a/Content.Client/Humanoid/HumanoidMarkingModifierBoundUserInterface.cs
+++ b/Content.Client/Humanoid/HumanoidMarkingModifierBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Humanoid;
 
@@ -20,8 +21,7 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new();
-        _window.OnClose += Close;
+        _window = this.CreateWindow<HumanoidMarkingModifierWindow>();
         _window.OnMarkingAdded += SendMarkingSet;
         _window.OnMarkingRemoved += SendMarkingSet;
         _window.OnMarkingColorChange += SendMarkingSetNoResend;
diff --git a/Content.Client/IconSmoothing/ClientRandomIconSmoothSystem.cs b/Content.Client/IconSmoothing/ClientRandomIconSmoothSystem.cs
new file mode 100644
index 00000000000..73db9e1ab95
--- /dev/null
+++ b/Content.Client/IconSmoothing/ClientRandomIconSmoothSystem.cs
@@ -0,0 +1,29 @@
+using Content.Shared.IconSmoothing;
+using Robust.Client.GameObjects;
+
+namespace Content.Client.IconSmoothing;
+
+public sealed class ClientRandomIconSmoothSystem : SharedRandomIconSmoothSystem
+{
+    [Dependency] private readonly IconSmoothSystem _iconSmooth = default!;
+    [Dependency] private readonly AppearanceSystem _appearance = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<RandomIconSmoothComponent, AppearanceChangeEvent>(OnAppearanceChange);
+    }
+
+    private void OnAppearanceChange(Entity<RandomIconSmoothComponent> ent, ref AppearanceChangeEvent args)
+    {
+        if (!TryComp<IconSmoothComponent>(ent, out var smooth))
+            return;
+
+        if (!_appearance.TryGetData<string>(ent, RandomIconSmoothState.State, out var state, args.Component))
+            return;
+
+        smooth.StateBase = state;
+        _iconSmooth.SetStateBase(ent, smooth, state);
+    }
+}
diff --git a/Content.Client/IconSmoothing/IconSmoothComponent.cs b/Content.Client/IconSmoothing/IconSmoothComponent.cs
index 88b1f613cb7..040198529c7 100644
--- a/Content.Client/IconSmoothing/IconSmoothComponent.cs
+++ b/Content.Client/IconSmoothing/IconSmoothComponent.cs
@@ -30,7 +30,7 @@ public sealed partial class IconSmoothComponent : Component
         ///     Prepended to the RSI state.
         /// </summary>
         [ViewVariables(VVAccess.ReadWrite), DataField("base")]
-        public string StateBase { get; private set; } = string.Empty;
+        public string StateBase { get; set; } = string.Empty;
 
         [DataField("shader", customTypeSerializer:typeof(PrototypeIdSerializer<ShaderPrototype>))]
         public string? Shader;
diff --git a/Content.Client/IconSmoothing/IconSmoothSystem.cs b/Content.Client/IconSmoothing/IconSmoothSystem.cs
index 4b025608465..11ca75bc824 100644
--- a/Content.Client/IconSmoothing/IconSmoothSystem.cs
+++ b/Content.Client/IconSmoothing/IconSmoothSystem.cs
@@ -55,6 +55,33 @@ private void OnStartup(EntityUid uid, IconSmoothComponent component, ComponentSt
             if (component.Mode != IconSmoothingMode.Corners || !TryComp(uid, out SpriteComponent? sprite))
                 return;
 
+            SetCornerLayers(sprite, component);
+
+            if (component.Shader != null)
+            {
+                sprite.LayerSetShader(CornerLayers.SE, component.Shader);
+                sprite.LayerSetShader(CornerLayers.NE, component.Shader);
+                sprite.LayerSetShader(CornerLayers.NW, component.Shader);
+                sprite.LayerSetShader(CornerLayers.SW, component.Shader);
+            }
+        }
+
+        public void SetStateBase(EntityUid uid, IconSmoothComponent component, string newState)
+        {
+            if (!TryComp<SpriteComponent>(uid, out var sprite))
+                return;
+
+            component.StateBase = newState;
+            SetCornerLayers(sprite, component);
+        }
+
+        private void SetCornerLayers(SpriteComponent sprite, IconSmoothComponent component)
+        {
+            sprite.LayerMapRemove(CornerLayers.SE);
+            sprite.LayerMapRemove(CornerLayers.NE);
+            sprite.LayerMapRemove(CornerLayers.NW);
+            sprite.LayerMapRemove(CornerLayers.SW);
+
             var state0 = $"{component.StateBase}0";
             sprite.LayerMapSet(CornerLayers.SE, sprite.AddLayerState(state0));
             sprite.LayerSetDirOffset(CornerLayers.SE, DirectionOffset.None);
@@ -64,14 +91,6 @@ private void OnStartup(EntityUid uid, IconSmoothComponent component, ComponentSt
             sprite.LayerSetDirOffset(CornerLayers.NW, DirectionOffset.Flip);
             sprite.LayerMapSet(CornerLayers.SW, sprite.AddLayerState(state0));
             sprite.LayerSetDirOffset(CornerLayers.SW, DirectionOffset.Clockwise);
-
-            if (component.Shader != null)
-            {
-                sprite.LayerSetShader(CornerLayers.SE, component.Shader);
-                sprite.LayerSetShader(CornerLayers.NE, component.Shader);
-                sprite.LayerSetShader(CornerLayers.NW, component.Shader);
-                sprite.LayerSetShader(CornerLayers.SW, component.Shader);
-            }
         }
 
         private void OnShutdown(EntityUid uid, IconSmoothComponent component, ComponentShutdown args)
diff --git a/Content.Client/Instruments/UI/BandMenu.xaml.cs b/Content.Client/Instruments/UI/BandMenu.xaml.cs
index 5fb293a194d..26cd1369e55 100644
--- a/Content.Client/Instruments/UI/BandMenu.xaml.cs
+++ b/Content.Client/Instruments/UI/BandMenu.xaml.cs
@@ -11,7 +11,9 @@ public sealed partial class BandMenu : DefaultWindow
 {
     private readonly InstrumentBoundUserInterface _owner;
 
-    public BandMenu(InstrumentBoundUserInterface owner) : base()
+    public EntityUid? Master;
+
+    public BandMenu(InstrumentBoundUserInterface owner)
     {
         RobustXamlLoader.Load(this);
 
@@ -40,7 +42,7 @@ public void Populate((NetEntity, string)[] nearby, IEntityManager entManager)
         {
             var uid = entManager.GetEntity(nent);
             var item = BandList.AddItem(name, null, true, uid);
-            item.Selected = _owner.Instrument?.Master == uid;
+            item.Selected = Master == uid;
         }
     }
 }
diff --git a/Content.Client/Instruments/UI/ChannelsMenu.xaml.cs b/Content.Client/Instruments/UI/ChannelsMenu.xaml.cs
index 2814d415365..c175e67842f 100644
--- a/Content.Client/Instruments/UI/ChannelsMenu.xaml.cs
+++ b/Content.Client/Instruments/UI/ChannelsMenu.xaml.cs
@@ -51,7 +51,7 @@ private void OnClearPressed(BaseButton.ButtonEventArgs obj)
         }
     }
 
-    public void Populate()
+    public void Populate(InstrumentComponent? instrument)
     {
         ChannelList.Clear();
 
@@ -60,7 +60,8 @@ public void Populate()
             var item = ChannelList.AddItem(_owner.Loc.GetString("instrument-component-channel-name",
                 ("number", i)), null, true, i);
 
-            item.Selected = !_owner.Instrument?.FilteredChannels[i] ?? false;
+
+            item.Selected = !instrument?.FilteredChannels[i] ?? false;
         }
     }
 }
diff --git a/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs b/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs
index 0f5729f55b1..4816ce8c365 100644
--- a/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs
+++ b/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs
@@ -24,8 +24,6 @@ public sealed class InstrumentBoundUserInterface : BoundUserInterface
         [ViewVariables] private BandMenu? _bandMenu;
         [ViewVariables] private ChannelsMenu? _channelsMenu;
 
-        [ViewVariables] public InstrumentComponent? Instrument { get; private set; }
-
         public InstrumentBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
         {
             IoCManager.InjectDependencies(this);
@@ -43,14 +41,20 @@ protected override void ReceiveMessage(BoundUserInterfaceMessage message)
 
         protected override void Open()
         {
-            if (!EntMan.TryGetComponent(Owner, out InstrumentComponent? instrument))
-                return;
+            _instrumentMenu = this.CreateWindow<InstrumentMenu>();
+            _instrumentMenu.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
 
-            Instrument = instrument;
-            _instrumentMenu = new InstrumentMenu(this);
-            _instrumentMenu.OnClose += Close;
+            _instrumentMenu.OnOpenBand += OpenBandMenu;
+            _instrumentMenu.OnOpenChannels += OpenChannelsMenu;
+            _instrumentMenu.OnCloseChannels += CloseChannelsMenu;
+            _instrumentMenu.OnCloseBands += CloseBandMenu;
 
-            _instrumentMenu.OpenCentered();
+            _instrumentMenu.SetMIDI(MidiManager.IsAvailable);
+
+            if (EntMan.TryGetComponent(Owner, out InstrumentComponent? instrument))
+            {
+                _instrumentMenu.SetInstrument((Owner, instrument));
+            }
         }
 
         protected override void Dispose(bool disposing)
@@ -58,7 +62,12 @@ protected override void Dispose(bool disposing)
             base.Dispose(disposing);
             if (!disposing)
                 return;
-            _instrumentMenu?.Dispose();
+
+            if (EntMan.TryGetComponent(Owner, out InstrumentComponent? instrument))
+            {
+                _instrumentMenu?.RemoveInstrument(instrument);
+            }
+
             _bandMenu?.Dispose();
             _channelsMenu?.Dispose();
         }
@@ -72,6 +81,11 @@ public void OpenBandMenu()
         {
             _bandMenu ??= new BandMenu(this);
 
+            if (EntMan.TryGetComponent(Owner, out InstrumentComponent? instrument))
+            {
+                _bandMenu.Master = instrument.Master;
+            }
+
             // Refresh cache...
             RefreshBands();
 
@@ -87,7 +101,9 @@ public void CloseBandMenu()
         public void OpenChannelsMenu()
         {
             _channelsMenu ??= new ChannelsMenu(this);
-            _channelsMenu.Populate();
+            EntMan.TryGetComponent(Owner, out InstrumentComponent? instrument);
+
+            _channelsMenu.Populate(instrument);
             _channelsMenu.OpenCenteredRight();
         }
 
diff --git a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs
index da443e3fb5b..9b14e01fb57 100644
--- a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs
+++ b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs
@@ -1,7 +1,10 @@
 using System.IO;
 using System.Numerics;
 using System.Threading.Tasks;
+using Content.Client.Interactable;
+using Content.Shared.ActionBlocker;
 using Robust.Client.AutoGenerated;
+using Robust.Client.Player;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
@@ -16,33 +19,23 @@ namespace Content.Client.Instruments.UI
     [GenerateTypedNameReferences]
     public sealed partial class InstrumentMenu : DefaultWindow
     {
-        private readonly InstrumentBoundUserInterface _owner;
+        [Dependency] private readonly IEntityManager _entManager = default!;
+        [Dependency] private readonly IFileDialogManager _dialogs = default!;
+        [Dependency] private readonly IPlayerManager _player = default!;
 
         private bool _isMidiFileDialogueWindowOpen;
 
-        public InstrumentMenu(InstrumentBoundUserInterface owner)
-        {
-            RobustXamlLoader.Load(this);
-
-            _owner = owner;
+        public event Action? OnOpenBand;
+        public event Action? OnOpenChannels;
+        public event Action? OnCloseBands;
+        public event Action? OnCloseChannels;
 
-            if (_owner.Instrument != null)
-            {
-                _owner.Instrument.OnMidiPlaybackEnded += InstrumentOnMidiPlaybackEnded;
-                Title = _owner.Entities.GetComponent<MetaDataComponent>(_owner.Owner).EntityName;
-                LoopButton.Disabled = !_owner.Instrument.IsMidiOpen;
-                LoopButton.Pressed = _owner.Instrument.LoopMidi;
-                ChannelsButton.Disabled = !_owner.Instrument.IsRendererAlive;
-                StopButton.Disabled = !_owner.Instrument.IsMidiOpen;
-                PlaybackSlider.MouseFilter = _owner.Instrument.IsMidiOpen ? MouseFilterMode.Pass : MouseFilterMode.Ignore;
-            }
+        public EntityUid Entity;
 
-            if (!_owner.MidiManager.IsAvailable)
-            {
-                UnavailableOverlay.Visible = true;
-                // We return early as to not give the buttons behavior.
-                return;
-            }
+        public InstrumentMenu()
+        {
+            RobustXamlLoader.Load(this);
+            IoCManager.InjectDependencies(this);
 
             InputButton.OnToggled += MidiInputButtonOnOnToggled;
             BandButton.OnPressed += BandButtonOnPressed;
@@ -57,12 +50,34 @@ public InstrumentMenu(InstrumentBoundUserInterface owner)
             MinSize = SetSize = new Vector2(400, 150);
         }
 
+        public void SetInstrument(Entity<InstrumentComponent> entity)
+        {
+            Entity = entity;
+            var component = entity.Comp;
+            component.OnMidiPlaybackEnded += InstrumentOnMidiPlaybackEnded;
+            LoopButton.Disabled = !component.IsMidiOpen;
+            LoopButton.Pressed = component.LoopMidi;
+            ChannelsButton.Disabled = !component.IsRendererAlive;
+            StopButton.Disabled = !component.IsMidiOpen;
+            PlaybackSlider.MouseFilter = component.IsMidiOpen ? MouseFilterMode.Pass : MouseFilterMode.Ignore;
+        }
+
+        public void RemoveInstrument(InstrumentComponent component)
+        {
+            component.OnMidiPlaybackEnded -= InstrumentOnMidiPlaybackEnded;
+        }
+
+        public void SetMIDI(bool available)
+        {
+            UnavailableOverlay.Visible = !available;
+        }
+
         private void BandButtonOnPressed(ButtonEventArgs obj)
         {
             if (!PlayCheck())
                 return;
 
-            _owner.OpenBandMenu();
+            OnOpenBand?.Invoke();
         }
 
         private void BandButtonOnToggled(ButtonToggledEventArgs obj)
@@ -70,12 +85,15 @@ private void BandButtonOnToggled(ButtonToggledEventArgs obj)
             if (obj.Pressed)
                 return;
 
-            _owner.Instruments.SetMaster(_owner.Owner, null);
+            if (_entManager.TryGetComponent(Entity, out InstrumentComponent? instrument))
+            {
+                _entManager.System<InstrumentSystem>().SetMaster(Entity, instrument.Master);
+            }
         }
 
         private void ChannelsButtonOnPressed(ButtonEventArgs obj)
         {
-            _owner.OpenChannelsMenu();
+            OnOpenChannels?.Invoke();
         }
 
         private void InstrumentOnMidiPlaybackEnded()
@@ -85,8 +103,10 @@ private void InstrumentOnMidiPlaybackEnded()
 
         public void MidiPlaybackSetButtonsDisabled(bool disabled)
         {
-            if(disabled)
-                _owner.CloseChannelsMenu();
+            if (disabled)
+            {
+                OnCloseChannels?.Invoke();
+            }
 
             LoopButton.Disabled = disabled;
             StopButton.Disabled = disabled;
@@ -100,7 +120,7 @@ private async void MidiFileButtonOnOnPressed(ButtonEventArgs obj)
             if (_isMidiFileDialogueWindowOpen)
                 return;
 
-            _owner.CloseBandMenu();
+            OnCloseBands?.Invoke();
 
             var filters = new FileDialogFilters(new FileDialogFilters.Group("mid", "midi"));
 
@@ -108,7 +128,7 @@ private async void MidiFileButtonOnOnPressed(ButtonEventArgs obj)
             // or focus the previously-opened window.
             _isMidiFileDialogueWindowOpen = true;
 
-            await using var file = await _owner.FileDialogManager.OpenFile(filters);
+            await using var file = await _dialogs.OpenFile(filters);
 
             _isMidiFileDialogueWindowOpen = false;
 
@@ -129,9 +149,18 @@ private async void MidiFileButtonOnOnPressed(ButtonEventArgs obj)
 
             await file.CopyToAsync(memStream);
 
-            if (_owner.Instrument is not {} instrument
-                || !_owner.Instruments.OpenMidi(_owner.Owner, memStream.GetBuffer().AsSpan(0, (int) memStream.Length), instrument))
+            if (!_entManager.TryGetComponent<InstrumentComponent>(Entity, out var instrument))
+            {
                 return;
+            }
+
+            if (!_entManager.System<InstrumentSystem>()
+                    .OpenMidi(Entity,
+                    memStream.GetBuffer().AsSpan(0, (int) memStream.Length),
+                    instrument))
+            {
+                return;
+            }
 
             MidiPlaybackSetButtonsDisabled(false);
             if (InputButton.Pressed)
@@ -140,7 +169,7 @@ private async void MidiFileButtonOnOnPressed(ButtonEventArgs obj)
 
         private void MidiInputButtonOnOnToggled(ButtonToggledEventArgs obj)
         {
-            _owner.CloseBandMenu();
+            OnCloseBands?.Invoke();
 
             if (obj.Pressed)
             {
@@ -148,109 +177,99 @@ private void MidiInputButtonOnOnToggled(ButtonToggledEventArgs obj)
                     return;
 
                 MidiStopButtonOnPressed(null);
-                if(_owner.Instrument is {} instrument)
-                    _owner.Instruments.OpenInput(_owner.Owner, instrument);
+
+                if (_entManager.TryGetComponent(Entity, out InstrumentComponent? instrument))
+                    _entManager.System<InstrumentSystem>().OpenInput(Entity, instrument);
             }
-            else if (_owner.Instrument is { } instrument)
+            else
             {
-                _owner.Instruments.CloseInput(_owner.Owner, false, instrument);
-                _owner.CloseChannelsMenu();
+                _entManager.System<InstrumentSystem>().CloseInput(Entity, false);
+                OnCloseChannels?.Invoke();
             }
         }
 
         private bool PlayCheck()
         {
             // TODO all of these checks should also be done server-side.
-
-            var instrumentEnt = _owner.Owner;
-            var instrument = _owner.Instrument;
-
-            if (instrument == null)
+            if (!_entManager.TryGetComponent(Entity, out InstrumentComponent? instrument))
                 return false;
 
-            var localEntity = _owner.PlayerManager.LocalEntity;
+            var localEntity = _player.LocalEntity;
 
             // If we don't have a player or controlled entity, we return.
             if (localEntity == null)
                 return false;
 
             // By default, allow an instrument to play itself and skip all other checks
-            if (localEntity == instrumentEnt)
+            if (localEntity == Entity)
                 return true;
 
-            var container = _owner.Entities.System<SharedContainerSystem>();
+            var container = _entManager.System<SharedContainerSystem>();
             // If we're a handheld instrument, we might be in a container. Get it just in case.
-            container.TryGetContainingContainer(instrumentEnt, out var conMan);
+            container.TryGetContainingContainer((Entity, null, null), out var conMan);
 
             // If the instrument is handheld and we're not holding it, we return.
-            if ((instrument.Handheld && (conMan == null || conMan.Owner != localEntity)))
+            if (instrument.Handheld && (conMan == null || conMan.Owner != localEntity))
                 return false;
 
-            if (!_owner.ActionBlocker.CanInteract(localEntity.Value, instrumentEnt))
+            if (!_entManager.System<ActionBlockerSystem>().CanInteract(localEntity.Value, Entity))
                 return false;
 
             // We check that we're in range unobstructed just in case.
-            return _owner.Interactions.InRangeUnobstructed(localEntity.Value, instrumentEnt);
+            return _entManager.System<InteractionSystem>().InRangeUnobstructed(localEntity.Value, Entity);
         }
 
         private void MidiStopButtonOnPressed(ButtonEventArgs? obj)
         {
             MidiPlaybackSetButtonsDisabled(true);
 
-            if (_owner.Instrument is not {} instrument)
-                return;
-
-            _owner.Instruments.CloseMidi(_owner.Owner, false, instrument);
-            _owner.CloseChannelsMenu();
+            _entManager.System<InstrumentSystem>().CloseMidi(Entity, false);
+            OnCloseChannels?.Invoke();
         }
 
         private void MidiLoopButtonOnOnToggled(ButtonToggledEventArgs obj)
         {
-            if (_owner.Instrument == null)
-                return;
+            var instrument = _entManager.System<InstrumentSystem>();
+
+            if (_entManager.TryGetComponent(Entity, out InstrumentComponent? instrumentComp))
+            {
+                instrumentComp.LoopMidi = obj.Pressed;
+            }
 
-            _owner.Instrument.LoopMidi = obj.Pressed;
-            _owner.Instruments.UpdateRenderer(_owner.Owner, _owner.Instrument);
+            instrument.UpdateRenderer(Entity);
         }
 
         private void PlaybackSliderSeek(Range _)
         {
             // Do not seek while still grabbing.
-            if (PlaybackSlider.Grabbed || _owner.Instrument is not {} instrument)
+            if (PlaybackSlider.Grabbed)
                 return;
 
-            _owner.Instruments.SetPlayerTick(_owner.Owner, (int)Math.Ceiling(PlaybackSlider.Value), instrument);
+            _entManager.System<InstrumentSystem>().SetPlayerTick(Entity, (int)Math.Ceiling(PlaybackSlider.Value));
         }
 
         private void PlaybackSliderKeyUp(GUIBoundKeyEventArgs args)
         {
-            if (args.Function != EngineKeyFunctions.UIClick || _owner.Instrument is not {} instrument)
+            if (args.Function != EngineKeyFunctions.UIClick)
                 return;
 
-            _owner.Instruments.SetPlayerTick(_owner.Owner, (int)Math.Ceiling(PlaybackSlider.Value), instrument);
-        }
-
-        public override void Close()
-        {
-            base.Close();
-            _owner.CloseBandMenu();
-            _owner.CloseChannelsMenu();
+            _entManager.System<InstrumentSystem>().SetPlayerTick(Entity, (int)Math.Ceiling(PlaybackSlider.Value));
         }
 
         protected override void FrameUpdate(FrameEventArgs args)
         {
             base.FrameUpdate(args);
 
-            if (_owner.Instrument == null)
+            if (!_entManager.TryGetComponent(Entity, out InstrumentComponent? instrument))
                 return;
 
-            var hasMaster = _owner.Instrument.Master != null;
+            var hasMaster = instrument.Master != null;
             BandButton.ToggleMode = hasMaster;
             BandButton.Pressed = hasMaster;
-            BandButton.Disabled = _owner.Instrument.IsMidiOpen || _owner.Instrument.IsInputOpen;
-            ChannelsButton.Disabled = !_owner.Instrument.IsRendererAlive;
+            BandButton.Disabled = instrument.IsMidiOpen || instrument.IsInputOpen;
+            ChannelsButton.Disabled = !instrument.IsRendererAlive;
 
-            if (!_owner.Instrument.IsMidiOpen)
+            if (!instrument.IsMidiOpen)
             {
                 PlaybackSlider.MaxValue = 1;
                 PlaybackSlider.SetValueWithoutEvent(0);
@@ -260,8 +279,8 @@ protected override void FrameUpdate(FrameEventArgs args)
             if (PlaybackSlider.Grabbed)
                 return;
 
-            PlaybackSlider.MaxValue = _owner.Instrument.PlayerTotalTick;
-            PlaybackSlider.SetValueWithoutEvent(_owner.Instrument.PlayerTick);
+            PlaybackSlider.MaxValue = instrument.PlayerTotalTick;
+            PlaybackSlider.SetValueWithoutEvent(instrument.PlayerTick);
         }
     }
 }
diff --git a/Content.Client/Interaction/DragDropSystem.cs b/Content.Client/Interaction/DragDropSystem.cs
index d249766bbcc..41459995796 100644
--- a/Content.Client/Interaction/DragDropSystem.cs
+++ b/Content.Client/Interaction/DragDropSystem.cs
@@ -42,6 +42,7 @@ public sealed class DragDropSystem : SharedDragDropSystem
     [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
 
     // how often to recheck possible targets (prevents calling expensive
     // check logic each update)
@@ -89,7 +90,7 @@ public sealed class DragDropSystem : SharedDragDropSystem
     /// </summary>
     private bool _isReplaying;
 
-    private float _deadzone;
+    public float Deadzone;
 
     private DragState _state = DragState.NotDragging;
 
@@ -121,7 +122,7 @@ public override void Initialize()
 
     private void SetDeadZone(float deadZone)
     {
-        _deadzone = deadZone;
+        Deadzone = deadZone;
     }
 
     public override void Shutdown()
@@ -211,7 +212,7 @@ private bool OnUseMouseDown(in PointerInputCmdHandler.PointerInputCmdArgs args)
 
         _draggedEntity = entity;
         _state = DragState.MouseDown;
-        _mouseDownScreenPos = _inputManager.MouseScreenPosition;
+        _mouseDownScreenPos = args.ScreenCoordinates;
         _mouseDownTime = 0;
 
         // don't want anything else to process the click,
@@ -239,8 +240,13 @@ private void StartDrag()
 
         if (TryComp<SpriteComponent>(_draggedEntity, out var draggedSprite))
         {
+            var screenPos = _inputManager.MouseScreenPosition;
+            // No _draggedEntity in null window (Happens in tests)
+            if (!screenPos.IsValid)
+                return;
+
             // pop up drag shadow under mouse
-            var mousePos = _eyeManager.PixelToMap(_inputManager.MouseScreenPosition);
+            var mousePos = _eyeManager.PixelToMap(screenPos);
             _dragShadow = EntityManager.SpawnEntity("dragshadow", mousePos);
             var dragSprite = Comp<SpriteComponent>(_dragShadow.Value);
             dragSprite.CopyFrom(draggedSprite);
@@ -517,6 +523,9 @@ private void RemoveHighlights()
         if (dropEv2.Handled)
             return dropEv2.CanDrop;
 
+        if (dropEv.Handled && dropEv.CanDrop)
+            return true;
+
         return null;
     }
 
@@ -530,7 +539,7 @@ public override void Update(float frameTime)
             case DragState.MouseDown:
             {
                 var screenPos = _inputManager.MouseScreenPosition;
-                if ((_mouseDownScreenPos!.Value.Position - screenPos.Position).Length() > _deadzone)
+                if ((_mouseDownScreenPos!.Value.Position - screenPos.Position).Length() > Deadzone)
                 {
                     StartDrag();
                 }
@@ -551,7 +560,7 @@ public override void FrameUpdate(float frameTime)
         if (Exists(_dragShadow))
         {
             var mousePos = _eyeManager.PixelToMap(_inputManager.MouseScreenPosition);
-            Transform(_dragShadow.Value).WorldPosition = mousePos.Position;
+            _transformSystem.SetWorldPosition(_dragShadow.Value, mousePos.Position);
         }
     }
 }
diff --git a/Content.Client/Inventory/StrippableBoundUserInterface.cs b/Content.Client/Inventory/StrippableBoundUserInterface.cs
index 7e50eb1c68a..132c5ed654c 100644
--- a/Content.Client/Inventory/StrippableBoundUserInterface.cs
+++ b/Content.Client/Inventory/StrippableBoundUserInterface.cs
@@ -41,7 +41,7 @@ public sealed class StrippableBoundUserInterface : BoundUserInterface
         public const string HiddenPocketEntityId = "StrippingHiddenEntity";
 
         [ViewVariables]
-        private readonly StrippingMenu? _strippingMenu;
+        private StrippingMenu? _strippingMenu;
 
         [ViewVariables]
         private readonly EntityUid _virtualHiddenEntity;
@@ -51,33 +51,30 @@ public StrippableBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, u
             _examine = EntMan.System<ExamineSystem>();
             _inv = EntMan.System<InventorySystem>();
             _cuffable = EntMan.System<SharedCuffableSystem>();
-
-            // TODO update name when identity changes
-            var title = Loc.GetString("strippable-bound-user-interface-stripping-menu-title", ("ownerName", Identity.Name(Owner, EntMan)));
-            _strippingMenu = new StrippingMenu(title, this);
-            _strippingMenu.OnClose += Close;
-
-            // TODO use global entity
-            // BUIs are opened and closed while applying comp sates, so spawning entities here is probably not the best idea.
             _virtualHiddenEntity = EntMan.SpawnEntity(HiddenPocketEntityId, MapCoordinates.Nullspace);
         }
 
         protected override void Open()
         {
             base.Open();
+
+            _strippingMenu = this.CreateWindow<StrippingMenu>();
+            _strippingMenu.OnDirty += UpdateMenu;
+            _strippingMenu.Title = Loc.GetString("strippable-bound-user-interface-stripping-menu-title", ("ownerName", Identity.Name(Owner, EntMan)));
+
             _strippingMenu?.OpenCenteredLeft();
         }
 
         protected override void Dispose(bool disposing)
         {
-            base.Dispose(disposing);
-
-            EntMan.DeleteEntity(_virtualHiddenEntity);
-
             if (!disposing)
                 return;
 
-            _strippingMenu?.Dispose();
+            if (_strippingMenu != null)
+                _strippingMenu.OnDirty -= UpdateMenu;
+
+            EntMan.DeleteEntity(_virtualHiddenEntity);
+            base.Dispose(disposing);
         }
 
         public void DirtyMenu()
diff --git a/Content.Client/Items/Systems/ItemSystem.cs b/Content.Client/Items/Systems/ItemSystem.cs
index 5e60d06d0ce..2b5a41c6ce7 100644
--- a/Content.Client/Items/Systems/ItemSystem.cs
+++ b/Content.Client/Items/Systems/ItemSystem.cs
@@ -43,7 +43,7 @@ private void OnEquipped(EntityUid uid, SpriteComponent component, GotEquippedEve
     public override void VisualsChanged(EntityUid uid)
     {
         // if the item is in a container, it might be equipped to hands or inventory slots --> update visuals.
-        if (Container.TryGetContainingContainer(uid, out var container))
+        if (Container.TryGetContainingContainer((uid, null, null), out var container))
             RaiseLocalEvent(container.Owner, new VisualsChangedEvent(GetNetEntity(uid), container.ID));
     }
 
diff --git a/Content.Client/Items/Systems/ItemToggleSystem.cs b/Content.Client/Items/Systems/ItemToggleSystem.cs
deleted file mode 100644
index 46d6f1b464d..00000000000
--- a/Content.Client/Items/Systems/ItemToggleSystem.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Content.Shared.Item.ItemToggle;
-
-namespace Content.Shared.Item;
-
-/// <inheritdoc/>
-public sealed class ItemToggleSystem : SharedItemToggleSystem
-{
-
-}
diff --git a/Content.Client/Jittering/JitteringSystem.cs b/Content.Client/Jittering/JitteringSystem.cs
index 185bd490d3b..0c11a139635 100644
--- a/Content.Client/Jittering/JitteringSystem.cs
+++ b/Content.Client/Jittering/JitteringSystem.cs
@@ -48,6 +48,9 @@ private void OnAnimationCompleted(EntityUid uid, JitteringComponent jittering, A
             if(args.Key != _jitterAnimationKey)
                 return;
 
+            if (!args.Finished)
+                return;
+
             if (TryComp(uid, out AnimationPlayerComponent? animationPlayer)
                 && TryComp(uid, out SpriteComponent? sprite))
                 _animationPlayer.Play(uid, animationPlayer, GetAnimation(jittering, sprite), _jitterAnimationKey);
diff --git a/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs b/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs
index f97d8a73302..7884268c428 100644
--- a/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs
+++ b/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs
@@ -12,42 +12,34 @@ namespace Content.Client.Kitchen.UI
     [GenerateTypedNameReferences]
     public sealed partial class GrinderMenu : FancyWindow
     {
-        private readonly IEntityManager _entityManager;
-        private readonly IPrototypeManager _prototypeManager;
-        private readonly ReagentGrinderBoundUserInterface _owner;
+        [Dependency] private readonly IEntityManager _entityManager = default!;
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
         private readonly Dictionary<int, EntityUid> _chamberVisualContents = new();
 
-        public GrinderMenu(ReagentGrinderBoundUserInterface owner, IEntityManager entityManager, IPrototypeManager prototypeManager)
+        public event Action? OnToggleAuto;
+        public event Action? OnGrind;
+        public event Action? OnJuice;
+        public event Action? OnEjectAll;
+        public event Action? OnEjectBeaker;
+        public event Action<EntityUid>? OnEjectChamber;
+
+        public GrinderMenu()
         {
             RobustXamlLoader.Load(this);
-            _entityManager = entityManager;
-            _prototypeManager = prototypeManager;
-            _owner = owner;
-            AutoModeButton.OnPressed += owner.ToggleAutoMode;
-            GrindButton.OnPressed += owner.StartGrinding;
-            JuiceButton.OnPressed += owner.StartJuicing;
-            ChamberContentBox.EjectButton.OnPressed += owner.EjectAll;
-            BeakerContentBox.EjectButton.OnPressed += owner.EjectBeaker;
+            IoCManager.InjectDependencies(this);
+            AutoModeButton.OnPressed += _ => OnToggleAuto?.Invoke();
+            GrindButton.OnPressed += _ => OnGrind?.Invoke();
+            JuiceButton.OnPressed += _ => OnJuice?.Invoke();
+            ChamberContentBox.EjectButton.OnPressed += _ => OnEjectAll?.Invoke();
+            BeakerContentBox.EjectButton.OnPressed += _ => OnEjectBeaker?.Invoke();
             ChamberContentBox.BoxContents.OnItemSelected += OnChamberBoxContentsItemSelected;
             BeakerContentBox.BoxContents.SelectMode = ItemList.ItemListSelectMode.None;
         }
 
         private void OnChamberBoxContentsItemSelected(ItemList.ItemListSelectedEventArgs args)
         {
-            _owner.EjectChamberContent(_chamberVisualContents[args.ItemIndex]);
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            _chamberVisualContents.Clear();
-            GrindButton.OnPressed -= _owner.StartGrinding;
-            JuiceButton.OnPressed -= _owner.StartJuicing;
-            ChamberContentBox.EjectButton.OnPressed -= _owner.EjectAll;
-            BeakerContentBox.EjectButton.OnPressed -= _owner.EjectBeaker;
-            ChamberContentBox.BoxContents.OnItemSelected -= OnChamberBoxContentsItemSelected;
+            OnEjectChamber?.Invoke(_chamberVisualContents[args.ItemIndex]);
         }
 
         public void UpdateState(ReagentGrinderInterfaceState state)
diff --git a/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs b/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs
index 7e7dd2d6935..643ac47054b 100644
--- a/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs
+++ b/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs
@@ -3,6 +3,7 @@
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Timing;
 
@@ -19,28 +20,15 @@ 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;
 
         public MicrowaveBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
         {
-            _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 = this.CreateWindow<MicrowaveMenu>();
             _menu.StartButton.OnPressed += _ => SendPredictedMessage(new MicrowaveStartCookMessage());
             _menu.EjectButton.OnPressed += _ => SendPredictedMessage(new MicrowaveEjectMessage());
             _menu.IngredientsList.OnItemSelected += args =>
@@ -74,38 +62,23 @@ protected override void Open()
             };
         }
 
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            if (!disposing)
-            {
-                return;
-            }
-
-            _solids.Clear();
-            _menu?.Dispose();
-        }
-
         protected override void UpdateState(BoundUserInterfaceState state)
         {
             base.UpdateState(state);
-            if (state is not MicrowaveUpdateUserInterfaceState cState)
+            if (state is not MicrowaveUpdateUserInterfaceState cState || _menu == null)
             {
                 return;
             }
 
+            _menu.IsBusy = cState.IsMicrowaveBusy;
+            _menu.CurrentCooktimeEnd = cState.CurrentCookTimeEnd;
 
-            _menu?.ToggleBusyDisableOverlayPanel(cState.IsMicrowaveBusy || cState.ContainedSolids.Length == 0);
-            currentState = cState;
-
+            _menu.ToggleBusyDisableOverlayPanel(cState.IsMicrowaveBusy || cState.ContainedSolids.Length == 0);
             // TODO move this to a component state and ensure the net ids.
-            RefreshContentsDisplay(_entManager.GetEntityArray(cState.ContainedSolids));
-
-            if (_menu == null) return;
+            RefreshContentsDisplay(EntMan.GetEntityArray(cState.ContainedSolids));
 
             //Set the cook time info label
-            var cookTime = cState.ActiveButtonIndex == 0 
+            var cookTime = cState.ActiveButtonIndex == 0
                 ? Loc.GetString("microwave-menu-instant-button")
                 : cState.CurrentCookTime.ToString();
 
diff --git a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs
index b292e9f1465..13029e38469 100644
--- a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs
+++ b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs
@@ -9,22 +9,21 @@ namespace Content.Client.Kitchen.UI
     [GenerateTypedNameReferences]
     public sealed partial class MicrowaveMenu : FancyWindow
     {
-        public sealed class MicrowaveCookTimeButton : Button
-        {
-            public uint CookTime;
-        }
+        [Dependency] private readonly IGameTiming _timing = default!;
 
         public event Action<BaseButton.ButtonEventArgs, int>? OnCookTimeSelected;
 
         public ButtonGroup CookTimeButtonGroup { get; }
-        private readonly MicrowaveBoundUserInterface _owner;
 
-        public MicrowaveMenu(MicrowaveBoundUserInterface owner)
+        public bool IsBusy;
+        public TimeSpan CurrentCooktimeEnd;
+
+        public MicrowaveMenu()
         {
             RobustXamlLoader.Load(this);
+            IoCManager.InjectDependencies(this);
             CookTimeButtonGroup = new ButtonGroup();
             InstantCookButton.Group = CookTimeButtonGroup;
-            _owner = owner;
             InstantCookButton.OnPressed += args =>
             {
                 OnCookTimeSelected?.Invoke(args, 0);
@@ -65,14 +64,20 @@ public void ToggleBusyDisableOverlayPanel(bool shouldDisable)
         protected override void FrameUpdate(FrameEventArgs args)
         {
             base.FrameUpdate(args);
-            if(!_owner.currentState.IsMicrowaveBusy)
+
+            if (!IsBusy)
                 return;
 
-            if(_owner.currentState.CurrentCookTimeEnd > _owner.GetCurrentTime())
+            if (CurrentCooktimeEnd > _timing.CurTime)
             {
                 CookTimeInfoLabel.Text = Loc.GetString("microwave-bound-user-interface-cook-time-label",
-                ("time",_owner.currentState.CurrentCookTimeEnd.Subtract(_owner.GetCurrentTime()).Seconds)); 
+                ("time", CurrentCooktimeEnd.Subtract(_timing.CurTime).Seconds));
             }
         }
+
+        public sealed class MicrowaveCookTimeButton : Button
+        {
+            public uint CookTime;
+        }
     }
 }
diff --git a/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs b/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs
index e6f108b3050..bc4cc75b4d1 100644
--- a/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs
+++ b/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Kitchen;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Prototypes;
 
@@ -8,8 +9,6 @@ namespace Content.Client.Kitchen.UI
 {
     public sealed class ReagentGrinderBoundUserInterface : BoundUserInterface
     {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-
         [ViewVariables]
         private GrinderMenu? _menu;
 
@@ -21,20 +20,13 @@ protected override void Open()
         {
             base.Open();
 
-            _menu = new GrinderMenu(this, EntMan, _prototypeManager);
-            _menu.OpenCentered();
-            _menu.OnClose += Close;
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing)
-            {
-                return;
-            }
-
-            _menu?.Dispose();
+            _menu = this.CreateWindow<GrinderMenu>();
+            _menu.OnToggleAuto += ToggleAutoMode;
+            _menu.OnGrind += StartGrinding;
+            _menu.OnJuice += StartJuicing;
+            _menu.OnEjectAll += EjectAll;
+            _menu.OnEjectBeaker += EjectBeaker;
+            _menu.OnEjectChamber += EjectChamberContent;
         }
 
         protected override void UpdateState(BoundUserInterfaceState state)
@@ -52,27 +44,27 @@ protected override void ReceiveMessage(BoundUserInterfaceMessage message)
             _menu?.HandleMessage(message);
         }
 
-        public void ToggleAutoMode(BaseButton.ButtonEventArgs args)
+        public void ToggleAutoMode()
         {
             SendMessage(new ReagentGrinderToggleAutoModeMessage());
         }
 
-        public void StartGrinding(BaseButton.ButtonEventArgs? _ = null)
+        public void StartGrinding()
         {
             SendMessage(new ReagentGrinderStartMessage(GrinderProgram.Grind));
         }
 
-        public void StartJuicing(BaseButton.ButtonEventArgs? _ = null)
+        public void StartJuicing()
         {
             SendMessage(new ReagentGrinderStartMessage(GrinderProgram.Juice));
         }
 
-        public void EjectAll(BaseButton.ButtonEventArgs? _ = null)
+        public void EjectAll()
         {
             SendMessage(new ReagentGrinderEjectChamberAllMessage());
         }
 
-        public void EjectBeaker(BaseButton.ButtonEventArgs? _ = null)
+        public void EjectBeaker()
         {
             SendMessage(new ItemSlotButtonPressedEvent(SharedReagentGrinder.BeakerSlotId));
         }
diff --git a/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs b/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs
index 555f1ff09e6..6b656123412 100644
--- a/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs
+++ b/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Labels;
 using Content.Shared.Labels.Components;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Labels.UI
 {
@@ -23,13 +24,8 @@ protected override void Open()
         {
             base.Open();
 
-            _window = new HandLabelerWindow();
-            if (State != null)
-                UpdateState(State);
+            _window = this.CreateWindow<HandLabelerWindow>();
 
-            _window.OpenCentered();
-
-            _window.OnClose += Close;
             _window.OnLabelChanged += OnLabelChanged;
             Reload();
         }
@@ -51,13 +47,5 @@ public void Reload()
 
             _window.SetCurrentLabel(component.AssignedLabel);
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing) return;
-            _window?.Dispose();
-        }
     }
-
 }
diff --git a/Content.Client/LateJoin/LateJoinGui.cs b/Content.Client/LateJoin/LateJoinGui.cs
index 62a06629f29..13cf281513d 100644
--- a/Content.Client/LateJoin/LateJoinGui.cs
+++ b/Content.Client/LateJoin/LateJoinGui.cs
@@ -2,9 +2,11 @@
 using System.Numerics;
 using Content.Client.CrewManifest;
 using Content.Client.GameTicking.Managers;
+using Content.Client.Lobby;
 using Content.Client.UserInterface.Controls;
 using Content.Client.Players.PlayTimeTracking;
 using Content.Shared.CCVar;
+using Content.Shared.Preferences;
 using Content.Shared.Roles;
 using Content.Shared.StatusIcon;
 using Robust.Client.Console;
@@ -26,6 +28,7 @@ public sealed class LateJoinGui : DefaultWindow
         [Dependency] private readonly IConfigurationManager _configManager = default!;
         [Dependency] private readonly IEntitySystemManager _entitySystem = default!;
         [Dependency] private readonly JobRequirementsManager _jobRequirements = default!;
+        [Dependency] private readonly IClientPreferencesManager _preferencesManager = default!;
 
         public event Action<(NetEntity, string)> SelectedId;
 
@@ -254,7 +257,7 @@ private void RebuildUI()
 
                         jobButton.OnPressed += _ => SelectedId.Invoke((id, jobButton.JobId));
 
-                        if (!_jobRequirements.IsAllowed(prototype, out var reason))
+                        if (!_jobRequirements.IsAllowed(prototype, (HumanoidCharacterProfile?)_preferencesManager.Preferences?.SelectedCharacter, out var reason))
                         {
                             jobButton.Disabled = true;
 
diff --git a/Content.Client/Lathe/LatheSystem.cs b/Content.Client/Lathe/LatheSystem.cs
index c72f01b39b1..386520c198f 100644
--- a/Content.Client/Lathe/LatheSystem.cs
+++ b/Content.Client/Lathe/LatheSystem.cs
@@ -22,21 +22,29 @@ private void OnAppearanceChange(EntityUid uid, LatheComponent component, ref App
         if (args.Sprite == null)
             return;
 
+        // Lathe specific stuff
+        if (_appearance.TryGetData<bool>(uid, LatheVisuals.IsRunning, out var isRunning, args.Component))
+        {
+            if (args.Sprite.LayerMapTryGet(LatheVisualLayers.IsRunning, out var runningLayer) &&
+                component.RunningState != null &&
+                component.IdleState != null)
+            {
+                var state = isRunning ? component.RunningState : component.IdleState;
+                args.Sprite.LayerSetState(runningLayer, state);
+            }
+        }
+
         if (_appearance.TryGetData<bool>(uid, PowerDeviceVisuals.Powered, out var powered, args.Component) &&
             args.Sprite.LayerMapTryGet(PowerDeviceVisualLayers.Powered, out var powerLayer))
         {
             args.Sprite.LayerSetVisible(powerLayer, powered);
-        }
 
-        // Lathe specific stuff
-        if (_appearance.TryGetData<bool>(uid, LatheVisuals.IsRunning, out var isRunning, args.Component) &&
-            args.Sprite.LayerMapTryGet(LatheVisualLayers.IsRunning, out var runningLayer) &&
-            component.RunningState != null &&
-            component.IdleState != null)
-        {
-            var state = isRunning ? component.RunningState : component.IdleState;
-            args.Sprite.LayerSetAnimationTime(runningLayer, 0f);
-            args.Sprite.LayerSetState(runningLayer, state);
+            if (component.UnlitIdleState != null &&
+                component.UnlitRunningState != null)
+            {
+                var state = isRunning ? component.UnlitRunningState : component.UnlitIdleState;
+                args.Sprite.LayerSetState(powerLayer, state);
+            }
         }
     }
 
diff --git a/Content.Client/Lathe/UI/LatheBoundUserInterface.cs b/Content.Client/Lathe/UI/LatheBoundUserInterface.cs
index 6e6d1b91761..a599f79152e 100644
--- a/Content.Client/Lathe/UI/LatheBoundUserInterface.cs
+++ b/Content.Client/Lathe/UI/LatheBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Lathe;
 using Content.Shared.Research.Components;
 using JetBrains.Annotations;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Lathe.UI
 {
@@ -17,9 +18,9 @@ protected override void Open()
         {
             base.Open();
 
-            _menu = new LatheMenu(this);
-            _menu.OnClose += Close;
-
+            _menu = this.CreateWindow<LatheMenu>();
+            _menu.SetEntity(Owner);
+            _menu.OpenCenteredRight();
 
             _menu.OnServerListButtonPressed += _ =>
             {
@@ -30,8 +31,6 @@ protected override void Open()
             {
                 SendMessage(new LatheQueueRecipeMessage(recipe, amount));
             };
-
-            _menu.OpenCenteredRight();
         }
 
         protected override void UpdateState(BoundUserInterfaceState state)
@@ -50,13 +49,5 @@ protected override void UpdateState(BoundUserInterfaceState state)
                     break;
             }
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing)
-                return;
-            _menu?.Dispose();
-        }
     }
 }
diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml b/Content.Client/Lathe/UI/LatheMenu.xaml
index 6f484d8c7be..5b21f0bae66 100644
--- a/Content.Client/Lathe/UI/LatheMenu.xaml
+++ b/Content.Client/Lathe/UI/LatheMenu.xaml
@@ -100,12 +100,9 @@
                             Margin="5 0 0 0"
                             Text="{Loc 'lathe-menu-fabricating-message'}">
                         </Label>
-                        <TextureRect
-                            Name="Icon"
-                            HorizontalExpand="True"
-                            SizeFlagsStretchRatio="2"
-                            Margin="100 0 0 0">
-                        </TextureRect>
+                        <BoxContainer Name="FabricatingDisplayContainer"
+                                      HorizontalAlignment="Left"
+                                      Margin="100 0 0 0"/>
                         <Label
                             Name="NameLabel"
                             RectClipContent="True"
@@ -114,12 +111,15 @@
                         </Label>
                     </PanelContainer>
                 </BoxContainer>
-                <ItemList
-                    Name="QueueList"
-                    VerticalExpand="True"
-                    SizeFlagsStretchRatio="3"
-                    SelectMode="None">
-                </ItemList>
+                <ScrollContainer VerticalExpand="True" HScrollEnabled="False">
+                    <BoxContainer
+                        Name="QueueList"
+                        Orientation="Vertical"
+                        HorizontalExpand="True"
+                        VerticalExpand="True"
+                        RectClipContent="True">
+                    </BoxContainer>
+                </ScrollContainer>
             </BoxContainer>
             <BoxContainer
             VerticalExpand="True"
diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml.cs b/Content.Client/Lathe/UI/LatheMenu.xaml.cs
index 7cedf604781..630ef41e9fb 100644
--- a/Content.Client/Lathe/UI/LatheMenu.xaml.cs
+++ b/Content.Client/Lathe/UI/LatheMenu.xaml.cs
@@ -3,10 +3,10 @@
 using Content.Client.Materials;
 using Content.Shared.Lathe;
 using Content.Shared.Lathe.Prototypes;
-using Content.Shared.Materials;
 using Content.Shared.Research.Prototypes;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
@@ -19,7 +19,7 @@ public sealed partial class LatheMenu : DefaultWindow
 {
     [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    private EntityUid _owner;
+
     private readonly SpriteSystem _spriteSystem;
     private readonly LatheSystem _lathe;
     private readonly MaterialStorageSystem _materialStorage;
@@ -33,9 +33,10 @@ public sealed partial class LatheMenu : DefaultWindow
 
     public ProtoId<LatheCategoryPrototype>? CurrentCategory;
 
-    public LatheMenu(LatheBoundUserInterface owner)
+    public EntityUid Entity;
+
+    public LatheMenu()
     {
-        _owner = owner.Owner;
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
 
@@ -43,8 +44,6 @@ public LatheMenu(LatheBoundUserInterface owner)
         _lathe = _entityManager.System<LatheSystem>();
         _materialStorage = _entityManager.System<MaterialStorageSystem>();
 
-        Title = _entityManager.GetComponent<MetaDataComponent>(owner.Owner).EntityName;
-
         SearchBar.OnTextChanged += _ =>
         {
             PopulateRecipes();
@@ -57,8 +56,13 @@ public LatheMenu(LatheBoundUserInterface owner)
         FilterOption.OnItemSelected += OnItemSelected;
 
         ServerListButton.OnPressed += a => OnServerListButtonPressed?.Invoke(a);
+    }
+
+    public void SetEntity(EntityUid uid)
+    {
+        Entity = uid;
 
-        if (_entityManager.TryGetComponent<LatheComponent>(owner.Owner, out var latheComponent))
+        if (_entityManager.TryGetComponent<LatheComponent>(Entity, out var latheComponent))
         {
             if (!latheComponent.DynamicRecipes.Any())
             {
@@ -66,7 +70,7 @@ public LatheMenu(LatheBoundUserInterface owner)
             }
         }
 
-        MaterialsList.SetOwner(owner.Owner);
+        MaterialsList.SetOwner(Entity);
     }
 
     /// <summary>
@@ -85,7 +89,7 @@ public void PopulateRecipes()
 
             if (SearchBar.Text.Trim().Length != 0)
             {
-                if (proto.Name.ToLowerInvariant().Contains(SearchBar.Text.Trim().ToLowerInvariant()))
+                if (_lathe.GetRecipeName(recipe).ToLowerInvariant().Contains(SearchBar.Text.Trim().ToLowerInvariant()))
                     recipesToShow.Add(proto);
             }
             else
@@ -97,16 +101,15 @@ public void PopulateRecipes()
         if (!int.TryParse(AmountLineEdit.Text, out var quantity) || quantity <= 0)
             quantity = 1;
 
-        var sortedRecipesToShow = recipesToShow.OrderBy(p => p.Name);
+        var sortedRecipesToShow = recipesToShow.OrderBy(_lathe.GetRecipeName);
         RecipeList.Children.Clear();
+        _entityManager.TryGetComponent(Entity, out LatheComponent? lathe);
+
         foreach (var prototype in sortedRecipesToShow)
         {
-            var icon = prototype.Icon == null
-                ? _spriteSystem.GetPrototypeIcon(prototype.Result).Default
-                : _spriteSystem.Frame0(prototype.Icon);
-            var canProduce = _lathe.CanProduce(_owner, prototype, quantity);
+            var canProduce = _lathe.CanProduce(Entity, prototype, quantity, component: lathe);
 
-            var control = new RecipeControl(prototype, () => GenerateTooltipText(prototype), canProduce, icon);
+            var control = new RecipeControl(_lathe, prototype, () => GenerateTooltipText(prototype), canProduce, GetRecipeDisplayControl(prototype));
             control.OnButtonPressed += s =>
             {
                 if (!int.TryParse(AmountLineEdit.Text, out var amount) || amount <= 0)
@@ -120,19 +123,20 @@ public void PopulateRecipes()
     private string GenerateTooltipText(LatheRecipePrototype prototype)
     {
         StringBuilder sb = new();
+        var multiplier = _entityManager.GetComponent<LatheComponent>(Entity).MaterialUseMultiplier;
 
-        foreach (var (id, amount) in prototype.RequiredMaterials)
+        foreach (var (id, amount) in prototype.Materials)
         {
-            if (!_prototypeManager.TryIndex<MaterialPrototype>(id, out var proto))
+            if (!_prototypeManager.TryIndex(id, out var proto))
                 continue;
 
-            var adjustedAmount = SharedLatheSystem.AdjustMaterial(amount, prototype.ApplyMaterialDiscount, _entityManager.GetComponent<LatheComponent>(_owner).MaterialUseMultiplier);
+            var adjustedAmount = SharedLatheSystem.AdjustMaterial(amount, prototype.ApplyMaterialDiscount, multiplier);
             var sheetVolume = _materialStorage.GetSheetVolume(proto);
 
             var unit = Loc.GetString(proto.Unit);
             var sheets = adjustedAmount / (float) sheetVolume;
 
-            var availableAmount = _materialStorage.GetMaterialAmount(_owner, id);
+            var availableAmount = _materialStorage.GetMaterialAmount(Entity, id);
             var missingAmount = Math.Max(0, adjustedAmount - availableAmount);
             var missingSheets = missingAmount / (float) sheetVolume;
 
@@ -152,8 +156,9 @@ private string GenerateTooltipText(LatheRecipePrototype prototype)
             sb.AppendLine(tooltipText);
         }
 
-        if (!string.IsNullOrWhiteSpace(prototype.Description))
-            sb.AppendLine(Loc.GetString("lathe-menu-description-display", ("description", prototype.Description)));
+        var desc = _lathe.GetRecipeDescription(prototype);
+        if (!string.IsNullOrWhiteSpace(desc))
+            sb.AppendLine(Loc.GetString("lathe-menu-description-display", ("description", desc)));
 
         // Remove last newline
         if (sb.Length > 0)
@@ -203,14 +208,20 @@ public void UpdateCategories()
     /// <param name="queue"></param>
     public void PopulateQueueList(List<LatheRecipePrototype> queue)
     {
-        QueueList.Clear();
+        QueueList.DisposeAllChildren();
+
         var idx = 1;
         foreach (var recipe in queue)
         {
-            var icon = recipe.Icon == null
-                ? _spriteSystem.GetPrototypeIcon(recipe.Result).Default
-                : _spriteSystem.Frame0(recipe.Icon);
-            QueueList.AddItem($"{idx}. {recipe.Name}", icon);
+            var queuedRecipeBox = new BoxContainer();
+            queuedRecipeBox.Orientation = BoxContainer.LayoutOrientation.Horizontal;
+
+            queuedRecipeBox.AddChild(GetRecipeDisplayControl(recipe));
+
+            var queuedRecipeLabel = new Label();
+            queuedRecipeLabel.Text = $"{idx}. {_lathe.GetRecipeName(recipe)}";
+            queuedRecipeBox.AddChild(queuedRecipeLabel);
+            QueueList.AddChild(queuedRecipeBox);
             idx++;
         }
     }
@@ -220,10 +231,30 @@ public void SetQueueInfo(LatheRecipePrototype? recipe)
         FabricatingContainer.Visible = recipe != null;
         if (recipe == null)
             return;
-        Icon.Texture = recipe.Icon == null
-            ? _spriteSystem.GetPrototypeIcon(recipe.Result).Default
-            : _spriteSystem.Frame0(recipe.Icon);
-        NameLabel.Text = $"{recipe.Name}";
+
+        FabricatingDisplayContainer.Children.Clear();
+        FabricatingDisplayContainer.AddChild(GetRecipeDisplayControl(recipe));
+
+        NameLabel.Text = _lathe.GetRecipeName(recipe);
+    }
+
+    public Control GetRecipeDisplayControl(LatheRecipePrototype recipe)
+    {
+        if (recipe.Icon != null)
+        {
+            var textRect = new TextureRect();
+            textRect.Texture = _spriteSystem.Frame0(recipe.Icon);
+            return textRect;
+        }
+
+        if (recipe.Result is { } result)
+        {
+            var entProtoView = new EntityPrototypeView();
+            entProtoView.SetPrototype(result);
+            return entProtoView;
+        }
+
+        return new Control();
     }
 
     private void OnItemSelected(OptionButton.ItemSelectedEventArgs obj)
diff --git a/Content.Client/Lathe/UI/RecipeControl.xaml b/Content.Client/Lathe/UI/RecipeControl.xaml
index 2e02c8a6147..1105ab478ff 100644
--- a/Content.Client/Lathe/UI/RecipeControl.xaml
+++ b/Content.Client/Lathe/UI/RecipeControl.xaml
@@ -5,11 +5,13 @@
         Margin="0"
         StyleClasses="ButtonSquare">
         <BoxContainer Orientation="Horizontal">
-            <TextureRect
-                Name="RecipeTexture"
+            <BoxContainer
+                Name="RecipeDisplayContainer"
                 Margin="0 0 4 0"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
                 MinSize="32 32"
-                Stretch="KeepAspectCentered" />
+                />
             <Label Name="RecipeName" HorizontalExpand="True" />
         </BoxContainer>
     </Button>
diff --git a/Content.Client/Lathe/UI/RecipeControl.xaml.cs b/Content.Client/Lathe/UI/RecipeControl.xaml.cs
index bf85ff7d938..4f438c8a8e5 100644
--- a/Content.Client/Lathe/UI/RecipeControl.xaml.cs
+++ b/Content.Client/Lathe/UI/RecipeControl.xaml.cs
@@ -1,9 +1,7 @@
 using Content.Shared.Research.Prototypes;
 using Robust.Client.AutoGenerated;
-using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Graphics;
 
 namespace Content.Client.Lathe.UI;
 
@@ -13,12 +11,12 @@ public sealed partial class RecipeControl : Control
     public Action<string>? OnButtonPressed;
     public Func<string> TooltipTextSupplier;
 
-    public RecipeControl(LatheRecipePrototype recipe, Func<string> tooltipTextSupplier, bool canProduce, Texture? texture = null)
+    public RecipeControl(LatheSystem latheSystem, LatheRecipePrototype recipe, Func<string> tooltipTextSupplier, bool canProduce, Control displayControl)
     {
         RobustXamlLoader.Load(this);
 
-        RecipeName.Text = recipe.Name;
-        RecipeTexture.Texture = texture;
+        RecipeName.Text = latheSystem.GetRecipeName(recipe);
+        RecipeDisplayContainer.AddChild(displayControl);
         Button.Disabled = !canProduce;
         TooltipTextSupplier = tooltipTextSupplier;
         Button.TooltipSupplier = SupplyTooltip;
diff --git a/Content.Client/Launcher/LauncherConnectingGui.xaml.cs b/Content.Client/Launcher/LauncherConnectingGui.xaml.cs
index ac74ad7b60d..5015b710eb4 100644
--- a/Content.Client/Launcher/LauncherConnectingGui.xaml.cs
+++ b/Content.Client/Launcher/LauncherConnectingGui.xaml.cs
@@ -116,7 +116,7 @@ private void HandleDisconnectReason(INetStructuredReason? reason)
         private void ChangeLoginTip()
         {
             var tipsDataset = _cfg.GetCVar(CCVars.LoginTipsDataset);
-            var loginTipsEnabled = _prototype.TryIndex<DatasetPrototype>(tipsDataset, out var tips);
+            var loginTipsEnabled = _prototype.TryIndex<LocalizedDatasetPrototype>(tipsDataset, out var tips);
 
             LoginTips.Visible = loginTipsEnabled;
             if (!loginTipsEnabled)
@@ -131,7 +131,7 @@ private void ChangeLoginTip()
 
             var randomIndex = _random.Next(tipList.Count);
             var tip = tipList[randomIndex];
-            LoginTip.SetMessage(tip);
+            LoginTip.SetMessage(Loc.GetString(tip));
 
             LoginTipTitle.Text = Loc.GetString("connecting-window-tip", ("numberTip", randomIndex));
         }
diff --git a/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs b/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs
index 11f69165cf6..ca19d8522c5 100644
--- a/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs
+++ b/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs
@@ -19,6 +19,9 @@ public override void Initialize()
 
     private void OnBehaviorAnimationCompleted(EntityUid uid, LightBehaviourComponent component, AnimationCompletedEvent args)
     {
+        if (!args.Finished)
+            return;
+
         var container = component.Animations.FirstOrDefault(x => x.FullKey == args.Key);
 
         if (container == null)
diff --git a/Content.Client/Light/EntitySystems/RotatingLightSystem.cs b/Content.Client/Light/EntitySystems/RotatingLightSystem.cs
index 842c13dedfe..5c2c4e4c875 100644
--- a/Content.Client/Light/EntitySystems/RotatingLightSystem.cs
+++ b/Content.Client/Light/EntitySystems/RotatingLightSystem.cs
@@ -69,6 +69,9 @@ private void OnAfterAutoHandleState(EntityUid uid, RotatingLightComponent comp,
 
     private void OnAnimationComplete(EntityUid uid, RotatingLightComponent comp, AnimationCompletedEvent args)
     {
+        if (!args.Finished)
+            return;
+
         PlayAnimation(uid, comp);
     }
 
diff --git a/Content.Client/Lobby/LobbyUIController.cs b/Content.Client/Lobby/LobbyUIController.cs
index e4a13ed8c6b..3cf98c98aba 100644
--- a/Content.Client/Lobby/LobbyUIController.cs
+++ b/Content.Client/Lobby/LobbyUIController.cs
@@ -43,9 +43,11 @@ public sealed class LobbyUIController : UIController, IOnStateEntered<LobbyState
     [UISystemDependency] private readonly ClientInventorySystem _inventory = default!;
     [UISystemDependency] private readonly StationSpawningSystem _spawn = default!;
     [UISystemDependency] private readonly GuidebookSystem _guide = default!;
+    [UISystemDependency] private readonly LoadoutSystem _loadouts = default!;
 
     private CharacterSetupGui? _characterSetup;
     private HumanoidProfileEditor? _profileEditor;
+    private CharacterSetupGuiSavePanel? _savePanel;
 
     /// <summary>
     /// This is the characher preview panel in the chat. This should only update if their character updates.
@@ -214,6 +216,46 @@ private void SaveProfile()
         ReloadCharacterSetup();
     }
 
+    private void CloseProfileEditor()
+    {
+        if (_profileEditor == null)
+            return;
+
+        _profileEditor.SetProfile(null, null);
+        _profileEditor.Visible = false;
+
+        if (_stateManager.CurrentState is LobbyState lobbyGui)
+        {
+            lobbyGui.SwitchState(LobbyGui.LobbyGuiState.Default);
+        }
+    }
+
+    private void OpenSavePanel()
+    {
+        if (_savePanel is { IsOpen: true })
+            return;
+
+        _savePanel = new CharacterSetupGuiSavePanel();
+
+        _savePanel.SaveButton.OnPressed += _ =>
+        {
+            SaveProfile();
+
+            _savePanel.Close();
+
+            CloseProfileEditor();
+        };
+
+        _savePanel.NoSaveButton.OnPressed += _ =>
+        {
+            _savePanel.Close();
+
+            CloseProfileEditor();
+        };
+
+        _savePanel.OpenCentered();
+    }
+
     private (CharacterSetupGui, HumanoidProfileEditor) EnsureGui()
     {
         if (_characterSetup != null && _profileEditor != null)
@@ -231,6 +273,7 @@ private void SaveProfile()
             _logManager,
             _playerManager,
             _prototypeManager,
+            _resourceCache,
             _requirements,
             _markings);
 
@@ -240,14 +283,16 @@ private void SaveProfile()
 
         _characterSetup.CloseButton.OnPressed += _ =>
         {
-            // Reset sliders etc.
-            _profileEditor.SetProfile(null, null);
-            _profileEditor.Visible = false;
-
-            if (_stateManager.CurrentState is LobbyState lobbyGui)
+            // Open the save panel if we have unsaved changes.
+            if (_profileEditor.Profile != null && _profileEditor.IsDirty)
             {
-                lobbyGui.SwitchState(LobbyGui.LobbyGuiState.Default);
+                OpenSavePanel();
+
+                return;
             }
+
+            // Reset sliders etc.
+            CloseProfileEditor();
         };
 
         _profileEditor.Save += SaveProfile;
@@ -321,7 +366,7 @@ public void GiveDummyLoadout(EntityUid uid, RoleLoadout? roleLoadout)
                 if (!_prototypeManager.TryIndex(loadout.Prototype, out var loadoutProto))
                     continue;
 
-                _spawn.EquipStartingGear(uid, _prototypeManager.Index(loadoutProto.Equipment));
+                _spawn.EquipStartingGear(uid, loadoutProto);
             }
         }
     }
@@ -344,36 +389,51 @@ public void GiveDummyJobClothes(EntityUid dummy, HumanoidCharacterProfile profil
                     if (!_prototypeManager.TryIndex(loadout.Prototype, out var loadoutProto))
                         continue;
 
-                    // TODO: Need some way to apply starting gear to an entity coz holy fucking shit dude.
-                    var loadoutGear = _prototypeManager.Index(loadoutProto.Equipment);
-
+                    // TODO: Need some way to apply starting gear to an entity and replace existing stuff coz holy fucking shit dude.
                     foreach (var slot in slots)
                     {
-                        var itemType = loadoutGear.GetGear(slot.Name);
-
-                        if (_inventory.TryUnequip(dummy, slot.Name, out var unequippedItem, silent: true, force: true, reparent: false))
+                        // Try startinggear first
+                        if (_prototypeManager.TryIndex(loadoutProto.StartingGear, out var loadoutGear))
                         {
-                            EntityManager.DeleteEntity(unequippedItem.Value);
+                            var itemType = ((IEquipmentLoadout) loadoutGear).GetGear(slot.Name);
+
+                            if (_inventory.TryUnequip(dummy, slot.Name, out var unequippedItem, silent: true, force: true, reparent: false))
+                            {
+                                EntityManager.DeleteEntity(unequippedItem.Value);
+                            }
+
+                            if (itemType != string.Empty)
+                            {
+                                var item = EntityManager.SpawnEntity(itemType, MapCoordinates.Nullspace);
+                                _inventory.TryEquip(dummy, item, slot.Name, true, true);
+                            }
                         }
-
-                        if (itemType != string.Empty)
+                        else
                         {
-                            var item = EntityManager.SpawnEntity(itemType, MapCoordinates.Nullspace);
-                            _inventory.TryEquip(dummy, item, slot.Name, true, true);
+                            var itemType = ((IEquipmentLoadout) loadoutProto).GetGear(slot.Name);
+
+                            if (_inventory.TryUnequip(dummy, slot.Name, out var unequippedItem, silent: true, force: true, reparent: false))
+                            {
+                                EntityManager.DeleteEntity(unequippedItem.Value);
+                            }
+
+                            if (itemType != string.Empty)
+                            {
+                                var item = EntityManager.SpawnEntity(itemType, MapCoordinates.Nullspace);
+                                _inventory.TryEquip(dummy, item, slot.Name, true, true);
+                            }
                         }
                     }
                 }
             }
         }
 
-        if (job.StartingGear == null)
+        if (!_prototypeManager.TryIndex(job.StartingGear, out var gear))
             return;
 
-        var gear = _prototypeManager.Index<StartingGearPrototype>(job.StartingGear);
-
         foreach (var slot in slots)
         {
-            var itemType = gear.GetGear(slot.Name);
+            var itemType = ((IEquipmentLoadout) gear).GetGear(slot.Name);
 
             if (_inventory.TryUnequip(dummy, slot.Name, out var unequippedItem, silent: true, force: true, reparent: false))
             {
diff --git a/Content.Client/Lobby/UI/CharacterSetupGuiSavePanel.xaml b/Content.Client/Lobby/UI/CharacterSetupGuiSavePanel.xaml
new file mode 100644
index 00000000000..2dcf9143533
--- /dev/null
+++ b/Content.Client/Lobby/UI/CharacterSetupGuiSavePanel.xaml
@@ -0,0 +1,10 @@
+<DefaultWindow xmlns="https://spacestation14.io"
+            Title="{Loc 'character-setup-gui-save-panel-title'}"
+            Resizable="False">
+
+    <BoxContainer Orientation="Horizontal" SeparationOverride="4" MinSize="200 40">
+        <Button Name="SaveButton" Access="Public" Text="{Loc 'character-setup-gui-save-panel-save'}" StyleClasses="ButtonBig"/>
+        <Button Name="NoSaveButton" Access="Public" Text="{Loc 'character-setup-gui-save-panel-nosave'}" StyleClasses="ButtonBig"/>
+        <Button Name="CancelButton" Access="Public" Text="{Loc 'character-setup-gui-save-panel-cancel'}" StyleClasses="ButtonBig"/>
+    </BoxContainer>
+</DefaultWindow>
diff --git a/Content.Client/Lobby/UI/CharacterSetupGuiSavePanel.xaml.cs b/Content.Client/Lobby/UI/CharacterSetupGuiSavePanel.xaml.cs
new file mode 100644
index 00000000000..5f2690b7a89
--- /dev/null
+++ b/Content.Client/Lobby/UI/CharacterSetupGuiSavePanel.xaml.cs
@@ -0,0 +1,21 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Lobby.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class CharacterSetupGuiSavePanel : DefaultWindow
+{
+    public CharacterSetupGuiSavePanel()
+    {
+        RobustXamlLoader.Load(this);
+
+        CancelButton.OnPressed += _ =>
+        {
+            Close();
+        };
+
+        CloseButton.Visible = false;
+    }
+}
diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
index 03a205e94a8..2f6c2d5aa23 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
@@ -38,6 +38,8 @@
                             <Button Name="ResetButton" Disabled="True" Text="{Loc 'humanoid-profile-editor-reset-button'}"/>
                             <Button Name="ImportButton" Text="{Loc 'humanoid-profile-editor-import-button'}"/>
                             <Button Name="ExportButton" Text="{Loc 'humanoid-profile-editor-export-button'}"/>
+                            <Button Name="ExportImageButton" Text="{Loc 'humanoid-profile-editor-export-image-button'}"/>
+                            <Button Name="OpenImagesButton" Text="{Loc 'humanoid-profile-editor-open-image-button'}"/>
                         </BoxContainer>
                     </ui:HighlightedContainer>
                 </BoxContainer>
diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
index d41472bfe1a..558b68ab930 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -6,6 +6,7 @@
 using Content.Client.Lobby.UI.Roles;
 using Content.Client.Message;
 using Content.Client.Players.PlayTimeTracking;
+using Content.Client.Sprite;
 using Content.Client.Stylesheets;
 using Content.Client.UserInterface.Systems.Guidebook;
 using Content.Shared.CCVar;
@@ -27,6 +28,7 @@
 using Robust.Client.UserInterface.XAML;
 using Robust.Client.Utility;
 using Robust.Shared.Configuration;
+using Robust.Shared.ContentPack;
 using Robust.Shared.Enums;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
@@ -43,6 +45,7 @@ public sealed partial class HumanoidProfileEditor : BoxContainer
         private readonly IFileDialogManager _dialogManager;
         private readonly IPlayerManager _playerManager;
         private readonly IPrototypeManager _prototypeManager;
+        private readonly IResourceManager _resManager;
         private readonly MarkingManager _markingManager;
         private readonly JobRequirementsManager _requirements;
         private readonly LobbyUIController _controller;
@@ -54,6 +57,7 @@ public sealed partial class HumanoidProfileEditor : BoxContainer
         private LoadoutWindow? _loadoutWindow;
 
         private bool _exporting;
+        private bool _imaging;
 
         /// <summary>
         /// If we're attempting to save.
@@ -107,6 +111,7 @@ public HumanoidProfileEditor(
             ILogManager logManager,
             IPlayerManager playerManager,
             IPrototypeManager prototypeManager,
+            IResourceManager resManager,
             JobRequirementsManager requirements,
             MarkingManager markings)
         {
@@ -119,6 +124,7 @@ public HumanoidProfileEditor(
             _prototypeManager = prototypeManager;
             _markingManager = markings;
             _preferencesManager = preferencesManager;
+            _resManager = resManager;
             _requirements = requirements;
             _controller = UserInterfaceManager.GetUIController<LobbyUIController>();
 
@@ -132,6 +138,16 @@ public HumanoidProfileEditor(
                 ExportProfile();
             };
 
+            ExportImageButton.OnPressed += args =>
+            {
+                ExportImage();
+            };
+
+            OpenImagesButton.OnPressed += args =>
+            {
+                _resManager.UserData.OpenOsWindow(ContentSpriteSystem.Exports);
+            };
+
             ResetButton.OnPressed += args =>
             {
                 SetProfile((HumanoidCharacterProfile?) _preferencesManager.Preferences?.SelectedCharacter, _preferencesManager.Preferences?.SelectedCharacterIndex);
@@ -424,7 +440,6 @@ public HumanoidProfileEditor(
             SpeciesInfoButton.OnPressed += OnSpeciesInfoButtonPressed;
 
             UpdateSpeciesGuidebookIcon();
-            ReloadPreview();
             IsDirty = false;
         }
 
@@ -634,7 +649,7 @@ public void RefreshAntags()
                 selector.Select(Profile?.AntagPreferences.Contains(antag.ID) == true ? 0 : 1);
 
                 var requirements = _entManager.System<SharedRoleSystem>().GetAntagRequirement(antag);
-                if (!_requirements.CheckRoleTime(requirements, out var reason))
+                if (!_requirements.CheckRoleRequirements(requirements, (HumanoidCharacterProfile?)_preferencesManager.Preferences?.SelectedCharacter, out var reason))
                 {
                     selector.LockRequirements(reason);
                     Profile = Profile?.WithAntagPreference(antag.ID, false);
@@ -697,11 +712,12 @@ private void ReloadPreview()
             _entManager.DeleteEntity(PreviewDummy);
             PreviewDummy = EntityUid.Invalid;
 
-            if (Profile == null || !_prototypeManager.HasIndex<SpeciesPrototype>(Profile.Species))
+            if (Profile == null || !_prototypeManager.HasIndex(Profile.Species))
                 return;
 
             PreviewDummy = _controller.LoadProfileEntity(Profile, JobOverride, ShowClothes.Pressed);
             SpriteView.SetEntity(PreviewDummy);
+            _entManager.System<MetaDataSystem>().SetEntityName(PreviewDummy, Profile.Name);
         }
 
         /// <summary>
@@ -887,7 +903,7 @@ public void RefreshJobs()
                     icon.Texture = jobIcon.Icon.Frame0();
                     selector.Setup(items, job.LocalizedName, 200, job.LocalizedDescription, icon, job.Guides);
 
-                    if (!_requirements.IsAllowed(job, out var reason))
+                    if (!_requirements.IsAllowed(job, (HumanoidCharacterProfile?)_preferencesManager.Preferences?.SelectedCharacter, out var reason))
                     {
                         selector.LockRequirements(reason);
                     }
@@ -1130,6 +1146,17 @@ protected override void Dispose(bool disposing)
 
             _loadoutWindow?.Dispose();
             _loadoutWindow = null;
+        }
+
+        protected override void EnteredTree()
+        {
+            base.EnteredTree();
+            ReloadPreview();
+        }
+
+        protected override void ExitedTree()
+        {
+            base.ExitedTree();
             _entManager.DeleteEntity(PreviewDummy);
             PreviewDummy = EntityUid.Invalid;
         }
@@ -1190,6 +1217,11 @@ private void SetName(string newName)
         {
             Profile = Profile?.WithName(newName);
             SetDirty();
+
+            if (!IsDirty)
+                return;
+
+            _entManager.System<MetaDataSystem>().SetEntityName(PreviewDummy, newName);
         }
 
         private void SetSpawnPriority(SpawnPriorityPreference newSpawnPriority)
@@ -1198,7 +1230,7 @@ private void SetSpawnPriority(SpawnPriorityPreference newSpawnPriority)
             SetDirty();
         }
 
-        private bool IsDirty
+        public bool IsDirty
         {
             get => _isDirty;
             set
@@ -1521,6 +1553,19 @@ private void RandomizeName()
             UpdateNameEdit();
         }
 
+        private async void ExportImage()
+        {
+            if (_imaging)
+                return;
+
+            var dir = SpriteView.OverrideDirection ?? Direction.South;
+
+            // I tried disabling the button but it looks sorta goofy as it only takes a frame or two to save
+            _imaging = true;
+            await _entManager.System<ContentSpriteSystem>().Export(PreviewDummy, dir, includeId: false);
+            _imaging = false;
+        }
+
         private async void ImportProfile()
         {
             if (_exporting || CharacterSlot == null || Profile == null)
diff --git a/Content.Client/MachineLinking/UI/SignalTimerBoundUserInterface.cs b/Content.Client/MachineLinking/UI/SignalTimerBoundUserInterface.cs
index 09bdedfd94c..11abe8c2451 100644
--- a/Content.Client/MachineLinking/UI/SignalTimerBoundUserInterface.cs
+++ b/Content.Client/MachineLinking/UI/SignalTimerBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using Content.Shared.MachineLinking;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using Robust.Shared.Timing;
 
 namespace Content.Client.MachineLinking.UI;
@@ -19,19 +20,14 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new SignalTimerWindow(this);
-
-        if (State != null)
-            UpdateState(State);
-
-        _window.OpenCentered();
-        _window.OnClose += Close;
+        _window = this.CreateWindow<SignalTimerWindow>();
+        _window.OnStartTimer += StartTimer;
         _window.OnCurrentTextChanged += OnTextChanged;
         _window.OnCurrentDelayMinutesChanged += OnDelayChanged;
         _window.OnCurrentDelaySecondsChanged += OnDelayChanged;
     }
 
-    public void OnStartTimer()
+    public void StartTimer()
     {
         SendMessage(new SignalTimerStartMessage());
     }
@@ -48,11 +44,6 @@ private void OnDelayChanged(string newDelay)
         SendMessage(new SignalTimerDelayChangedMessage(_window.GetDelay()));
     }
 
-    public TimeSpan GetCurrentTime()
-    {
-        return _gameTiming.CurTime;
-    }
-
     /// <summary>
     /// Update the UI state based on server-sent info
     /// </summary>
@@ -72,11 +63,4 @@ protected override void UpdateState(BoundUserInterfaceState state)
         _window.SetTimerStarted(cast.TimerStarted);
         _window.SetHasAccess(cast.HasAccess);
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing) return;
-        _window?.Dispose();
-    }
 }
diff --git a/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs b/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs
index b62595595e5..6133abfcb70 100644
--- a/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs
+++ b/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs
@@ -9,42 +9,44 @@ namespace Content.Client.MachineLinking.UI;
 [GenerateTypedNameReferences]
 public sealed partial class SignalTimerWindow : DefaultWindow
 {
+    [Dependency] private readonly IGameTiming _timing = default!;
+
     private const int MaxTextLength = 5;
 
     public event Action<string>? OnCurrentTextChanged;
     public event Action<string>? OnCurrentDelayMinutesChanged;
     public event Action<string>? OnCurrentDelaySecondsChanged;
 
-    private readonly SignalTimerBoundUserInterface _owner;
-
     private TimeSpan? _triggerTime;
 
     private bool _timerStarted;
 
-    public SignalTimerWindow(SignalTimerBoundUserInterface owner)
+    public event Action? OnStartTimer;
+
+    public SignalTimerWindow()
     {
         RobustXamlLoader.Load(this);
-
-        _owner = owner;
+        IoCManager.InjectDependencies(this);
 
         CurrentTextEdit.OnTextChanged += e => OnCurrentTextChange(e.Text);
         CurrentDelayEditMinutes.OnTextChanged += e => OnCurrentDelayMinutesChange(e.Text);
         CurrentDelayEditSeconds.OnTextChanged += e => OnCurrentDelaySecondsChange(e.Text);
-        StartTimer.OnPressed += _ => OnStartTimer();
+        StartTimer.OnPressed += _ => StartTimerWeh();
     }
 
-    public void OnStartTimer()
+    private void StartTimerWeh()
     {
         if (!_timerStarted)
         {
             _timerStarted = true;
-            _triggerTime = _owner.GetCurrentTime() + GetDelay();
+            _triggerTime = _timing.CurTime + GetDelay();
         }
         else
         {
             SetTimerStarted(false);
         }
-        _owner.OnStartTimer();
+
+        OnStartTimer?.Invoke();
     }
 
     protected override void FrameUpdate(FrameEventArgs args)
@@ -54,9 +56,9 @@ protected override void FrameUpdate(FrameEventArgs args)
         if (!_timerStarted || _triggerTime == null)
             return;
 
-        if (_owner.GetCurrentTime() < _triggerTime.Value)
+        if (_timing.CurTime < _triggerTime.Value)
         {
-            StartTimer.Text = TextScreenSystem.TimeToString(_triggerTime.Value - _owner.GetCurrentTime());
+            StartTimer.Text = TextScreenSystem.TimeToString(_triggerTime.Value - _timing.CurTime);
         }
         else
         {
diff --git a/Content.Client/MagicMirror/MagicMirrorBoundUserInterface.cs b/Content.Client/MagicMirror/MagicMirrorBoundUserInterface.cs
index f6979bf8d7b..0a87948ff62 100644
--- a/Content.Client/MagicMirror/MagicMirrorBoundUserInterface.cs
+++ b/Content.Client/MagicMirror/MagicMirrorBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.MagicMirror;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.MagicMirror;
 
@@ -17,7 +18,7 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new();
+        _window = this.CreateWindow<MagicMirrorWindow>();
 
         _window.OnHairSelected += tuple => SelectHair(MagicMirrorCategory.Hair, tuple.id, tuple.slot);
         _window.OnHairColorChanged += args => ChangeColor(MagicMirrorCategory.Hair, args.marking, args.slot);
@@ -29,9 +30,6 @@ protected override void Open()
             args => ChangeColor(MagicMirrorCategory.FacialHair, args.marking, args.slot);
         _window.OnFacialHairSlotAdded += delegate () { AddSlot(MagicMirrorCategory.FacialHair); };
         _window.OnFacialHairSlotRemoved += args => RemoveSlot(MagicMirrorCategory.FacialHair, args);
-
-        _window.OnClose += Close;
-        _window.OpenCentered();
     }
 
     private void SelectHair(MagicMirrorCategory category, string marking, int slot)
@@ -65,14 +63,5 @@ protected override void UpdateState(BoundUserInterfaceState state)
 
         _window.UpdateState(data);
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing)
-            return;
-
-        _window?.Dispose();
-    }
 }
 
diff --git a/Content.Client/MainMenu/MainMenu.cs b/Content.Client/MainMenu/MainMenu.cs
index 43c5bfe5674..3c709d2d15b 100644
--- a/Content.Client/MainMenu/MainMenu.cs
+++ b/Content.Client/MainMenu/MainMenu.cs
@@ -25,6 +25,9 @@ public sealed class MainScreen : Robust.Client.State.State
         [Dependency] private readonly IGameController _controllerProxy = default!;
         [Dependency] private readonly IResourceCache _resourceCache = default!;
         [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
+        [Dependency] private readonly ILogManager _logManager = default!;
+
+        private ISawmill _sawmill = default!;
 
         private MainMenuControl _mainMenuControl = default!;
         private bool _isConnecting;
@@ -35,6 +38,8 @@ public sealed class MainScreen : Robust.Client.State.State
         /// <inheritdoc />
         protected override void Startup()
         {
+            _sawmill = _logManager.GetSawmill("mainmenu");
+
             _mainMenuControl = new MainMenuControl(_resourceCache, _configurationManager);
             _userInterfaceManager.StateRoot.AddChild(_mainMenuControl);
 
@@ -116,7 +121,7 @@ private void TryConnect(string address)
             catch (ArgumentException e)
             {
                 _userInterfaceManager.Popup($"Unable to connect: {e.Message}", "Connection error.");
-                Logger.Warning(e.ToString());
+                _sawmill.Warning(e.ToString());
                 _netManager.ConnectFailed -= _onConnectFailed;
                 _setConnectingState(false);
             }
diff --git a/Content.Client/Maps/GridDraggingSystem.cs b/Content.Client/Maps/GridDraggingSystem.cs
index 5e9250f0ce9..5bbf5ff5006 100644
--- a/Content.Client/Maps/GridDraggingSystem.cs
+++ b/Content.Client/Maps/GridDraggingSystem.cs
@@ -18,6 +18,7 @@ public sealed class GridDraggingSystem : SharedGridDraggingSystem
     [Dependency] private readonly IInputManager _inputManager = default!;
     [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly InputSystem _inputSystem = default!;
+    [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
 
     public bool Enabled { get; set; }
 
@@ -62,11 +63,11 @@ private void StopDragging()
         if (_dragging == null) return;
 
         if (_lastMousePosition != null && TryComp(_dragging.Value, out TransformComponent? xform) &&
-            TryComp<PhysicsComponent>(_dragging.Value, out var body) &&
+            TryComp<PhysicsComponent>(_dragging.Value, out _) &&
             xform.MapID == _lastMousePosition.Value.MapId)
         {
             var tickTime = _gameTiming.TickPeriod;
-            var distance = _lastMousePosition.Value.Position - xform.WorldPosition;
+            var distance = _lastMousePosition.Value.Position - _transformSystem.GetWorldPosition(xform);
             RaiseNetworkEvent(new GridDragVelocityRequest()
             {
                 Grid = GetNetEntity(_dragging.Value),
diff --git a/Content.Client/MassMedia/Ui/NewsWriterBoundUserInterface.cs b/Content.Client/MassMedia/Ui/NewsWriterBoundUserInterface.cs
index 80eca82e324..22e5bc452a0 100644
--- a/Content.Client/MassMedia/Ui/NewsWriterBoundUserInterface.cs
+++ b/Content.Client/MassMedia/Ui/NewsWriterBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using JetBrains.Annotations;
 using Content.Shared.MassMedia.Systems;
 using Content.Shared.MassMedia.Components;
+using Robust.Client.UserInterface;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
@@ -9,8 +10,6 @@ namespace Content.Client.MassMedia.Ui;
 [UsedImplicitly]
 public sealed class NewsWriterBoundUserInterface : BoundUserInterface
 {
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
-
     [ViewVariables]
     private NewsWriterMenu? _menu;
 
@@ -21,10 +20,7 @@ public NewsWriterBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, u
 
     protected override void Open()
     {
-        _menu = new NewsWriterMenu(_gameTiming);
-
-        _menu.OpenCentered();
-        _menu.OnClose += Close;
+        _menu = this.CreateWindow<NewsWriterMenu>();
 
         _menu.ArticleEditorPanel.PublishButtonPressed += OnPublishButtonPressed;
         _menu.DeleteButtonPressed += OnDeleteButtonPressed;
@@ -32,16 +28,6 @@ protected override void Open()
         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);
diff --git a/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml.cs b/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml.cs
index e2d57935e3a..c059ce785af 100644
--- a/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml.cs
+++ b/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml.cs
@@ -10,17 +10,17 @@ namespace Content.Client.MassMedia.Ui;
 [GenerateTypedNameReferences]
 public sealed partial class NewsWriterMenu : FancyWindow
 {
-    private readonly IGameTiming _gameTiming;
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
 
     private TimeSpan? _nextPublish;
 
     public event Action<int>? DeleteButtonPressed;
 
-    public NewsWriterMenu(IGameTiming gameTiming)
+    public NewsWriterMenu()
     {
         RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
 
-        _gameTiming = gameTiming;
         ContentsContainer.RectClipContent = false;
 
         // Customize scrollbar width and margin. This is not possible in xaml
diff --git a/Content.Client/Materials/MaterialStorageSystem.cs b/Content.Client/Materials/MaterialStorageSystem.cs
index edd07391f7b..592471d6736 100644
--- a/Content.Client/Materials/MaterialStorageSystem.cs
+++ b/Content.Client/Materials/MaterialStorageSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Materials;
+using Content.Shared.Materials;
 using Robust.Client.GameObjects;
 
 namespace Content.Client.Materials;
@@ -49,7 +49,7 @@ public override bool TryInsertMaterialEntity(EntityUid user,
     {
         if (!base.TryInsertMaterialEntity(user, toInsert, receiver, storage, material, composition))
             return false;
-        _transform.DetachParentToNull(toInsert, Transform(toInsert));
+        _transform.DetachEntity(toInsert, Transform(toInsert));
         return true;
     }
 }
diff --git a/Content.Client/Mech/Ui/MechBoundUserInterface.cs b/Content.Client/Mech/Ui/MechBoundUserInterface.cs
index 4172bdc90f1..2130a8c6099 100644
--- a/Content.Client/Mech/Ui/MechBoundUserInterface.cs
+++ b/Content.Client/Mech/Ui/MechBoundUserInterface.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Mech.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Mech.Ui;
 
@@ -20,9 +21,8 @@ protected override void Open()
     {
         base.Open();
 
-        _menu = new(Owner);
-
-        _menu.OnClose += Close;
+        _menu = this.CreateWindow<MechMenu>();
+        _menu.SetEntity(Owner);
         _menu.OpenCenteredLeft();
 
         _menu.OnRemoveButtonPressed += uid =>
@@ -60,16 +60,6 @@ public void UpdateEquipmentControls(MechBoundUiState state)
         }
     }
 
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-
-        if (!disposing)
-            return;
-
-        _menu?.Close();
-    }
-
     public UIFragment? GetEquipmentUi(EntityUid? uid)
     {
         var component = EntMan.GetComponentOrNull<UIFragmentComponent>(uid);
diff --git a/Content.Client/Mech/Ui/MechMenu.xaml.cs b/Content.Client/Mech/Ui/MechMenu.xaml.cs
index fad76488086..7ce863b7cd7 100644
--- a/Content.Client/Mech/Ui/MechMenu.xaml.cs
+++ b/Content.Client/Mech/Ui/MechMenu.xaml.cs
@@ -12,18 +12,20 @@ public sealed partial class MechMenu : FancyWindow
 {
     [Dependency] private readonly IEntityManager _ent = default!;
 
-    private readonly EntityUid _mech;
+    private EntityUid _mech;
 
     public event Action<EntityUid>? OnRemoveButtonPressed;
 
-    public MechMenu(EntityUid mech)
+    public MechMenu()
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
+    }
 
-        _mech = mech;
-
-        MechView.SetEntity(mech);
+    public void SetEntity(EntityUid uid)
+    {
+        MechView.SetEntity(uid);
+        _mech = uid;
     }
 
     public void UpdateMechStats()
diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringBoundUserInterface.cs b/Content.Client/Medical/CrewMonitoring/CrewMonitoringBoundUserInterface.cs
index 39788809871..b1f239cd78e 100644
--- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringBoundUserInterface.cs
+++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringBoundUserInterface.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Medical.CrewMonitoring;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Medical.CrewMonitoring;
 
@@ -14,7 +15,7 @@ public CrewMonitoringBoundUserInterface(EntityUid owner, Enum uiKey) : base(owne
     protected override void Open()
     {
         EntityUid? gridUid = null;
-        string stationName = string.Empty;
+        var stationName = string.Empty;
 
         if (EntMan.TryGetComponent<TransformComponent>(Owner, out var xform))
         {
@@ -26,10 +27,8 @@ protected override void Open()
             }
         }
 
-        _menu = new CrewMonitoringWindow(stationName, gridUid);
-
-        _menu.OpenCentered();
-        _menu.OnClose += Close;
+        _menu = this.CreateWindow<CrewMonitoringWindow>();
+        _menu.Set(stationName, gridUid);
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -44,13 +43,4 @@ protected override void UpdateState(BoundUserInterfaceState state)
                 break;
         }
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing)
-            return;
-
-        _menu?.Dispose();
-    }
 }
diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
index 863412e5532..0709921ae8b 100644
--- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
+++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
@@ -23,22 +23,27 @@ namespace Content.Client.Medical.CrewMonitoring;
 [GenerateTypedNameReferences]
 public sealed partial class CrewMonitoringWindow : FancyWindow
 {
-    private readonly IEntityManager _entManager;
-    private readonly IPrototypeManager _prototypeManager;
+    [Dependency] private readonly IEntityManager _entManager = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     private readonly SpriteSystem _spriteSystem;
 
     private NetEntity? _trackedEntity;
     private bool _tryToScrollToListFocus;
     private Texture? _blipTexture;
 
-    public CrewMonitoringWindow(string stationName, EntityUid? mapUid)
+    public CrewMonitoringWindow()
     {
         RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
 
-        _entManager = IoCManager.Resolve<IEntityManager>();
-        _prototypeManager = IoCManager.Resolve<IPrototypeManager>();
         _spriteSystem = _entManager.System<SpriteSystem>();
 
+        NavMap.TrackedEntitySelectedAction += SetTrackedEntityFromNavMap;
+
+    }
+
+    public void Set(string stationName, EntityUid? mapUid)
+    {
         _blipTexture = _spriteSystem.Frame0(new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png")));
 
         if (_entManager.TryGetComponent<TransformComponent>(mapUid, out var xform))
@@ -49,8 +54,6 @@ public CrewMonitoringWindow(string stationName, EntityUid? mapUid)
 
         StationName.AddStyleClass("LabelBig");
         StationName.Text = stationName;
-
-        NavMap.TrackedEntitySelectedAction += SetTrackedEntityFromNavMap;
         NavMap.ForceNavMapUpdate();
     }
 
@@ -254,7 +257,7 @@ private void PopulateDepartmentList(IEnumerable<SuitSensorStatus> departmentSens
             mainContainer.AddChild(jobContainer);
 
             // Job icon
-            if (_prototypeManager.TryIndex<StatusIconPrototype>(sensor.JobIcon, out var proto))
+            if (_prototypeManager.TryIndex<JobIconPrototype>(sensor.JobIcon, out var proto))
             {
                 var jobIcon = new TextureRect()
                 {
diff --git a/Content.Client/MouseRotator/MouseRotatorSystem.cs b/Content.Client/MouseRotator/MouseRotatorSystem.cs
index ce174c6144c..18d60d9a7b9 100644
--- a/Content.Client/MouseRotator/MouseRotatorSystem.cs
+++ b/Content.Client/MouseRotator/MouseRotatorSystem.cs
@@ -2,7 +2,6 @@
 using Robust.Client.Graphics;
 using Robust.Client.Input;
 using Robust.Client.Player;
-using Robust.Client.Replays.Loading;
 using Robust.Shared.Map;
 using Robust.Shared.Timing;
 
@@ -46,13 +45,19 @@ public override void Update(float frameTime)
         // only raise event if the cardinal direction has changed
         if (rotator.Simple4DirMode)
         {
-            var angleDir = angle.GetCardinalDir();
-            if (angleDir == curRot.GetCardinalDir())
+            var eyeRot = _eye.CurrentEye.Rotation; // camera rotation
+            var angleDir = (angle + eyeRot).GetCardinalDir(); // apply GetCardinalDir in the camera frame, not in the world frame
+            if (angleDir == (curRot + eyeRot).GetCardinalDir())
                 return;
 
-            RaisePredictiveEvent(new RequestMouseRotatorRotationSimpleEvent()
+            var rotation = angleDir.ToAngle() - eyeRot; // convert back to world frame
+            if (rotation >= Math.PI) // convert to [-PI, +PI)
+                rotation -= 2 * Math.PI;
+            else if (rotation < -Math.PI)
+                rotation += 2 * Math.PI;
+            RaisePredictiveEvent(new RequestMouseRotatorRotationEvent
             {
-                Direction = angleDir,
+                Rotation = rotation
             });
 
             return;
diff --git a/Content.Client/Movement/Systems/ContentEyeSystem.cs b/Content.Client/Movement/Systems/ContentEyeSystem.cs
index 182ac92ae05..9fbd4b5c37d 100644
--- a/Content.Client/Movement/Systems/ContentEyeSystem.cs
+++ b/Content.Client/Movement/Systems/ContentEyeSystem.cs
@@ -9,7 +9,7 @@ public sealed class ContentEyeSystem : SharedContentEyeSystem
 {
     [Dependency] private readonly IPlayerManager _player = default!;
 
-    public void RequestZoom(EntityUid uid, Vector2 zoom, bool ignoreLimit, ContentEyeComponent? content = null)
+    public void RequestZoom(EntityUid uid, Vector2 zoom, bool ignoreLimit, bool scalePvs, ContentEyeComponent? content = null)
     {
         if (!Resolve(uid, ref content, false))
             return;
@@ -19,6 +19,14 @@ public void RequestZoom(EntityUid uid, Vector2 zoom, bool ignoreLimit, ContentEy
             TargetZoom = zoom,
             IgnoreLimit = ignoreLimit,
         });
+
+        if (scalePvs)
+            RequestPvsScale(Math.Max(zoom.X, zoom.Y));
+    }
+
+    public void RequestPvsScale(float scale)
+    {
+        RaiseNetworkEvent(new RequestPvsScaleEvent(scale));
     }
 
     public void RequestToggleFov()
diff --git a/Content.Client/Movement/Systems/JetpackSystem.cs b/Content.Client/Movement/Systems/JetpackSystem.cs
index b7f5e48821f..2954140d792 100644
--- a/Content.Client/Movement/Systems/JetpackSystem.cs
+++ b/Content.Client/Movement/Systems/JetpackSystem.cs
@@ -15,6 +15,7 @@ public sealed class JetpackSystem : SharedJetpackSystem
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly ClothingSystem _clothing = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly SharedMapSystem _mapSystem = default!;
 
     public override void Initialize()
     {
@@ -63,21 +64,21 @@ public override void Update(float frameTime)
 
     private void CreateParticles(EntityUid uid)
     {
+        var uidXform = Transform(uid);
         // Don't show particles unless the user is moving.
-        if (Container.TryGetContainingContainer(uid, out var container) &&
+        if (Container.TryGetContainingContainer((uid, uidXform, null), out var container) &&
             TryComp<PhysicsComponent>(container.Owner, out var body) &&
             body.LinearVelocity.LengthSquared() < 1f)
         {
             return;
         }
 
-        var uidXform = Transform(uid);
         var coordinates = uidXform.Coordinates;
-        var gridUid = coordinates.GetGridUid(EntityManager);
+        var gridUid = _transform.GetGrid(coordinates);
 
         if (TryComp<MapGridComponent>(gridUid, out var grid))
         {
-            coordinates = new EntityCoordinates(gridUid.Value, grid.WorldToLocal(coordinates.ToMapPos(EntityManager, _transform)));
+            coordinates = new EntityCoordinates(gridUid.Value, _mapSystem.WorldToLocal(gridUid.Value, grid, _transform.ToMapCoordinates(coordinates).Position));
         }
         else if (uidXform.MapUid != null)
         {
diff --git a/Content.Client/Movement/Systems/SpriteMovementSystem.cs b/Content.Client/Movement/Systems/SpriteMovementSystem.cs
index 313683855d0..b6203536896 100644
--- a/Content.Client/Movement/Systems/SpriteMovementSystem.cs
+++ b/Content.Client/Movement/Systems/SpriteMovementSystem.cs
@@ -28,7 +28,7 @@ private void OnSpriteMoveInput(EntityUid uid, SpriteMovementComponent component,
             return;
 
         var oldMoving = (SharedMoverController.GetNormalizedMovement(args.OldMovement) & MoveButtons.AnyDirection) != MoveButtons.None;
-        var moving = (SharedMoverController.GetNormalizedMovement(args.Component.HeldMoveButtons) & MoveButtons.AnyDirection) != MoveButtons.None;
+        var moving = (SharedMoverController.GetNormalizedMovement(args.Entity.Comp.HeldMoveButtons) & MoveButtons.AnyDirection) != MoveButtons.None;
 
         if (oldMoving == moving || !_spriteQuery.TryGetComponent(uid, out var sprite))
             return;
diff --git a/Content.Client/NPC/HTN/HTNOverlay.cs b/Content.Client/NPC/HTN/HTNOverlay.cs
index ad173f3b29c..2cb02f10864 100644
--- a/Content.Client/NPC/HTN/HTNOverlay.cs
+++ b/Content.Client/NPC/HTN/HTNOverlay.cs
@@ -9,6 +9,7 @@ public sealed class HTNOverlay : Overlay
 {
     private readonly IEntityManager _entManager = default!;
     private readonly Font _font = default!;
+    private readonly SharedTransformSystem _transformSystem;
 
     public override OverlaySpace Space => OverlaySpace.ScreenSpace;
 
@@ -16,6 +17,7 @@ public HTNOverlay(IEntityManager entManager, IResourceCache resourceCache)
     {
         _entManager = entManager;
         _font = new VectorFont(resourceCache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Regular.ttf"), 10);
+        _transformSystem = _entManager.System<SharedTransformSystem>();
     }
 
     protected override void Draw(in OverlayDrawArgs args)
@@ -30,7 +32,7 @@ protected override void Draw(in OverlayDrawArgs args)
             if (string.IsNullOrEmpty(comp.DebugText) || xform.MapID != args.MapId)
                 continue;
 
-            var worldPos = xform.WorldPosition;
+            var worldPos = _transformSystem.GetWorldPosition(xform);
 
             if (!args.WorldAABB.Contains(worldPos))
                 continue;
diff --git a/Content.Client/NPC/NPCSteeringSystem.cs b/Content.Client/NPC/NPCSteeringSystem.cs
index bb2145bce0c..eda3d74cf71 100644
--- a/Content.Client/NPC/NPCSteeringSystem.cs
+++ b/Content.Client/NPC/NPCSteeringSystem.cs
@@ -81,10 +81,12 @@ public sealed class NPCSteeringOverlay : Overlay
     public override OverlaySpace Space => OverlaySpace.WorldSpace;
 
     private readonly IEntityManager _entManager;
+    private readonly SharedTransformSystem _transformSystem;
 
     public NPCSteeringOverlay(IEntityManager entManager)
     {
         _entManager = entManager;
+        _transformSystem = _entManager.System<SharedTransformSystem>();
     }
 
     protected override void Draw(in OverlayDrawArgs args)
@@ -96,7 +98,7 @@ protected override void Draw(in OverlayDrawArgs args)
                 continue;
             }
 
-            var (worldPos, worldRot) = xform.GetWorldPositionRotation();
+            var (worldPos, worldRot) = _transformSystem.GetWorldPositionRotation(xform);
 
             if (!args.WorldAABB.Contains(worldPos))
                 continue;
diff --git a/Content.Client/NPC/PathfindingSystem.cs b/Content.Client/NPC/PathfindingSystem.cs
index d3ae5091528..0c72a8f99ff 100644
--- a/Content.Client/NPC/PathfindingSystem.cs
+++ b/Content.Client/NPC/PathfindingSystem.cs
@@ -203,7 +203,7 @@ private void DrawScreen(OverlayDrawArgs args, DrawingHandleScreen screenHandle)
                     if (found || !_system.Breadcrumbs.TryGetValue(netGrid, out var crumbs) || !xformQuery.TryGetComponent(grid, out var gridXform))
                         continue;
 
-                    var (_, _, worldMatrix, invWorldMatrix) = gridXform.GetWorldPositionRotationMatrixWithInv();
+                    var (_, _, worldMatrix, invWorldMatrix) = _transformSystem.GetWorldPositionRotationMatrixWithInv(gridXform);
                     var localAABB = invWorldMatrix.TransformBox(aabb.Enlarged(float.Epsilon - SharedPathfindingSystem.ChunkSize));
 
                     foreach (var chunk in crumbs)
@@ -287,7 +287,7 @@ private void DrawScreen(OverlayDrawArgs args, DrawingHandleScreen screenHandle)
                     return;
                 }
 
-                var invGridMatrix = gridXform.InvWorldMatrix;
+                var invGridMatrix = _transformSystem.GetInvWorldMatrix(gridXform);
                 DebugPathPoly? nearest = null;
 
                 foreach (var poly in tile)
@@ -359,7 +359,7 @@ private void DrawWorld(OverlayDrawArgs args, DrawingHandleWorld worldHandle)
                         continue;
                     }
 
-                    var (_, _, worldMatrix, invWorldMatrix) = gridXform.GetWorldPositionRotationMatrixWithInv();
+                    var (_, _, worldMatrix, invWorldMatrix) = _transformSystem.GetWorldPositionRotationMatrixWithInv(gridXform);
                     worldHandle.SetTransform(worldMatrix);
                     var localAABB = invWorldMatrix.TransformBox(aabb);
 
@@ -419,7 +419,7 @@ private void DrawWorld(OverlayDrawArgs args, DrawingHandleWorld worldHandle)
                         !xformQuery.TryGetComponent(grid, out var gridXform))
                         continue;
 
-                    var (_, _, worldMatrix, invWorldMatrix) = gridXform.GetWorldPositionRotationMatrixWithInv();
+                    var (_, _, worldMatrix, invWorldMatrix) = _transformSystem.GetWorldPositionRotationMatrixWithInv(gridXform);
                     worldHandle.SetTransform(worldMatrix);
                     var localAABB = invWorldMatrix.TransformBox(aabb);
 
@@ -458,7 +458,7 @@ private void DrawWorld(OverlayDrawArgs args, DrawingHandleWorld worldHandle)
                         !xformQuery.TryGetComponent(grid, out var gridXform))
                         continue;
 
-                    var (_, _, worldMatrix, invMatrix) = gridXform.GetWorldPositionRotationMatrixWithInv();
+                    var (_, _, worldMatrix, invMatrix) = _transformSystem.GetWorldPositionRotationMatrixWithInv(gridXform);
                     worldHandle.SetTransform(worldMatrix);
                     var localAABB = invMatrix.TransformBox(aabb);
 
@@ -483,7 +483,7 @@ private void DrawWorld(OverlayDrawArgs args, DrawingHandleWorld worldHandle)
                                     if (neighborPoly.NetEntity != poly.GraphUid)
                                     {
                                         color = Color.Green;
-                                        var neighborMap = _entManager.GetCoordinates(neighborPoly).ToMap(_entManager, _transformSystem);
+                                        var neighborMap = _transformSystem.ToMapCoordinates(_entManager.GetCoordinates(neighborPoly));
 
                                         if (neighborMap.MapId != args.MapId)
                                             continue;
@@ -517,7 +517,7 @@ private void DrawWorld(OverlayDrawArgs args, DrawingHandleWorld worldHandle)
                         !xformQuery.TryGetComponent(grid, out var gridXform))
                         continue;
 
-                    var (_, _, worldMatrix, invWorldMatrix) = gridXform.GetWorldPositionRotationMatrixWithInv();
+                    var (_, _, worldMatrix, invWorldMatrix) = _transformSystem.GetWorldPositionRotationMatrixWithInv(gridXform);
                     worldHandle.SetTransform(worldMatrix);
                     var localAABB = invWorldMatrix.TransformBox(args.WorldBounds);
 
@@ -544,7 +544,7 @@ private void DrawWorld(OverlayDrawArgs args, DrawingHandleWorld worldHandle)
                         if (!_entManager.TryGetComponent<TransformComponent>(_entManager.GetEntity(node.GraphUid), out var graphXform))
                             continue;
 
-                        worldHandle.SetTransform(graphXform.WorldMatrix);
+                        worldHandle.SetTransform(_transformSystem.GetWorldMatrix(graphXform));
                         worldHandle.DrawRect(node.Box, Color.Orange.WithAlpha(0.10f));
                     }
                 }
@@ -568,7 +568,7 @@ private void DrawWorld(OverlayDrawArgs args, DrawingHandleWorld worldHandle)
                                 continue;
 
                             matrix = graph;
-                            worldHandle.SetTransform(graphXform.WorldMatrix);
+                            worldHandle.SetTransform(_transformSystem.GetWorldMatrix(graphXform));
                         }
 
                         worldHandle.DrawRect(node.Box, new Color(0f, cost / highestGScore, 1f - (cost / highestGScore), 0.10f));
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs
index 80c98f143b9..f85220a9266 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Client.NetworkConfigurator.Systems;
 using Content.Shared.DeviceNetwork;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 
 namespace Content.Client.NetworkConfigurator;
@@ -35,14 +36,12 @@ protected override void Open()
         switch (UiKey)
         {
             case NetworkConfiguratorUiKey.List:
-                _listMenu = new NetworkConfiguratorListMenu(this);
-                _listMenu.OnClose += Close;
+                _listMenu = this.CreateWindow<NetworkConfiguratorListMenu>();
                 _listMenu.ClearButton.OnPressed += _ => OnClearButtonPressed();
-                _listMenu.OpenCenteredRight();
+                _listMenu.OnRemoveAddress += OnRemoveButtonPressed;
                 break;
             case NetworkConfiguratorUiKey.Configure:
-                _configurationMenu = new NetworkConfiguratorConfigurationMenu();
-                _configurationMenu.OnClose += Close;
+                _configurationMenu = this.CreateWindow<NetworkConfiguratorConfigurationMenu>();
                 _configurationMenu.Set.OnPressed += _ => OnConfigButtonPressed(NetworkConfiguratorButtonKey.Set);
                 _configurationMenu.Add.OnPressed += _ => OnConfigButtonPressed(NetworkConfiguratorButtonKey.Add);
                 //_configurationMenu.Edit.OnPressed += _ => OnConfigButtonPressed(NetworkConfiguratorButtonKey.Edit);
@@ -50,12 +49,24 @@ protected override void Open()
                 _configurationMenu.Copy.OnPressed += _ => OnConfigButtonPressed(NetworkConfiguratorButtonKey.Copy);
                 _configurationMenu.Show.OnPressed += OnShowPressed;
                 _configurationMenu.Show.Pressed = _netConfig.ConfiguredListIsTracked(Owner);
-                _configurationMenu.OpenCentered();
+                _configurationMenu.OnRemoveAddress += OnRemoveButtonPressed;
                 break;
             case NetworkConfiguratorUiKey.Link:
-                _linkMenu = new NetworkConfiguratorLinkMenu(this);
-                _linkMenu.OnClose += Close;
-                _linkMenu.OpenCentered();
+                _linkMenu = this.CreateWindow<NetworkConfiguratorLinkMenu>();
+                _linkMenu.OnLinkDefaults += args =>
+                {
+                    SendMessage(new NetworkConfiguratorLinksSaveMessage(args));
+                };
+
+                _linkMenu.OnToggleLink += (left, right) =>
+                {
+                    SendMessage(new NetworkConfiguratorToggleLinkMessage(left, right));
+                };
+
+                _linkMenu.OnClearLinks += () =>
+                {
+                    SendMessage(new NetworkConfiguratorClearLinksMessage());
+                };
                 break;
         }
     }
@@ -83,16 +94,6 @@ protected override void UpdateState(BoundUserInterfaceState state)
         }
     }
 
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing) return;
-
-        _linkMenu?.Dispose();
-        _listMenu?.Dispose();
-        _configurationMenu?.Dispose();
-    }
-
     private void OnClearButtonPressed()
     {
         SendMessage(new NetworkConfiguratorClearDevicesMessage());
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs
index 19d04cd3464..fcd2f759187 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs
@@ -9,17 +9,23 @@ namespace Content.Client.NetworkConfigurator;
 [GenerateTypedNameReferences]
 public sealed partial class NetworkConfiguratorConfigurationMenu : FancyWindow
 {
+    public event Action<string>? OnRemoveAddress;
+
     public NetworkConfiguratorConfigurationMenu()
     {
         RobustXamlLoader.Load(this);
 
         Clear.StyleClasses.Add(StyleBase.ButtonOpenLeft);
         Clear.StyleClasses.Add(StyleNano.StyleClassButtonColorRed);
+        DeviceList.OnRemoveAddress += args =>
+        {
+            OnRemoveAddress?.Invoke(args);
+        };
     }
 
     public void UpdateState(DeviceListUserInterfaceState state)
     {
-        DeviceList.UpdateState(null, state.DeviceList);
+        DeviceList.UpdateState(state.DeviceList, false);
 
         Count.Text = Loc.GetString("network-configurator-ui-count-label", ("count", state.DeviceList.Count));
     }
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorDeviceList.xaml.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorDeviceList.xaml.cs
index 8cfa97dc6c2..e75c60058cb 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorDeviceList.xaml.cs
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorDeviceList.xaml.cs
@@ -7,17 +7,19 @@ namespace Content.Client.NetworkConfigurator;
 [GenerateTypedNameReferences]
 public sealed partial class NetworkConfiguratorDeviceList : ScrollContainer
 {
-    public void UpdateState(NetworkConfiguratorBoundUserInterface? ui, HashSet<(string address, string name)> devices)
+    public event Action<string>? OnRemoveAddress;
+
+    public void UpdateState(HashSet<(string address, string name)> devices, bool ui)
     {
         DeviceList.RemoveAllChildren();
 
         foreach (var device in devices)
         {
-            DeviceList.AddChild(BuildDeviceListRow(ui, device));
+            DeviceList.AddChild(BuildDeviceListRow(device, ui));
         }
     }
 
-    private static BoxContainer BuildDeviceListRow(NetworkConfiguratorBoundUserInterface? ui, (string address, string name) savedDevice)
+    private BoxContainer BuildDeviceListRow((string address, string name) savedDevice, bool ui)
     {
         var row = new BoxContainer()
         {
@@ -48,10 +50,10 @@ private static BoxContainer BuildDeviceListRow(NetworkConfiguratorBoundUserInter
         row.AddChild(name);
         row.AddChild(address);
 
-        if (ui != null)
+        if (ui)
         {
             row.AddChild(removeButton);
-            removeButton.OnPressed += _ => ui.OnRemoveButtonPressed(savedDevice.address);
+            removeButton.OnPressed += _ => OnRemoveAddress?.Invoke(savedDevice.address);
         }
 
         return row;
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs
index c04b42f249b..8cdffd16af6 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs
@@ -18,20 +18,20 @@ public sealed partial class NetworkConfiguratorLinkMenu : FancyWindow
 
     private readonly LinksRender _links;
 
-
     private readonly List<SourcePortPrototype> _sources = new();
 
     private readonly List<SinkPortPrototype> _sinks = new();
 
-    private readonly NetworkConfiguratorBoundUserInterface _userInterface;
-
     private (ButtonPosition position, string id, int index)? _selectedButton;
 
     private List<(string left, string right)>? _defaults;
 
-    public NetworkConfiguratorLinkMenu(NetworkConfiguratorBoundUserInterface userInterface)
+    public event Action? OnClearLinks;
+    public event Action<string, string>? OnToggleLink;
+    public event Action<List<(string left, string right)>>? OnLinkDefaults;
+
+    public NetworkConfiguratorLinkMenu()
     {
-        _userInterface = userInterface;
         RobustXamlLoader.Load(this);
 
         var footerStyleBox = new StyleBoxFlat()
@@ -52,7 +52,7 @@ public NetworkConfiguratorLinkMenu(NetworkConfiguratorBoundUserInterface userInt
 
         ButtonOk.OnPressed += _ => Close();
         ButtonLinkDefault.OnPressed += _ => LinkDefaults();
-        ButtonClear.OnPressed += _ => _userInterface.SendMessage(new NetworkConfiguratorClearLinksMessage());
+        ButtonClear.OnPressed += _ => OnClearLinks?.Invoke();
     }
 
     public void UpdateState(DeviceLinkUserInterfaceState linkState)
@@ -98,7 +98,7 @@ private void LinkDefaults()
         if (_defaults == default)
             return;
 
-        _userInterface.SendMessage(new NetworkConfiguratorLinksSaveMessage(_defaults));
+        OnLinkDefaults?.Invoke(_defaults);
     }
 
     private Button CreateButton(ButtonPosition position, string name, string description, string id, int index)
@@ -138,7 +138,7 @@ private void OnButtonPressed(BaseButton.ButtonEventArgs args, ButtonPosition pos
         var left = _selectedButton.Value.position == ButtonPosition.Left ? _selectedButton.Value.id : id;
         var right = _selectedButton.Value.position == ButtonPosition.Left ? id : _selectedButton.Value.id;
 
-        _userInterface.SendMessage(new NetworkConfiguratorToggleLinkMessage(left, right));
+        OnToggleLink?.Invoke(left, right);
 
         args.Button.Pressed = false;
 
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkOverlay.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkOverlay.cs
index 4fcdada8684..19da5aa9594 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkOverlay.cs
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkOverlay.cs
@@ -12,6 +12,7 @@ public sealed class NetworkConfiguratorLinkOverlay : Overlay
     [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     private readonly DeviceListSystem _deviceListSystem;
+    private readonly SharedTransformSystem _transformSystem;
 
     public Dictionary<EntityUid, Color> Colors = new();
     public EntityUid? Action;
@@ -23,6 +24,7 @@ public NetworkConfiguratorLinkOverlay()
         IoCManager.InjectDependencies(this);
 
         _deviceListSystem = _entityManager.System<DeviceListSystem>();
+        _transformSystem = _entityManager.System<SharedTransformSystem>();
     }
 
     protected override void Draw(in OverlayDrawArgs args)
@@ -66,7 +68,7 @@ protected override void Draw(in OverlayDrawArgs args)
                     continue;
                 }
 
-                args.WorldHandle.DrawLine(sourceTransform.WorldPosition, linkTransform.WorldPosition, Colors[uid]);
+                args.WorldHandle.DrawLine(_transformSystem.GetWorldPosition(sourceTransform), _transformSystem.GetWorldPosition(linkTransform), Colors[uid]);
             }
         }
     }
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml.cs
index fb4aec1974b..6294facaeed 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml.cs
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml.cs
@@ -9,17 +9,20 @@ namespace Content.Client.NetworkConfigurator;
 [GenerateTypedNameReferences]
 public sealed partial class NetworkConfiguratorListMenu : FancyWindow
 {
-    private readonly NetworkConfiguratorBoundUserInterface _ui;
-    public NetworkConfiguratorListMenu(NetworkConfiguratorBoundUserInterface ui)
+    public event Action<string>? OnRemoveAddress;
+
+    public NetworkConfiguratorListMenu()
     {
         RobustXamlLoader.Load(this);
-
-        _ui = ui;
+        DeviceList.OnRemoveAddress += args =>
+        {
+            OnRemoveAddress?.Invoke(args);
+        };
     }
 
     public void UpdateState(NetworkConfiguratorUserInterfaceState state)
     {
         DeviceCountLabel.Text = Loc.GetString("network-configurator-ui-count-label", ("count", state.DeviceList.Count));
-        DeviceList.UpdateState(_ui, state.DeviceList);
+        DeviceList.UpdateState(state.DeviceList, true);
     }
 }
diff --git a/Content.Client/Ninja/Systems/ItemCreatorSystem.cs b/Content.Client/Ninja/Systems/ItemCreatorSystem.cs
new file mode 100644
index 00000000000..9ab62cc12db
--- /dev/null
+++ b/Content.Client/Ninja/Systems/ItemCreatorSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared.Ninja.Systems;
+
+namespace Content.Client.Ninja.Systems;
+
+public sealed class ItemCreatorSystem : SharedItemCreatorSystem;
diff --git a/Content.Client/Ninja/Systems/NinjaGlovesSystem.cs b/Content.Client/Ninja/Systems/NinjaGlovesSystem.cs
index 7758c3d7e2b..5b07b1588fd 100644
--- a/Content.Client/Ninja/Systems/NinjaGlovesSystem.cs
+++ b/Content.Client/Ninja/Systems/NinjaGlovesSystem.cs
@@ -2,9 +2,4 @@
 
 namespace Content.Client.Ninja.Systems;
 
-/// <summary>
-/// Does nothing special, only exists to provide a client implementation.
-/// </summary>
-public sealed class NinjaGlovesSystem : SharedNinjaGlovesSystem
-{
-}
+public sealed class NinjaGlovesSystem : SharedNinjaGlovesSystem;
diff --git a/Content.Client/Ninja/Systems/NinjaSuitSystem.cs b/Content.Client/Ninja/Systems/NinjaSuitSystem.cs
index fde1801b37d..852ea8af46e 100644
--- a/Content.Client/Ninja/Systems/NinjaSuitSystem.cs
+++ b/Content.Client/Ninja/Systems/NinjaSuitSystem.cs
@@ -1,24 +1,5 @@
-using Content.Shared.Clothing.EntitySystems;
-using Content.Shared.Ninja.Components;
 using Content.Shared.Ninja.Systems;
 
 namespace Content.Client.Ninja.Systems;
 
-/// <summary>
-/// Disables cloak prediction since client has no knowledge of battery power.
-/// Cloak will still be enabled after server tells it.
-/// </summary>
-public sealed class NinjaSuitSystem : SharedNinjaSuitSystem
-{
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<NinjaSuitComponent, AttemptStealthEvent>(OnAttemptStealth);
-    }
-
-    private void OnAttemptStealth(EntityUid uid, NinjaSuitComponent comp, AttemptStealthEvent args)
-    {
-        args.Cancel();
-    }
-}
+public sealed class NinjaSuitSystem : SharedNinjaSuitSystem;
diff --git a/Content.Client/Ninja/Systems/NinjaSystem.cs b/Content.Client/Ninja/Systems/NinjaSystem.cs
index aa2fa2047f1..958dc6a5d9a 100644
--- a/Content.Client/Ninja/Systems/NinjaSystem.cs
+++ b/Content.Client/Ninja/Systems/NinjaSystem.cs
@@ -2,11 +2,4 @@
 
 namespace Content.Client.Ninja.Systems;
 
-/// <summary>
-/// Currently does nothing special clientside.
-/// All functionality is in shared and server.
-/// Only exists to prevent crashing.
-/// </summary>
-public sealed class SpaceNinjaSystem : SharedSpaceNinjaSystem
-{
-}
+public sealed class SpaceNinjaSystem : SharedSpaceNinjaSystem;
diff --git a/Content.Client/Ninja/Systems/SpiderChargeSystem.cs b/Content.Client/Ninja/Systems/SpiderChargeSystem.cs
new file mode 100644
index 00000000000..b107fd3867d
--- /dev/null
+++ b/Content.Client/Ninja/Systems/SpiderChargeSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared.Ninja.Systems;
+
+namespace Content.Client.Ninja.Systems;
+
+public sealed class SpiderChargeSystem : SharedSpiderChargeSystem;
diff --git a/Content.Client/NodeContainer/NodeVisualizationOverlay.cs b/Content.Client/NodeContainer/NodeVisualizationOverlay.cs
index 4e8a4a10ca6..b0bdf8ed87d 100644
--- a/Content.Client/NodeContainer/NodeVisualizationOverlay.cs
+++ b/Content.Client/NodeContainer/NodeVisualizationOverlay.cs
@@ -20,6 +20,7 @@ public sealed class NodeVisualizationOverlay : Overlay
         private readonly IMapManager _mapManager;
         private readonly IInputManager _inputManager;
         private readonly IEntityManager _entityManager;
+        private readonly SharedTransformSystem _transformSystem;
 
         private readonly Dictionary<(int, int), NodeRenderData> _nodeIndex = new();
         private readonly Dictionary<EntityUid, Dictionary<Vector2i, List<(GroupData, NodeDatum)>>> _gridIndex = new ();
@@ -46,6 +47,7 @@ public NodeVisualizationOverlay(
             _mapManager = mapManager;
             _inputManager = inputManager;
             _entityManager = entityManager;
+            _transformSystem = _entityManager.System<SharedTransformSystem>();
 
             _font = cache.GetFont("/Fonts/NotoSans/NotoSans-Regular.ttf", 12);
         }
@@ -146,7 +148,7 @@ private void DrawWorld(in OverlayDrawArgs overlayDrawArgs)
             foreach (var (gridId, gridDict) in _gridIndex)
             {
                 var grid = _entityManager.GetComponent<MapGridComponent>(gridId);
-                var (_, _, worldMatrix, invMatrix) = _entityManager.GetComponent<TransformComponent>(gridId).GetWorldPositionRotationMatrixWithInv();
+                var (_, _, worldMatrix, invMatrix) = _transformSystem.GetWorldPositionRotationMatrixWithInv(gridId);
 
                 var lCursorBox = invMatrix.TransformBox(cursorBox);
                 foreach (var (pos, list) in gridDict)
diff --git a/Content.Client/Nuke/NukeBoundUserInterface.cs b/Content.Client/Nuke/NukeBoundUserInterface.cs
index 59fbc5b319b..2e150423734 100644
--- a/Content.Client/Nuke/NukeBoundUserInterface.cs
+++ b/Content.Client/Nuke/NukeBoundUserInterface.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Nuke;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Nuke
 {
@@ -11,15 +12,13 @@ public sealed class NukeBoundUserInterface : BoundUserInterface
         [ViewVariables]
         private NukeMenu? _menu;
 
-        public NukeBoundUserInterface([NotNull] EntityUid owner, [NotNull] Enum uiKey) : base(owner, uiKey)
+        public NukeBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
         {
         }
 
         protected override void Open()
         {
-            _menu = new NukeMenu();
-            _menu.OpenCentered();
-            _menu.OnClose += Close;
+            _menu = this.CreateWindow<NukeMenu>();
 
             _menu.OnKeypadButtonPressed += i =>
             {
@@ -62,15 +61,5 @@ protected override void UpdateState(BoundUserInterfaceState state)
                     break;
             }
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing)
-                return;
-
-            _menu?.Close();
-            _menu?.Dispose();
-        }
     }
 }
diff --git a/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs b/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs
index ec055b3240c..ad4f1a75d47 100644
--- a/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs
+++ b/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Chat;
 using Content.Shared.NukeOps;
 using JetBrains.Annotations;
+using Robust.Client.UserInterface;
 using Robust.Shared.Configuration;
 using Robust.Shared.Timing;
 
@@ -11,8 +12,6 @@ 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;
@@ -23,13 +22,7 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new WarDeclaratorWindow(_gameTiming, _localizationManager);
-        if (State != null)
-            UpdateState(State);
-
-        _window.OpenCentered();
-
-        _window.OnClose += Close;
+        _window = this.CreateWindow<WarDeclaratorWindow>();
         _window.OnActivated += OnWarDeclaratorActivated;
     }
 
@@ -42,13 +35,6 @@ protected override void UpdateState(BoundUserInterfaceState state)
         _window?.UpdateState(cast);
     }
 
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (disposing)
-            _window?.Dispose();
-    }
-
     private void OnWarDeclaratorActivated(string message)
     {
         var maxLength = _cfg.GetCVar(CCVars.ChatMaxAnnouncementLength);
diff --git a/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs b/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs
index b4a3f1c7fa5..e191e821c22 100644
--- a/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs
+++ b/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs
@@ -11,7 +11,8 @@ namespace Content.Client.NukeOps;
 [GenerateTypedNameReferences]
 public sealed partial class WarDeclaratorWindow : FancyWindow
 {
-    private readonly IGameTiming _gameTiming;
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly ILocalizationManager _localizationManager = default!;
 
     public event Action<string>? OnActivated;
 
@@ -19,15 +20,14 @@ public sealed partial class WarDeclaratorWindow : FancyWindow
     private TimeSpan _shuttleDisabledTime;
     private WarConditionStatus _status;
 
-    public WarDeclaratorWindow(IGameTiming gameTiming, ILocalizationManager localizationManager)
+    public WarDeclaratorWindow()
     {
         RobustXamlLoader.Load(this);
-
-        _gameTiming = gameTiming;
+        IoCManager.InjectDependencies(this);
 
         WarButton.OnPressed += (_) => OnActivated?.Invoke(Rope.Collapse(MessageEdit.TextRope));
 
-        MessageEdit.Placeholder = new Rope.Leaf(localizationManager.GetString("war-declarator-message-placeholder"));
+        MessageEdit.Placeholder = new Rope.Leaf(_localizationManager.GetString("war-declarator-message-placeholder"));
     }
 
     protected override void FrameUpdate(FrameEventArgs args)
diff --git a/Content.Client/Outline/InteractionOutlineSystem.cs b/Content.Client/Outline/InteractionOutlineSystem.cs
index 3dbbafbcaa3..40cb5dfd4a6 100644
--- a/Content.Client/Outline/InteractionOutlineSystem.cs
+++ b/Content.Client/Outline/InteractionOutlineSystem.cs
@@ -110,11 +110,15 @@ public override void FrameUpdate(float frameTime)
             && _inputManager.MouseScreenPosition.IsValid)
         {
             var mousePosWorld = vp.PixelToMap(_inputManager.MouseScreenPosition.Position);
-            entityToClick = screen.GetClickedEntity(mousePosWorld);
 
             if (vp is ScalingViewport svp)
             {
                 renderScale = svp.CurrentRenderScale;
+                entityToClick = screen.GetClickedEntity(mousePosWorld, svp.Eye);
+            }
+            else
+            {
+                entityToClick = screen.GetClickedEntity(mousePosWorld);
             }
         }
         else if (_uiManager.CurrentlyHovered is EntityMenuElement element)
diff --git a/Content.Client/Outline/TargetOutlineSystem.cs b/Content.Client/Outline/TargetOutlineSystem.cs
index df57578b1f5..c69987fe77c 100644
--- a/Content.Client/Outline/TargetOutlineSystem.cs
+++ b/Content.Client/Outline/TargetOutlineSystem.cs
@@ -23,6 +23,7 @@ public sealed class TargetOutlineSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+    [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
 
     private bool _enabled = false;
 
@@ -165,8 +166,8 @@ private void HighlightTargets()
                 valid = _interactionSystem.InRangeUnobstructed(player, entity, Range);
             else if (Range >= 0)
             {
-                var origin = Transform(player).WorldPosition;
-                var target = Transform(entity).WorldPosition;
+                var origin = _transformSystem.GetWorldPosition(player);
+                var target = _transformSystem.GetWorldPosition(entity);
                 valid = (origin - target).LengthSquared() <= Range;
             }
 
diff --git a/Content.Client/Overlays/EntityHealthBarOverlay.cs b/Content.Client/Overlays/EntityHealthBarOverlay.cs
index 4f928437395..193635bda7b 100644
--- a/Content.Client/Overlays/EntityHealthBarOverlay.cs
+++ b/Content.Client/Overlays/EntityHealthBarOverlay.cs
@@ -33,7 +33,7 @@ public sealed class EntityHealthBarOverlay : Overlay
 
     public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowFOV;
     public HashSet<string> DamageContainers = new();
-    public ProtoId<StatusIconPrototype>? StatusIcon;
+    public ProtoId<HealthIconPrototype>? StatusIcon;
 
     public EntityHealthBarOverlay(IEntityManager entManager, IPrototypeManager prototype)
     {
diff --git a/Content.Client/Overlays/ShowHealthIconsSystem.cs b/Content.Client/Overlays/ShowHealthIconsSystem.cs
index d8af91482b3..8c22c78f17c 100644
--- a/Content.Client/Overlays/ShowHealthIconsSystem.cs
+++ b/Content.Client/Overlays/ShowHealthIconsSystem.cs
@@ -53,17 +53,17 @@ private void OnGetStatusIconsEvent(Entity<DamageableComponent> entity, ref GetSt
         args.StatusIcons.AddRange(healthIcons);
     }
 
-    private IReadOnlyList<StatusIconPrototype> DecideHealthIcons(Entity<DamageableComponent> entity)
+    private IReadOnlyList<HealthIconPrototype> DecideHealthIcons(Entity<DamageableComponent> entity)
     {
         var damageableComponent = entity.Comp;
 
         if (damageableComponent.DamageContainerID == null ||
             !DamageContainers.Contains(damageableComponent.DamageContainerID))
         {
-            return Array.Empty<StatusIconPrototype>();
+            return Array.Empty<HealthIconPrototype>();
         }
 
-        var result = new List<StatusIconPrototype>();
+        var result = new List<HealthIconPrototype>();
 
         // Here you could check health status, diseases, mind status, etc. and pick a good icon, or multiple depending on whatever.
         if (damageableComponent?.DamageContainerID == "Biological")
diff --git a/Content.Client/Overlays/ShowJobIconsSystem.cs b/Content.Client/Overlays/ShowJobIconsSystem.cs
index a6d4f70af6b..e5ba9b813f0 100644
--- a/Content.Client/Overlays/ShowJobIconsSystem.cs
+++ b/Content.Client/Overlays/ShowJobIconsSystem.cs
@@ -13,7 +13,7 @@ public sealed class ShowJobIconsSystem : EquipmentHudSystem<ShowJobIconsComponen
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly AccessReaderSystem _accessReader = default!;
 
-    [ValidatePrototypeId<StatusIconPrototype>]
+    [ValidatePrototypeId<JobIconPrototype>]
     private const string JobIconForNoId = "JobIconNoId";
 
     public override void Initialize()
@@ -52,7 +52,7 @@ private void OnGetStatusIconsEvent(EntityUid uid, StatusIconComponent _, ref Get
             }
         }
 
-        if (_prototype.TryIndex<StatusIconPrototype>(iconId, out var iconPrototype))
+        if (_prototype.TryIndex<JobIconPrototype>(iconId, out var iconPrototype))
             ev.StatusIcons.Add(iconPrototype);
         else
             Log.Error($"Invalid job icon prototype: {iconPrototype}");
diff --git a/Content.Client/Overlays/ShowSyndicateIconsSystem.cs b/Content.Client/Overlays/ShowSyndicateIconsSystem.cs
index 782178a29db..9d4599b8233 100644
--- a/Content.Client/Overlays/ShowSyndicateIconsSystem.cs
+++ b/Content.Client/Overlays/ShowSyndicateIconsSystem.cs
@@ -22,7 +22,7 @@ private void OnGetStatusIconsEvent(EntityUid uid, NukeOperativeComponent compone
         if (!IsActive)
             return;
 
-        if (_prototype.TryIndex<StatusIconPrototype>(component.SyndStatusIcon, out var iconPrototype))
+        if (_prototype.TryIndex<FactionIconPrototype>(component.SyndStatusIcon, out var iconPrototype))
             ev.StatusIcons.Add(iconPrototype);
     }
 }
diff --git a/Content.Client/PDA/PdaBoundUserInterface.cs b/Content.Client/PDA/PdaBoundUserInterface.cs
index f8f4c67076c..37ce9c4280f 100644
--- a/Content.Client/PDA/PdaBoundUserInterface.cs
+++ b/Content.Client/PDA/PdaBoundUserInterface.cs
@@ -24,14 +24,13 @@ protected override void Open()
 
             if (_menu == null)
                 CreateMenu();
-
-            _menu?.OpenCenteredLeft();
         }
 
         private void CreateMenu()
         {
-            _menu = new PdaMenu();
-            _menu.OnClose += Close;
+            _menu = this.CreateWindow<PdaMenu>();
+            _menu.OpenCenteredLeft();
+
             _menu.FlashLightToggleButton.OnToggled += _ =>
             {
                 SendMessage(new PdaToggleFlashlightMessage());
@@ -96,7 +95,6 @@ protected override void UpdateState(BoundUserInterfaceState state)
             _menu?.UpdateState(updateState);
         }
 
-
         protected override void AttachCartridgeUI(Control cartridgeUIFragment, string? title)
         {
             _menu?.ProgramView.AddChild(cartridgeUIFragment);
@@ -118,15 +116,6 @@ protected override void UpdateAvailablePrograms(List<(EntityUid, CartridgeCompon
             _menu?.UpdateAvailablePrograms(programs);
         }
 
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing)
-                return;
-
-            _menu?.Dispose();
-        }
-
         private PdaBorderColorComponent? GetBorderColorComponent()
         {
             return EntMan.GetComponentOrNull<PdaBorderColorComponent>(Owner);
diff --git a/Content.Client/PDA/Ringer/RingerBoundUserInterface.cs b/Content.Client/PDA/Ringer/RingerBoundUserInterface.cs
index a0688523f1e..170a296ac2e 100644
--- a/Content.Client/PDA/Ringer/RingerBoundUserInterface.cs
+++ b/Content.Client/PDA/Ringer/RingerBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.PDA;
 using Content.Shared.PDA.Ringer;
 using JetBrains.Annotations;
+using Robust.Client.UserInterface;
 using Robust.Shared.Timing;
 
 namespace Content.Client.PDA.Ringer
@@ -18,9 +19,8 @@ public RingerBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey
         protected override void Open()
         {
             base.Open();
-            _menu = new RingtoneMenu();
+            _menu = this.CreateWindow<RingtoneMenu>();
             _menu.OpenToLeft();
-            _menu.OnClose += Close;
 
             _menu.TestRingerButton.OnPressed += _ =>
             {
diff --git a/Content.Client/Paper/EnvelopeSystem.cs b/Content.Client/Paper/EnvelopeSystem.cs
new file mode 100644
index 00000000000..f405ed15188
--- /dev/null
+++ b/Content.Client/Paper/EnvelopeSystem.cs
@@ -0,0 +1,35 @@
+using Content.Shared.Paper;
+using Robust.Client.GameObjects;
+
+namespace Content.Client.Paper;
+
+public sealed class EnvelopeSystem : VisualizerSystem<EnvelopeComponent>
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<EnvelopeComponent, AfterAutoHandleStateEvent>(OnAfterAutoHandleState);
+    }
+
+    private void OnAfterAutoHandleState(Entity<EnvelopeComponent> ent, ref AfterAutoHandleStateEvent args)
+    {
+        UpdateAppearance(ent);
+    }
+
+    private void UpdateAppearance(Entity<EnvelopeComponent> ent, SpriteComponent? sprite = null)
+    {
+        if (!Resolve(ent.Owner, ref sprite))
+            return;
+
+        sprite.LayerSetVisible(EnvelopeVisualLayers.Open, ent.Comp.State == EnvelopeComponent.EnvelopeState.Open);
+        sprite.LayerSetVisible(EnvelopeVisualLayers.Sealed, ent.Comp.State == EnvelopeComponent.EnvelopeState.Sealed);
+        sprite.LayerSetVisible(EnvelopeVisualLayers.Torn, ent.Comp.State == EnvelopeComponent.EnvelopeState.Torn);
+    }
+
+    public enum EnvelopeVisualLayers : byte
+    {
+        Open,
+        Sealed,
+        Torn
+    }
+}
diff --git a/Content.Client/Paper/PaperComponent.cs b/Content.Client/Paper/PaperComponent.cs
deleted file mode 100644
index 1dc827bf7e6..00000000000
--- a/Content.Client/Paper/PaperComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Content.Shared.Paper;
-
-namespace Content.Client.Paper;
-
-[RegisterComponent]
-public sealed partial class PaperComponent : SharedPaperComponent;
diff --git a/Content.Client/Paper/UI/PaperBoundUserInterface.cs b/Content.Client/Paper/UI/PaperBoundUserInterface.cs
index 4b0ac868f01..63645bc01e9 100644
--- a/Content.Client/Paper/UI/PaperBoundUserInterface.cs
+++ b/Content.Client/Paper/UI/PaperBoundUserInterface.cs
@@ -1,7 +1,8 @@
 using JetBrains.Annotations;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Utility;
-using static Content.Shared.Paper.SharedPaperComponent;
+using static Content.Shared.Paper.PaperComponent;
 
 namespace Content.Client.Paper.UI;
 
@@ -19,16 +20,13 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new PaperWindow();
-        _window.OnClose += Close;
-        _window.OnSaved += Input_OnTextEntered;
+        _window = this.CreateWindow<PaperWindow>();
+        _window.OnSaved += InputOnTextEntered;
 
         if (EntMan.TryGetComponent<PaperVisualsComponent>(Owner, out var visuals))
         {
             _window.InitVisuals(Owner, visuals);
         }
-
-        _window.OpenCentered();
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -37,7 +35,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
         _window?.Populate((PaperBoundUserInterfaceState) state);
     }
 
-    private void Input_OnTextEntered(string text)
+    private void InputOnTextEntered(string text)
     {
         SendMessage(new PaperInputTextMessage(text));
 
@@ -47,11 +45,4 @@ private void Input_OnTextEntered(string text)
             _window.Input.CursorPosition = new TextEdit.CursorPos(0, TextEdit.LineBreakBias.Top);
         }
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing) return;
-        _window?.Dispose();
-    }
 }
diff --git a/Content.Client/Paper/UI/PaperSystem.cs b/Content.Client/Paper/UI/PaperVisualizerSystem.cs
similarity index 82%
rename from Content.Client/Paper/UI/PaperSystem.cs
rename to Content.Client/Paper/UI/PaperVisualizerSystem.cs
index f75d04a26bd..a0d05736adb 100644
--- a/Content.Client/Paper/UI/PaperSystem.cs
+++ b/Content.Client/Paper/UI/PaperVisualizerSystem.cs
@@ -1,10 +1,10 @@
 using Robust.Client.GameObjects;
 
-using static Content.Shared.Paper.SharedPaperComponent;
+using static Content.Shared.Paper.PaperComponent;
 
-namespace Content.Client.Paper;
+namespace Content.Client.Paper.UI;
 
-public sealed class PaperSystem : VisualizerSystem<PaperVisualsComponent>
+public sealed class PaperVisualizerSystem : VisualizerSystem<PaperVisualsComponent>
 {
     protected override void OnAppearanceChange(EntityUid uid, PaperVisualsComponent component, ref AppearanceChangeEvent args)
     {
diff --git a/Content.Client/Paper/UI/PaperVisualsComponent.cs b/Content.Client/Paper/UI/PaperVisualsComponent.cs
index 95040e77e65..f0dee3cf907 100644
--- a/Content.Client/Paper/UI/PaperVisualsComponent.cs
+++ b/Content.Client/Paper/UI/PaperVisualsComponent.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
 
-namespace Content.Client.Paper;
+namespace Content.Client.Paper.UI;
 
 [RegisterComponent]
 public sealed partial class PaperVisualsComponent : Component
diff --git a/Content.Client/Paper/UI/PaperWindow.xaml.cs b/Content.Client/Paper/UI/PaperWindow.xaml.cs
index 7a5fd652643..81b831068c3 100644
--- a/Content.Client/Paper/UI/PaperWindow.xaml.cs
+++ b/Content.Client/Paper/UI/PaperWindow.xaml.cs
@@ -17,6 +17,7 @@ namespace Content.Client.Paper.UI
     public sealed partial class PaperWindow : BaseWindow
     {
         [Dependency] private readonly IInputManager _inputManager = default!;
+        [Dependency] private readonly IResourceCache _resCache = default!;
 
         private static Color DefaultTextColor = new(25, 25, 25);
 
@@ -85,11 +86,10 @@ public void InitVisuals(EntityUid entity, PaperVisualsComponent visuals)
             // Randomize the placement of any stamps based on the entity UID
             // so that there's some variety in different papers.
             StampDisplay.PlacementSeed = (int)entity;
-            var resCache = IoCManager.Resolve<IResourceCache>();
 
             // Initialize the background:
             PaperBackground.ModulateSelfOverride = visuals.BackgroundModulate;
-            var backgroundImage = visuals.BackgroundImagePath != null? resCache.GetResource<TextureResource>(visuals.BackgroundImagePath) : null;
+            var backgroundImage = visuals.BackgroundImagePath != null? _resCache.GetResource<TextureResource>(visuals.BackgroundImagePath) : null;
             if (backgroundImage != null)
             {
                 var backgroundImageMode = visuals.BackgroundImageTile ? StyleBoxTexture.StretchMode.Tile : StyleBoxTexture.StretchMode.Stretch;
@@ -127,7 +127,7 @@ public void InitVisuals(EntityUid entity, PaperVisualsComponent visuals)
             PaperContent.ModulateSelfOverride = visuals.ContentImageModulate;
             WrittenTextLabel.ModulateSelfOverride = visuals.FontAccentColor;
 
-            var contentImage = visuals.ContentImagePath != null ? resCache.GetResource<TextureResource>(visuals.ContentImagePath) : null;
+            var contentImage = visuals.ContentImagePath != null ? _resCache.GetResource<TextureResource>(visuals.ContentImagePath) : null;
             if (contentImage != null)
             {
                 // Setup the paper content texture, but keep a reference to it, as we can't set
@@ -215,9 +215,9 @@ protected override void Draw(DrawingHandleScreen handle)
         ///     Initialize the paper contents, i.e. the text typed by the
         ///     user and any stamps that have peen put on the page.
         /// </summary>
-        public void Populate(SharedPaperComponent.PaperBoundUserInterfaceState state)
+        public void Populate(PaperComponent.PaperBoundUserInterfaceState state)
         {
-            bool isEditing = state.Mode == SharedPaperComponent.PaperAction.Write;
+            bool isEditing = state.Mode == PaperComponent.PaperAction.Write;
             bool wasEditing = InputContainer.Visible;
             InputContainer.Visible = isEditing;
             EditButtons.Visible = isEditing;
diff --git a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs
index cde5ba9ef79..93306f2fd1f 100644
--- a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs
+++ b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs
@@ -1,5 +1,5 @@
 using Content.Shared.Singularity.Components;
-using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.ParticleAccelerator.UI
 {
@@ -16,9 +16,12 @@ protected override void Open()
         {
             base.Open();
 
-            _menu = new ParticleAcceleratorControlMenu(this);
-            _menu.OnClose += Close;
-            _menu.OpenCentered();
+            _menu = this.CreateWindow<ParticleAcceleratorControlMenu>();
+            _menu.SetEntity(Owner);
+
+            _menu.OnOverallState += SendEnableMessage;
+            _menu.OnPowerState += SendPowerStateMessage;
+            _menu.OnScan += SendScanPartsMessage;
         }
 
         public void SendEnableMessage(bool enable)
@@ -40,13 +43,5 @@ protected override void UpdateState(BoundUserInterfaceState state)
         {
             _menu?.DataUpdate((ParticleAcceleratorUIState) state);
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            _menu?.Dispose();
-            _menu = null;
-        }
     }
 }
diff --git a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs
deleted file mode 100644
index c69e0271372..00000000000
--- a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs
+++ /dev/null
@@ -1,521 +0,0 @@
-using System.Numerics;
-using Content.Client.Resources;
-using Content.Client.Stylesheets;
-using Content.Client.UserInterface.Controls;
-using Content.Shared.Singularity.Components;
-using Robust.Client.Animations;
-using Robust.Client.Graphics;
-using Robust.Client.ResourceManagement;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.Noise;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
-using static Robust.Client.UserInterface.Controls.BoxContainer;
-
-namespace Content.Client.ParticleAccelerator.UI
-{
-    public sealed class ParticleAcceleratorControlMenu : BaseWindow
-    {
-        private readonly ShaderInstance _greyScaleShader;
-
-        private readonly ParticleAcceleratorBoundUserInterface _owner;
-
-        private readonly Label _drawLabel;
-        private readonly FastNoiseLite _drawNoiseGenerator;
-        private readonly Button _onButton;
-        private readonly Button _offButton;
-        private readonly Button _scanButton;
-        private readonly Label _statusLabel;
-        private readonly SpinBox _stateSpinBox;
-
-        private readonly BoxContainer _alarmControl;
-        private readonly Animation _alarmControlAnimation;
-
-        private readonly PASegmentControl _endCapTexture;
-        private readonly PASegmentControl _fuelChamberTexture;
-        private readonly PASegmentControl _controlBoxTexture;
-        private readonly PASegmentControl _powerBoxTexture;
-        private readonly PASegmentControl _emitterForeTexture;
-        private readonly PASegmentControl _emitterPortTexture;
-        private readonly PASegmentControl _emitterStarboardTexture;
-
-        private float _time;
-        private int _lastDraw;
-        private int _lastReceive;
-
-        private bool _blockSpinBox;
-        private bool _assembled;
-        private bool _shouldContinueAnimating;
-        private int _maxStrength = 3;
-
-        public ParticleAcceleratorControlMenu(ParticleAcceleratorBoundUserInterface owner)
-        {
-            SetSize = new Vector2(400, 320);
-            _greyScaleShader = IoCManager.Resolve<IPrototypeManager>().Index<ShaderPrototype>("Greyscale").Instance();
-
-            _owner = owner;
-            _drawNoiseGenerator = new();
-            _drawNoiseGenerator.SetFractalType(FastNoiseLite.FractalType.FBm);
-            _drawNoiseGenerator.SetFrequency(0.5f);
-
-            var resourceCache = IoCManager.Resolve<IResourceCache>();
-            var font = resourceCache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 13);
-            var panelTex = resourceCache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png");
-
-            MouseFilter = MouseFilterMode.Stop;
-
-            _alarmControlAnimation = new Animation
-            {
-                Length = TimeSpan.FromSeconds(1),
-                AnimationTracks =
-                {
-                    new AnimationTrackControlProperty
-                    {
-                        Property = nameof(Control.Visible),
-                        KeyFrames =
-                        {
-                            new AnimationTrackProperty.KeyFrame(true, 0),
-                            new AnimationTrackProperty.KeyFrame(false, 0.75f),
-                        }
-                    }
-                }
-            };
-
-            var back = new StyleBoxTexture
-            {
-                Texture = panelTex,
-                Modulate = Color.FromHex("#25252A"),
-            };
-            back.SetPatchMargin(StyleBox.Margin.All, 10);
-
-            var back2 = new StyleBoxTexture(back)
-            {
-                Modulate = Color.FromHex("#202023")
-            };
-
-            AddChild(new PanelContainer
-            {
-                PanelOverride = back,
-                MouseFilter = MouseFilterMode.Pass
-            });
-
-            _stateSpinBox = new SpinBox { Value = 0, IsValid = StrengthSpinBoxValid };
-            _stateSpinBox.InitDefaultButtons();
-            _stateSpinBox.ValueChanged += PowerStateChanged;
-            _stateSpinBox.LineEditDisabled = true;
-
-            _offButton = new Button
-            {
-                ToggleMode = false,
-                Text = Loc.GetString("particle-accelerator-control-menu-off-button"),
-                StyleClasses = { StyleBase.ButtonOpenRight },
-            };
-            _offButton.OnPressed += args => owner.SendEnableMessage(false);
-
-            _onButton = new Button
-            {
-                ToggleMode = false,
-                Text = Loc.GetString("particle-accelerator-control-menu-on-button"),
-                StyleClasses = { StyleBase.ButtonOpenLeft },
-            };
-            _onButton.OnPressed += args => owner.SendEnableMessage(true);
-
-            var closeButton = new TextureButton
-            {
-                StyleClasses = { "windowCloseButton" },
-                HorizontalAlignment = HAlignment.Right,
-                Margin = new Thickness(0, 0, 8, 0)
-            };
-            closeButton.OnPressed += args => Close();
-
-            var serviceManual = new Label
-            {
-                HorizontalAlignment = HAlignment.Center,
-                StyleClasses = { StyleBase.StyleClassLabelSubText },
-                Text = Loc.GetString("particle-accelerator-control-menu-service-manual-reference")
-            };
-            _drawLabel = new Label();
-            var imgSize = new Vector2(32, 32);
-            AddChild(new BoxContainer
-            {
-                Orientation = LayoutOrientation.Vertical,
-                Children =
-                {
-                    new Control
-                    {
-                        Margin = new Thickness(2, 2, 0, 0),
-                        Children =
-                        {
-                            new Label
-                            {
-                                Text = Loc.GetString("particle-accelerator-control-menu-device-version-label"),
-                                FontOverride = font,
-                                FontColorOverride = StyleNano.NanoGold,
-                            },
-                            closeButton
-                        }
-                    },
-                    new PanelContainer
-                    {
-                        PanelOverride = new StyleBoxFlat {BackgroundColor = StyleNano.NanoGold},
-                        MinSize = new Vector2(0, 2),
-                    },
-                    new Control
-                    {
-                        MinSize = new Vector2(0, 4)
-                    },
-
-                    new BoxContainer
-                    {
-                        Orientation = LayoutOrientation.Horizontal,
-                        VerticalExpand = true,
-                        Children =
-                        {
-                            new BoxContainer
-                            {
-                                Orientation = LayoutOrientation.Vertical,
-                                Margin = new Thickness(4, 0, 0, 0),
-                                HorizontalExpand = true,
-                                Children =
-                                {
-                                    new BoxContainer
-                                    {
-                                        Orientation = LayoutOrientation.Horizontal,
-                                        Children =
-                                        {
-                                            new Label
-                                            {
-                                                Text = Loc.GetString("particle-accelerator-control-menu-power-label") + " ",
-                                                HorizontalExpand = true,
-                                                HorizontalAlignment = HAlignment.Left,
-                                            },
-                                            _offButton,
-                                            _onButton
-                                        }
-                                    },
-                                    new BoxContainer
-                                    {
-                                        Orientation = LayoutOrientation.Horizontal,
-                                        Children =
-                                        {
-                                            new Label
-                                            {
-                                                Text = Loc.GetString("particle-accelerator-control-menu-strength-label") + " ",
-                                                HorizontalExpand = true,
-                                                HorizontalAlignment = HAlignment.Left,
-                                            },
-                                            _stateSpinBox
-                                        }
-                                    },
-                                    new Control
-                                    {
-                                        MinSize = new Vector2(0, 10),
-                                    },
-                                    _drawLabel,
-                                    new Control
-                                    {
-                                        VerticalExpand = true,
-                                    },
-                                    (_alarmControl = new BoxContainer
-                                    {
-                                        Orientation = LayoutOrientation.Vertical,
-                                        Children =
-                                        {
-                                            new Label
-                                            {
-                                                Text = Loc.GetString("particle-accelerator-control-menu-alarm-control"),
-                                                FontColorOverride = Color.Red,
-                                                Align = Label.AlignMode.Center
-                                            },
-                                            serviceManual
-                                        },
-                                        Visible = false,
-                                    }),
-                                }
-                            },
-                            new BoxContainer
-                            {
-                                Orientation = LayoutOrientation.Vertical,
-                                MinSize = new Vector2(186, 0),
-                                Children =
-                                {
-                                    (_statusLabel = new Label
-                                    {
-                                        HorizontalAlignment = HAlignment.Center
-                                    }),
-                                    new Control
-                                    {
-                                        MinSize = new Vector2(0, 20)
-                                    },
-                                    new PanelContainer
-                                    {
-                                        HorizontalAlignment = HAlignment.Center,
-                                        PanelOverride = back2,
-                                        Children =
-                                        {
-                                            new GridContainer
-                                            {
-                                                Columns = 3,
-                                                VSeparationOverride = 0,
-                                                HSeparationOverride = 0,
-                                                Children =
-                                                {
-                                                    new Control {MinSize = imgSize},
-                                                    (_endCapTexture = Segment("end_cap")),
-                                                    new Control {MinSize = imgSize},
-                                                    (_controlBoxTexture = Segment("control_box")),
-                                                    (_fuelChamberTexture = Segment("fuel_chamber")),
-                                                    new Control {MinSize = imgSize},
-                                                    new Control {MinSize = imgSize},
-                                                    (_powerBoxTexture = Segment("power_box")),
-                                                    new Control {MinSize = imgSize},
-                                                    (_emitterStarboardTexture = Segment("emitter_starboard")),
-                                                    (_emitterForeTexture = Segment("emitter_fore")),
-                                                    (_emitterPortTexture = Segment("emitter_port")),
-                                                }
-                                            }
-                                        }
-                                    },
-                                    (_scanButton = new Button
-                                    {
-                                        Text = Loc.GetString("particle-accelerator-control-menu-scan-parts-button"),
-                                        HorizontalAlignment = HAlignment.Center
-                                    })
-                                }
-                            }
-                        }
-                    },
-                    new StripeBack
-                    {
-                        Children =
-                        {
-                            new Label
-                            {
-                                Margin = new Thickness(4, 4, 0, 4),
-                                Text = Loc.GetString("particle-accelerator-control-menu-check-containment-field-warning"),
-                                HorizontalAlignment = HAlignment.Center,
-                                StyleClasses = {StyleBase.StyleClassLabelSubText},
-                            }
-                        }
-                    },
-                    new BoxContainer
-                    {
-                        Orientation = LayoutOrientation.Horizontal,
-                        Margin = new Thickness(12, 0, 0, 0),
-                        Children =
-                        {
-                            new Label
-                            {
-                                Text = Loc.GetString("particle-accelerator-control-menu-foo-bar-baz"),
-                                StyleClasses = {StyleBase.StyleClassLabelSubText}
-                            }
-                        }
-                    },
-                }
-            });
-
-            _scanButton.OnPressed += args => _owner.SendScanPartsMessage();
-
-            _alarmControl.AnimationCompleted += s =>
-            {
-                if (_shouldContinueAnimating)
-                {
-                    _alarmControl.PlayAnimation(_alarmControlAnimation, "warningAnim");
-                }
-                else
-                {
-                    _alarmControl.Visible = false;
-                }
-            };
-
-            PASegmentControl Segment(string name)
-            {
-                return new(this, resourceCache, name);
-            }
-
-            UpdateUI(false, false, false, false);
-        }
-
-        private bool StrengthSpinBoxValid(int n)
-        {
-            return n >= 0 && n <= _maxStrength && !_blockSpinBox;
-        }
-
-        private void PowerStateChanged(ValueChangedEventArgs e)
-        {
-            ParticleAcceleratorPowerState newState;
-            switch (e.Value)
-            {
-                case 0:
-                    newState = ParticleAcceleratorPowerState.Standby;
-                    break;
-                case 1:
-                    newState = ParticleAcceleratorPowerState.Level0;
-                    break;
-                case 2:
-                    newState = ParticleAcceleratorPowerState.Level1;
-                    break;
-                case 3:
-                    newState = ParticleAcceleratorPowerState.Level2;
-                    break;
-                case 4:
-                    newState = ParticleAcceleratorPowerState.Level3;
-                    break;
-                default:
-                    return;
-            }
-
-            _stateSpinBox.SetButtonDisabled(true);
-            _owner.SendPowerStateMessage(newState);
-        }
-
-        protected override DragMode GetDragModeFor(Vector2 relativeMousePos)
-        {
-            return DragMode.Move;
-        }
-
-        public void DataUpdate(ParticleAcceleratorUIState uiState)
-        {
-            _assembled = uiState.Assembled;
-            UpdateUI(uiState.Assembled, uiState.InterfaceBlock, uiState.Enabled,
-                uiState.WirePowerBlock);
-            _statusLabel.Text = Loc.GetString("particle-accelerator-control-menu-status-label",
-                                              ("status", Loc.GetString(uiState.Assembled ? "particle-accelerator-control-menu-status-operational" :
-                                                                                           "particle-accelerator-control-menu-status-incomplete")));
-            UpdatePowerState(uiState.State, uiState.Enabled, uiState.Assembled,
-                uiState.MaxLevel);
-            UpdatePreview(uiState);
-            _lastDraw = uiState.PowerDraw;
-            _lastReceive = uiState.PowerReceive;
-        }
-
-        private void UpdatePowerState(ParticleAcceleratorPowerState state, bool enabled, bool assembled,
-            ParticleAcceleratorPowerState maxState)
-        {
-            _stateSpinBox.OverrideValue(state switch
-            {
-                ParticleAcceleratorPowerState.Standby => 0,
-                ParticleAcceleratorPowerState.Level0 => 1,
-                ParticleAcceleratorPowerState.Level1 => 2,
-                ParticleAcceleratorPowerState.Level2 => 3,
-                ParticleAcceleratorPowerState.Level3 => 4,
-                _ => 0
-            });
-
-
-            _maxStrength = maxState == ParticleAcceleratorPowerState.Level3 ? 4 : 3;
-            if (_maxStrength > 3 && enabled && assembled)
-            {
-                _shouldContinueAnimating = true;
-                if (!_alarmControl.HasRunningAnimation("warningAnim"))
-                    _alarmControl.PlayAnimation(_alarmControlAnimation, "warningAnim");
-            }
-            else
-                _shouldContinueAnimating = false;
-        }
-
-        private void UpdateUI(bool assembled, bool blocked, bool enabled, bool powerBlock)
-        {
-            _onButton.Pressed = enabled;
-            _offButton.Pressed = !enabled;
-
-            var cantUse = !assembled || blocked || powerBlock;
-            _onButton.Disabled = cantUse;
-            _offButton.Disabled = cantUse;
-            _scanButton.Disabled = blocked;
-
-            var cantChangeLevel = !assembled || blocked;
-            _stateSpinBox.SetButtonDisabled(cantChangeLevel);
-            _blockSpinBox = cantChangeLevel;
-        }
-
-        private void UpdatePreview(ParticleAcceleratorUIState updateMessage)
-        {
-            _endCapTexture.SetPowerState(updateMessage, updateMessage.EndCapExists);
-            _controlBoxTexture.SetPowerState(updateMessage, true);
-            _fuelChamberTexture.SetPowerState(updateMessage, updateMessage.FuelChamberExists);
-            _powerBoxTexture.SetPowerState(updateMessage, updateMessage.PowerBoxExists);
-            _emitterStarboardTexture.SetPowerState(updateMessage, updateMessage.EmitterStarboardExists);
-            _emitterForeTexture.SetPowerState(updateMessage, updateMessage.EmitterForeExists);
-            _emitterPortTexture.SetPowerState(updateMessage, updateMessage.EmitterPortExists);
-        }
-
-        protected override void FrameUpdate(FrameEventArgs args)
-        {
-            base.FrameUpdate(args);
-
-            if (!_assembled)
-            {
-                _drawLabel.Text = Loc.GetString("particle-accelerator-control-menu-draw-not-available");
-                return;
-            }
-
-            _time += args.DeltaSeconds;
-
-            var watts = 0;
-            if (_lastDraw != 0)
-            {
-                var val = _drawNoiseGenerator.GetNoise(_time, 0f);
-                watts = (int) (_lastDraw + val * 5);
-            }
-
-            _drawLabel.Text = Loc.GetString("particle-accelerator-control-menu-draw",
-                                            ("watts", $"{watts:##,##0}"),
-                                            ("lastReceive", $"{_lastReceive:##,##0}"));
-        }
-
-        private sealed class PASegmentControl : Control
-        {
-            private readonly ParticleAcceleratorControlMenu _menu;
-            private readonly string _baseState;
-            private readonly TextureRect _base;
-            private readonly TextureRect _unlit;
-            private readonly RSI _rsi;
-
-            public PASegmentControl(ParticleAcceleratorControlMenu menu, IResourceCache cache, string name)
-            {
-                _menu = menu;
-                _baseState = name;
-                _rsi = cache.GetResource<RSIResource>($"/Textures/Structures/Power/Generation/PA/{name}.rsi").RSI;
-
-                AddChild(_base = new TextureRect { Texture = _rsi[$"completed"].Frame0 });
-                AddChild(_unlit = new TextureRect());
-                MinSize = _rsi.Size;
-            }
-
-            public void SetPowerState(ParticleAcceleratorUIState state, bool exists)
-            {
-                _base.ShaderOverride = exists ? null : _menu._greyScaleShader;
-                _base.ModulateSelfOverride = exists ? null : new Color(127, 127, 127);
-
-                if (!state.Enabled || !exists)
-                {
-                    _unlit.Visible = false;
-                    return;
-                }
-
-                _unlit.Visible = true;
-
-                var suffix = state.State switch
-                {
-                    ParticleAcceleratorPowerState.Standby => "_unlitp",
-                    ParticleAcceleratorPowerState.Level0 => "_unlitp0",
-                    ParticleAcceleratorPowerState.Level1 => "_unlitp1",
-                    ParticleAcceleratorPowerState.Level2 => "_unlitp2",
-                    ParticleAcceleratorPowerState.Level3 => "_unlitp3",
-                    _ => ""
-                };
-
-                if (!_rsi.TryGetState(_baseState + suffix, out var rState))
-                {
-                    _unlit.Visible = false;
-                    return;
-                }
-
-                _unlit.Texture = rState.Frame0;
-            }
-        }
-    }
-}
diff --git a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml
new file mode 100644
index 00000000000..63f15837068
--- /dev/null
+++ b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml
@@ -0,0 +1,74 @@
+<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:ui="clr-namespace:Content.Client.ParticleAccelerator.UI"
+            xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+            Title="{Loc 'particle-accelerator-control-menu-device-version-label'}"
+            MinSize="420 320"
+            SetSize="420 320">
+    <BoxContainer Orientation="Vertical" VerticalExpand="True" Margin="0 10 0 0">
+        <BoxContainer Orientation="Horizontal" VerticalExpand="True">
+            <BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True" Margin="10 0 10 5">
+                <BoxContainer Orientation="Horizontal">
+                    <RichTextLabel Name="StatusLabel" HorizontalExpand="True"/>
+                    <RichTextLabel Name="StatusStateLabel"/>
+                </BoxContainer>
+                <Control MinHeight="5"/>
+                <BoxContainer Orientation="Horizontal">
+                    <RichTextLabel Name="PowerLabel" Margin="0 0 20 0" HorizontalExpand="True" VerticalAlignment="Center"/>
+                    <Button Name="OffButton" ToggleMode="False" Text="{Loc 'particle-accelerator-control-menu-off-button'}" StyleClasses="OpenRight"/>
+                    <Button Name="OnButton" ToggleMode="False" Text="{Loc 'particle-accelerator-control-menu-on-button'}" StyleClasses="OpenLeft"/>
+                </BoxContainer>
+                <Control MinHeight="5"/>
+                <BoxContainer Orientation="Horizontal">
+                    <RichTextLabel Name="StrengthLabel" Margin="0 0 20 0" HorizontalExpand="True" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+                    <SpinBox Name="StateSpinBox" Value="0"/>
+                </BoxContainer>
+                <Control MinHeight="5"/>
+                <BoxContainer Orientation="Horizontal">
+                    <RichTextLabel Name="DrawLabel" HorizontalExpand="True"/>
+                    <RichTextLabel Name="DrawValueLabel"/>
+                </BoxContainer>
+                <Control MinHeight="10" VerticalExpand="True"/>
+                <BoxContainer Name="AlarmControl" Orientation="Vertical" VerticalAlignment="Center" Visible="False">
+                    <RichTextLabel Name="BigAlarmLabel" HorizontalAlignment="Center"/>
+                    <RichTextLabel Name="BigAlarmLabelTwo" HorizontalAlignment="Center"/>
+                    <Label Text="{Loc 'particle-accelerator-control-menu-service-manual-reference'}" HorizontalAlignment="Center" StyleClasses="LabelSubText"/>
+                </BoxContainer>
+                <Control MinHeight="10" VerticalExpand="True"/>
+            </BoxContainer>
+            <customControls:VSeparator Margin="0 0 0 10"/>
+            <BoxContainer Orientation="Vertical" Margin="20 0 20 0" VerticalAlignment="Center">
+                <PanelContainer Name="BackPanel" HorizontalAlignment="Center">
+                    <PanelContainer.PanelOverride>
+                        <gfx:StyleBoxTexture Modulate="#202023" PatchMarginBottom="10" PatchMarginLeft="10" PatchMarginRight="10" PatchMarginTop="10"/>
+                    </PanelContainer.PanelOverride>
+                    <BoxContainer Orientation="Vertical" HorizontalExpand="True" HorizontalAlignment="Center" VerticalExpand="True">
+                        <GridContainer Columns="3" VSeparationOverride="0" HSeparationOverride="0" HorizontalAlignment="Center">
+                            <Control/>
+                            <ui:PASegmentControl Name="EndCapTexture" BaseState="end_cap"/>
+                            <Control/>
+                            <ui:PASegmentControl Name="ControlBoxTexture" BaseState="control_box"/>
+                            <ui:PASegmentControl Name="FuelChamberTexture" BaseState="fuel_chamber"/>
+                            <Control/>
+                            <Control/>
+                            <ui:PASegmentControl Name="PowerBoxTexture" BaseState="power_box"/>
+                            <Control/>
+                            <ui:PASegmentControl Name="EmitterStarboardTexture" BaseState="emitter_starboard"/>
+                            <ui:PASegmentControl Name="EmitterForeTexture" BaseState="emitter_fore"/>
+                            <ui:PASegmentControl Name="EmitterPortTexture" BaseState="emitter_port"/>
+                        </GridContainer>
+                        <Control MinHeight="5"/>
+                        <Button Name="ScanButton" Text="{Loc 'particle-accelerator-control-menu-scan-parts-button'}" HorizontalAlignment="Center"/>
+                    </BoxContainer>
+                </PanelContainer>
+            </BoxContainer>
+        </BoxContainer>
+        <controls:StripeBack>
+            <Label Text="{Loc 'particle-accelerator-control-menu-check-containment-field-warning'}" HorizontalAlignment="Center" StyleClasses="LabelSubText" Margin="4 4 0 4"/>
+        </controls:StripeBack>
+        <BoxContainer Orientation="Horizontal" Margin="12 0 0 0">
+            <Label Text="{Loc 'particle-accelerator-control-menu-foo-bar-baz'}" StyleClasses="LabelSubText"/>
+        </BoxContainer>
+    </BoxContainer>
+</controls:FancyWindow>
diff --git a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml.cs b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml.cs
new file mode 100644
index 00000000000..8b21e7d94bd
--- /dev/null
+++ b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml.cs
@@ -0,0 +1,322 @@
+using System.Numerics;
+using Content.Client.Message;
+using Content.Client.Resources;
+using Content.Client.UserInterface.Controls;
+using Content.Shared.Singularity.Components;
+using Content.Shared.Access.Systems;
+using Robust.Client.Animations;
+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.Noise;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+using Robust.Client.Player;
+
+namespace Content.Client.ParticleAccelerator.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class ParticleAcceleratorControlMenu : FancyWindow
+{
+    [Dependency] private readonly IResourceCache _cache = default!;
+
+    [Dependency] private readonly IEntityManager _entityManager = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
+
+    private readonly AccessReaderSystem _accessReader;
+
+    private readonly FastNoiseLite _drawNoiseGenerator;
+
+    private readonly Animation _alarmControlAnimation;
+
+    private float _time;
+    private int _lastDraw;
+    private int _lastReceive;
+
+    private bool _assembled;
+    private bool _shouldContinueAnimating;
+    private int _maxStrength = 3;
+
+    public event Action<bool>? OnOverallState;
+    public event Action? OnScan;
+    public event Action<ParticleAcceleratorPowerState>? OnPowerState;
+
+    private EntityUid _entity;
+
+    public ParticleAcceleratorControlMenu()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        _accessReader = _entityManager.System<AccessReaderSystem>();
+        _drawNoiseGenerator = new();
+        _drawNoiseGenerator.SetFractalType(FastNoiseLite.FractalType.FBm);
+        _drawNoiseGenerator.SetFrequency(0.5f);
+
+        var panelTex = _cache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png");
+
+        MouseFilter = MouseFilterMode.Stop;
+
+        _alarmControlAnimation = new Animation
+        {
+            Length = TimeSpan.FromSeconds(1),
+            AnimationTracks =
+            {
+                new AnimationTrackControlProperty
+                {
+                    Property = nameof(Visible),
+                    KeyFrames =
+                    {
+                        new AnimationTrackProperty.KeyFrame(true, 0),
+                        new AnimationTrackProperty.KeyFrame(false, 0.75f),
+                    }
+                }
+            }
+        };
+
+        if (BackPanel.PanelOverride is StyleBoxTexture tex)
+            tex.Texture = panelTex;
+
+        StatusLabel.SetMarkup(Loc.GetString("particle-accelerator-control-menu-status-label"));
+        StatusStateLabel.SetMarkup(Loc.GetString("particle-accelerator-control-menu-status-unknown"));
+        PowerLabel.SetMarkup(Loc.GetString("particle-accelerator-control-menu-power-label"));
+        StrengthLabel.SetMarkup(Loc.GetString("particle-accelerator-control-menu-strength-label"));
+        BigAlarmLabel.SetMarkup(Loc.GetString("particle-accelerator-control-menu-alarm-control-1"));
+        BigAlarmLabelTwo.SetMarkup(Loc.GetString("particle-accelerator-control-menu-alarm-control-2"));
+        DrawLabel.SetMarkup(Loc.GetString("particle-accelerator-control-menu-draw"));
+
+        StateSpinBox.IsValid = StrengthSpinBoxValid;
+        StateSpinBox.InitDefaultButtons();
+        StateSpinBox.ValueChanged += PowerStateChanged;
+        StateSpinBox.LineEditDisabled = true;
+
+        OffButton.OnPressed += _ =>
+        {
+            OnOverallState?.Invoke(false);
+        };
+
+        OnButton.OnPressed += _ =>
+        {
+            OnOverallState?.Invoke(true);
+        };
+
+        ScanButton.OnPressed += _ =>
+        {
+            OnScan?.Invoke();
+        };
+
+        AlarmControl.AnimationCompleted += _ =>
+        {
+            if (_shouldContinueAnimating)
+            {
+                AlarmControl.PlayAnimation(_alarmControlAnimation, "warningAnim");
+            }
+            else
+            {
+                AlarmControl.Visible = false;
+            }
+        };
+
+        UpdateUI(false, false, false, false);
+    }
+
+    public void SetEntity(EntityUid uid)
+    {
+        _entity = uid;
+    }
+
+    private void PowerStateChanged(ValueChangedEventArgs e)
+    {
+        ParticleAcceleratorPowerState newState;
+        switch (e.Value)
+        {
+            case 0:
+                newState = ParticleAcceleratorPowerState.Standby;
+                break;
+            case 1:
+                newState = ParticleAcceleratorPowerState.Level0;
+                break;
+            case 2:
+                newState = ParticleAcceleratorPowerState.Level1;
+                break;
+            case 3:
+                newState = ParticleAcceleratorPowerState.Level2;
+                break;
+            case 4:
+                newState = ParticleAcceleratorPowerState.Level3;
+                break;
+            default:
+                return;
+        }
+
+        StateSpinBox.SetButtonDisabled(true);
+        OnPowerState?.Invoke(newState);
+    }
+
+    private bool StrengthSpinBoxValid(int n)
+    {
+        return n >= 0 && n <= _maxStrength;
+    }
+
+    protected override DragMode GetDragModeFor(Vector2 relativeMousePos)
+    {
+        return DragMode.Move;
+    }
+
+    public void DataUpdate(ParticleAcceleratorUIState uiState)
+    {
+        _assembled = uiState.Assembled;
+        UpdateUI(uiState.Assembled,
+            uiState.InterfaceBlock,
+            uiState.Enabled,
+            uiState.WirePowerBlock);
+        StatusStateLabel.SetMarkup(Loc.GetString(uiState.Assembled
+            ? "particle-accelerator-control-menu-status-operational"
+            : "particle-accelerator-control-menu-status-incomplete"));
+        UpdatePowerState(uiState.State, uiState.Enabled, uiState.Assembled, uiState.MaxLevel);
+        UpdatePreview(uiState);
+        _lastDraw = uiState.PowerDraw;
+        _lastReceive = uiState.PowerReceive;
+    }
+
+    private void UpdatePowerState(ParticleAcceleratorPowerState state, bool enabled, bool assembled, ParticleAcceleratorPowerState maxState)
+    {
+        var value = state switch
+        {
+            ParticleAcceleratorPowerState.Standby => 0,
+            ParticleAcceleratorPowerState.Level0 => 1,
+            ParticleAcceleratorPowerState.Level1 => 2,
+            ParticleAcceleratorPowerState.Level2 => 3,
+            ParticleAcceleratorPowerState.Level3 => 4,
+            _ => 0
+        };
+
+        StateSpinBox.OverrideValue(value);
+
+        _maxStrength = maxState == ParticleAcceleratorPowerState.Level3 ? 4 : 3;
+        if (_maxStrength > 3 && enabled && assembled)
+        {
+            _shouldContinueAnimating = true;
+            if (!AlarmControl.HasRunningAnimation("warningAnim"))
+                AlarmControl.PlayAnimation(_alarmControlAnimation, "warningAnim");
+        }
+        else
+            _shouldContinueAnimating = false;
+    }
+
+    private void UpdateUI(bool assembled, bool blocked, bool enabled, bool powerBlock)
+    {
+        bool hasAccess = _player.LocalSession?.AttachedEntity is {} player
+            && _accessReader.IsAllowed(player, _entity);
+
+        OnButton.Pressed = enabled;
+        OffButton.Pressed = !enabled;
+
+        var cantUse = !assembled || blocked || powerBlock || !hasAccess;
+        OnButton.Disabled = cantUse;
+        OffButton.Disabled = cantUse;
+        ScanButton.Disabled = blocked || !hasAccess;
+
+        var cantChangeLevel = !assembled || blocked || !enabled || cantUse;
+        StateSpinBox.SetButtonDisabled(cantChangeLevel);
+    }
+
+    private void UpdatePreview(ParticleAcceleratorUIState updateMessage)
+    {
+        EndCapTexture.SetPowerState(updateMessage, updateMessage.EndCapExists);
+        ControlBoxTexture.SetPowerState(updateMessage, true);
+        FuelChamberTexture.SetPowerState(updateMessage, updateMessage.FuelChamberExists);
+        PowerBoxTexture.SetPowerState(updateMessage, updateMessage.PowerBoxExists);
+        EmitterStarboardTexture.SetPowerState(updateMessage, updateMessage.EmitterStarboardExists);
+        EmitterForeTexture.SetPowerState(updateMessage, updateMessage.EmitterForeExists);
+        EmitterPortTexture.SetPowerState(updateMessage, updateMessage.EmitterPortExists);
+    }
+
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        base.FrameUpdate(args);
+
+        if (!_assembled)
+        {
+            DrawValueLabel.SetMarkup(Loc.GetString("particle-accelerator-control-menu-draw-not-available"));
+            return;
+        }
+
+        _time += args.DeltaSeconds;
+
+        var watts = 0;
+        if (_lastDraw != 0)
+        {
+            var val = _drawNoiseGenerator.GetNoise(_time, 0f);
+            watts = (int) (_lastDraw + val * 5);
+        }
+
+        DrawValueLabel.SetMarkup(Loc.GetString("particle-accelerator-control-menu-draw-value",
+            ("watts", $"{watts:##,##0}"),
+            ("lastReceive", $"{_lastReceive:##,##0}")));
+    }
+}
+
+public sealed class PASegmentControl : Control
+{
+    private readonly ShaderInstance _greyScaleShader;
+    private readonly TextureRect _base;
+    private readonly TextureRect _unlit;
+    private RSI? _rsi;
+
+    public string BaseState { get; set; } = "control_box";
+
+    public PASegmentControl()
+    {
+        _greyScaleShader = IoCManager.Resolve<IPrototypeManager>().Index<ShaderPrototype>("Greyscale").Instance();
+
+        AddChild(_base = new TextureRect());
+        AddChild(_unlit = new TextureRect());
+    }
+
+    protected override void EnteredTree()
+    {
+        base.EnteredTree();
+        _rsi = IoCManager.Resolve<IResourceCache>().GetResource<RSIResource>($"/Textures/Structures/Power/Generation/PA/{BaseState}.rsi").RSI;
+        MinSize = _rsi.Size;
+        _base.Texture = _rsi["completed"].Frame0;
+    }
+
+    public void SetPowerState(ParticleAcceleratorUIState state, bool exists)
+    {
+        _base.ShaderOverride = exists ? null : _greyScaleShader;
+        _base.ModulateSelfOverride = exists ? null : new Color(127, 127, 127);
+
+        if (!state.Enabled || !exists)
+        {
+            _unlit.Visible = false;
+            return;
+        }
+
+        _unlit.Visible = true;
+
+        var suffix = state.State switch
+        {
+            ParticleAcceleratorPowerState.Standby => "_unlitp",
+            ParticleAcceleratorPowerState.Level0 => "_unlitp0",
+            ParticleAcceleratorPowerState.Level1 => "_unlitp1",
+            ParticleAcceleratorPowerState.Level2 => "_unlitp2",
+            ParticleAcceleratorPowerState.Level3 => "_unlitp3",
+            _ => ""
+        };
+
+        if (_rsi == null)
+            return;
+
+        if (!_rsi.TryGetState(BaseState + suffix, out var rState))
+        {
+            _unlit.Visible = false;
+            return;
+        }
+
+        _unlit.Texture = rState.Frame0;
+    }
+}
diff --git a/Content.Client/Physics/Controllers/MoverController.cs b/Content.Client/Physics/Controllers/MoverController.cs
index 31042854d4a..74a5e7afdcd 100644
--- a/Content.Client/Physics/Controllers/MoverController.cs
+++ b/Content.Client/Physics/Controllers/MoverController.cs
@@ -28,57 +28,57 @@ public override void Initialize()
             SubscribeLocalEvent<PullableComponent, UpdateIsPredictedEvent>(OnUpdatePullablePredicted);
         }
 
-        private void OnUpdatePredicted(EntityUid uid, InputMoverComponent component, ref UpdateIsPredictedEvent args)
+        private void OnUpdatePredicted(Entity<InputMoverComponent> entity, ref UpdateIsPredictedEvent args)
         {
             // Enable prediction if an entity is controlled by the player
-            if (uid == _playerManager.LocalEntity)
+            if (entity.Owner == _playerManager.LocalEntity)
                 args.IsPredicted = true;
         }
 
-        private void OnUpdateRelayTargetPredicted(EntityUid uid, MovementRelayTargetComponent component, ref UpdateIsPredictedEvent args)
+        private void OnUpdateRelayTargetPredicted(Entity<MovementRelayTargetComponent> entity, ref UpdateIsPredictedEvent args)
         {
-            if (component.Source == _playerManager.LocalEntity)
+            if (entity.Comp.Source == _playerManager.LocalEntity)
                 args.IsPredicted = true;
         }
 
-        private void OnUpdatePullablePredicted(EntityUid uid, PullableComponent component, ref UpdateIsPredictedEvent args)
+        private void OnUpdatePullablePredicted(Entity<PullableComponent> entity, ref UpdateIsPredictedEvent args)
         {
             // 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.LocalEntity)
+            if (entity.Comp.Puller == _playerManager.LocalEntity)
                 args.IsPredicted = true;
-            else if (component.Puller != null)
+            else if (entity.Comp.Puller != null)
                 args.BlockPrediction = true;
 
             // TODO recursive pulling checks?
             // What if the entity is being pulled by a vehicle controlled by the player?
         }
 
-        private void OnRelayPlayerAttached(EntityUid uid, RelayInputMoverComponent component, LocalPlayerAttachedEvent args)
+        private void OnRelayPlayerAttached(Entity<RelayInputMoverComponent> entity, ref LocalPlayerAttachedEvent args)
         {
-            Physics.UpdateIsPredicted(uid);
-            Physics.UpdateIsPredicted(component.RelayEntity);
-            if (MoverQuery.TryGetComponent(component.RelayEntity, out var inputMover))
-                SetMoveInput(inputMover, MoveButtons.None);
+            Physics.UpdateIsPredicted(entity.Owner);
+            Physics.UpdateIsPredicted(entity.Comp.RelayEntity);
+            if (MoverQuery.TryGetComponent(entity.Comp.RelayEntity, out var inputMover))
+                SetMoveInput((entity.Owner, inputMover), MoveButtons.None);
         }
 
-        private void OnRelayPlayerDetached(EntityUid uid, RelayInputMoverComponent component, LocalPlayerDetachedEvent args)
+        private void OnRelayPlayerDetached(Entity<RelayInputMoverComponent> entity, ref LocalPlayerDetachedEvent args)
         {
-            Physics.UpdateIsPredicted(uid);
-            Physics.UpdateIsPredicted(component.RelayEntity);
-            if (MoverQuery.TryGetComponent(component.RelayEntity, out var inputMover))
-                SetMoveInput(inputMover, MoveButtons.None);
+            Physics.UpdateIsPredicted(entity.Owner);
+            Physics.UpdateIsPredicted(entity.Comp.RelayEntity);
+            if (MoverQuery.TryGetComponent(entity.Comp.RelayEntity, out var inputMover))
+                SetMoveInput((entity.Owner, inputMover), MoveButtons.None);
         }
 
-        private void OnPlayerAttached(EntityUid uid, InputMoverComponent component, LocalPlayerAttachedEvent args)
+        private void OnPlayerAttached(Entity<InputMoverComponent> entity, ref LocalPlayerAttachedEvent args)
         {
-            SetMoveInput(component, MoveButtons.None);
+            SetMoveInput(entity, MoveButtons.None);
         }
 
-        private void OnPlayerDetached(EntityUid uid, InputMoverComponent component, LocalPlayerDetachedEvent args)
+        private void OnPlayerDetached(Entity<InputMoverComponent> entity, ref LocalPlayerDetachedEvent args)
         {
-            SetMoveInput(component, MoveButtons.None);
+            SetMoveInput(entity, MoveButtons.None);
         }
 
         public override void UpdateBeforeSolve(bool prediction, float frameTime)
diff --git a/Content.Client/Physics/JointVisualsOverlay.cs b/Content.Client/Physics/JointVisualsOverlay.cs
index 09c02746e2e..e0b3499a974 100644
--- a/Content.Client/Physics/JointVisualsOverlay.cs
+++ b/Content.Client/Physics/JointVisualsOverlay.cs
@@ -58,8 +58,8 @@ protected override void Draw(in OverlayDrawArgs args)
             coordsA = coordsA.Offset(rotA.RotateVec(visuals.OffsetA));
             coordsB = coordsB.Offset(rotB.RotateVec(visuals.OffsetB));
 
-            var posA = coordsA.ToMapPos(_entManager, xformSystem);
-            var posB = coordsB.ToMapPos(_entManager, xformSystem);
+            var posA = xformSystem.ToMapCoordinates(coordsA).Position;
+            var posB = xformSystem.ToMapCoordinates(coordsB).Position;
             var diff = (posB - posA);
             var length = diff.Length();
 
diff --git a/Content.Client/Pinpointer/UI/NavMapBeaconBoundUserInterface.cs b/Content.Client/Pinpointer/UI/NavMapBeaconBoundUserInterface.cs
index 3ebcf7cbced..0df6787170a 100644
--- a/Content.Client/Pinpointer/UI/NavMapBeaconBoundUserInterface.cs
+++ b/Content.Client/Pinpointer/UI/NavMapBeaconBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Pinpointer;
 using JetBrains.Annotations;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Pinpointer.UI;
 
@@ -16,19 +17,16 @@ public NavMapBeaconBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner,
     protected override void Open()
     {
         base.Open();
-        _window = new NavMapBeaconWindow(Owner);
-        _window.OpenCentered();
-        _window.OnClose += Close;
+        _window = this.CreateWindow<NavMapBeaconWindow>();
+
+        if (EntMan.TryGetComponent(Owner, out NavMapBeaconComponent? beacon))
+        {
+            _window.SetEntity(Owner, beacon);
+        }
 
         _window.OnApplyButtonPressed += (label, enabled, color) =>
         {
             SendMessage(new NavMapBeaconConfigureBuiMessage(label, enabled, color));
         };
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        _window?.Dispose();
-    }
 }
diff --git a/Content.Client/Pinpointer/UI/NavMapBeaconWindow.xaml.cs b/Content.Client/Pinpointer/UI/NavMapBeaconWindow.xaml.cs
index 968fe188f75..b77f1af0472 100644
--- a/Content.Client/Pinpointer/UI/NavMapBeaconWindow.xaml.cs
+++ b/Content.Client/Pinpointer/UI/NavMapBeaconWindow.xaml.cs
@@ -10,38 +10,37 @@ namespace Content.Client.Pinpointer.UI;
 [GenerateTypedNameReferences]
 public sealed partial class NavMapBeaconWindow : FancyWindow
 {
-    [Dependency] private readonly IEntityManager _entityManager = default!;
-
     private string? _defaultLabel;
     private bool _defaultEnabled;
     private Color _defaultColor;
 
     public event Action<string?, bool, Color>? OnApplyButtonPressed;
 
-    public NavMapBeaconWindow(EntityUid beaconEntity)
+    public NavMapBeaconWindow()
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
 
-        if (!_entityManager.TryGetComponent<NavMapBeaconComponent>(beaconEntity, out var navMap))
-            return;
-        _defaultLabel = navMap.Text;
-        _defaultEnabled = navMap.Enabled;
-        _defaultColor = navMap.Color;
 
-        UpdateVisibleButton(navMap.Enabled);
         VisibleButton.OnPressed += args => UpdateVisibleButton(args.Button.Pressed);
-
-        LabelLineEdit.Text = navMap.Text ?? string.Empty;
         LabelLineEdit.OnTextChanged += OnTextChanged;
-
-        ColorSelector.Color = navMap.Color;
         ColorSelector.OnColorChanged += _ => TryEnableApplyButton();
 
         TryEnableApplyButton();
         ApplyButton.OnPressed += OnApplyPressed;
     }
 
+    public void SetEntity(EntityUid uid, NavMapBeaconComponent navMap)
+    {
+        _defaultLabel = navMap.Text;
+        _defaultEnabled = navMap.Enabled;
+        _defaultColor = navMap.Color;
+
+        UpdateVisibleButton(navMap.Enabled);
+        LabelLineEdit.Text = navMap.Text ?? string.Empty;
+        ColorSelector.Color = navMap.Color;
+    }
+
     private void UpdateVisibleButton(bool value)
     {
         VisibleButton.Pressed = value;
diff --git a/Content.Client/Pinpointer/UI/NavMapControl.cs b/Content.Client/Pinpointer/UI/NavMapControl.cs
index 3c99a188181..413b41c36a6 100644
--- a/Content.Client/Pinpointer/UI/NavMapControl.cs
+++ b/Content.Client/Pinpointer/UI/NavMapControl.cs
@@ -228,8 +228,8 @@ protected override void KeyBindUp(GUIBoundKeyEventArgs args)
             {
                 if (!blip.Selectable)
                     continue;
-
-                var currentDistance = (blip.Coordinates.ToMapPos(EntManager, _transformSystem) - worldPosition).Length();
+                
+                var currentDistance = (_transformSystem.ToMapCoordinates(blip.Coordinates).Position - worldPosition).Length();
 
                 if (closestDistance < currentDistance || currentDistance * MinimapScale > MaxSelectableDistance)
                     continue;
@@ -397,7 +397,7 @@ protected override void Draw(DrawingHandleScreen handle)
         {
             if (lit && value.Visible)
             {
-                var mapPos = coord.ToMap(EntManager, _transformSystem);
+                var mapPos = _transformSystem.ToMapCoordinates(coord);
 
                 if (mapPos.MapId != MapId.Nullspace)
                 {
@@ -418,7 +418,7 @@ protected override void Draw(DrawingHandleScreen handle)
             if (blip.Texture == null)
                 continue;
 
-            var mapPos = blip.Coordinates.ToMap(EntManager, _transformSystem);
+            var mapPos = _transformSystem.ToMapCoordinates(blip.Coordinates);
 
             if (mapPos.MapId != MapId.Nullspace)
             {
@@ -535,7 +535,7 @@ private void UpdateNavMapWallLines()
                 // East edge
                 neighborData = 0;
                 if (relativeTile.X != SharedNavMapSystem.ChunkSize - 1)
-                    neighborData = chunk.TileData[i+SharedNavMapSystem.ChunkSize];
+                    neighborData = chunk.TileData[i + SharedNavMapSystem.ChunkSize];
                 else if (_navMap.Chunks.TryGetValue(chunkOrigin + Vector2i.Right, out neighborChunk))
                     neighborData = neighborChunk.TileData[i + SharedNavMapSystem.ChunkSize - SharedNavMapSystem.ArraySize];
 
@@ -548,7 +548,7 @@ private void UpdateNavMapWallLines()
                 // South edge
                 neighborData = 0;
                 if (relativeTile.Y != 0)
-                    neighborData = chunk.TileData[i-1];
+                    neighborData = chunk.TileData[i - 1];
                 else if (_navMap.Chunks.TryGetValue(chunkOrigin + Vector2i.Down, out neighborChunk))
                     neighborData = neighborChunk.TileData[i - 1 + SharedNavMapSystem.ChunkSize];
 
@@ -561,7 +561,7 @@ private void UpdateNavMapWallLines()
                 // West edge
                 neighborData = 0;
                 if (relativeTile.X != 0)
-                    neighborData = chunk.TileData[i-SharedNavMapSystem.ChunkSize];
+                    neighborData = chunk.TileData[i - SharedNavMapSystem.ChunkSize];
                 else if (_navMap.Chunks.TryGetValue(chunkOrigin + Vector2i.Left, out neighborChunk))
                     neighborData = neighborChunk.TileData[i - SharedNavMapSystem.ChunkSize + SharedNavMapSystem.ArraySize];
 
diff --git a/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs b/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs
index 1483e75e732..91fb4ef71bd 100644
--- a/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs
+++ b/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs
@@ -1,4 +1,5 @@
-using Robust.Client.GameObjects;
+using Content.Shared.Pinpointer;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Pinpointer.UI;
 
@@ -14,7 +15,6 @@ public StationMapBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, u
     protected override void Open()
     {
         base.Open();
-        _window?.Close();
         EntityUid? gridUid = null;
 
         if (EntMan.TryGetComponent<TransformComponent>(Owner, out var xform))
@@ -22,14 +22,11 @@ protected override void Open()
             gridUid = xform.GridUid;
         }
 
-        _window = new StationMapWindow(gridUid, Owner);
-        _window.OpenCentered();
-        _window.OnClose += Close;
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        _window?.Dispose();
+        _window = this.CreateWindow<StationMapWindow>();
+        _window.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
+        if (EntMan.TryGetComponent<StationMapComponent>(Owner, out var comp) && comp.ShowLocation)
+            _window.Set(gridUid, Owner);
+        else
+            _window.Set(gridUid, null);
     }
 }
diff --git a/Content.Client/Pinpointer/UI/StationMapWindow.xaml.cs b/Content.Client/Pinpointer/UI/StationMapWindow.xaml.cs
index 1b01fe4e304..7cbb8b7d0db 100644
--- a/Content.Client/Pinpointer/UI/StationMapWindow.xaml.cs
+++ b/Content.Client/Pinpointer/UI/StationMapWindow.xaml.cs
@@ -9,19 +9,18 @@ namespace Content.Client.Pinpointer.UI;
 [GenerateTypedNameReferences]
 public sealed partial class StationMapWindow : FancyWindow
 {
-    public StationMapWindow(EntityUid? mapUid, EntityUid? trackedEntity)
+    public StationMapWindow()
     {
         RobustXamlLoader.Load(this);
+    }
+
+    public void Set(EntityUid? mapUid, EntityUid? trackedEntity)
+    {
         NavMapScreen.MapUid = mapUid;
 
         if (trackedEntity != null)
             NavMapScreen.TrackedCoordinates.Add(new EntityCoordinates(trackedEntity.Value, Vector2.Zero), (true, Color.Cyan));
 
-        if (IoCManager.Resolve<IEntityManager>().TryGetComponent<MetaDataComponent>(mapUid, out var metadata))
-        {
-            Title = metadata.EntityName;
-        }
-
         NavMapScreen.ForceNavMapUpdate();
     }
 }
diff --git a/Content.Client/Pinpointer/UI/UntrackedMapBoundUserInterface.cs b/Content.Client/Pinpointer/UI/UntrackedMapBoundUserInterface.cs
deleted file mode 100644
index 57965b030a2..00000000000
--- a/Content.Client/Pinpointer/UI/UntrackedMapBoundUserInterface.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Robust.Client.GameObjects;
-
-namespace Content.Client.Pinpointer.UI;
-
-public sealed class UntrackedStationMapBoundUserInterface : BoundUserInterface
-{
-    [ViewVariables]
-    private StationMapWindow? _window;
-
-    public UntrackedStationMapBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
-    {
-    }
-
-    protected override void Open()
-    {
-        base.Open();
-        _window?.Close();
-        EntityUid? gridUid = null;
-
-        if (EntMan.TryGetComponent<TransformComponent>(Owner, out var xform))
-        {
-            gridUid = xform.GridUid;
-        }
-
-        _window = new StationMapWindow(gridUid, null);
-        _window.OpenCentered();
-        _window.OnClose += Close;
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        _window?.Dispose();
-    }
-}
diff --git a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
index 87eb5234013..1ecf9e339ab 100644
--- a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
+++ b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
@@ -1,8 +1,10 @@
 using System.Diagnostics.CodeAnalysis;
+using Content.Client.Lobby;
 using Content.Shared.CCVar;
 using Content.Shared.Players;
 using Content.Shared.Players.JobWhitelist;
 using Content.Shared.Players.PlayTimeTracking;
+using Content.Shared.Preferences;
 using Content.Shared.Roles;
 using Robust.Client;
 using Robust.Client.Player;
@@ -90,7 +92,7 @@ private void RxJobWhitelist(MsgJobWhitelist message)
         Updated?.Invoke();
     }
 
-    public bool IsAllowed(JobPrototype job, [NotNullWhen(false)] out FormattedMessage? reason)
+    public bool IsAllowed(JobPrototype job, HumanoidCharacterProfile? profile, [NotNullWhen(false)] out FormattedMessage? reason)
     {
         reason = null;
 
@@ -107,16 +109,16 @@ public bool IsAllowed(JobPrototype job, [NotNullWhen(false)] out FormattedMessag
         if (player == null)
             return true;
 
-        return CheckRoleTime(job, out reason);
+        return CheckRoleRequirements(job, profile, out reason);
     }
 
-    public bool CheckRoleTime(JobPrototype job, [NotNullWhen(false)] out FormattedMessage? reason)
+    public bool CheckRoleRequirements(JobPrototype job, HumanoidCharacterProfile? profile, [NotNullWhen(false)] out FormattedMessage? reason)
     {
         var reqs = _entManager.System<SharedRoleSystem>().GetJobRequirement(job);
-        return CheckRoleTime(reqs, out reason);
+        return CheckRoleRequirements(reqs, profile, out reason);
     }
 
-    public bool CheckRoleTime(HashSet<JobRequirement>? requirements, [NotNullWhen(false)] out FormattedMessage? reason)
+    public bool CheckRoleRequirements(HashSet<JobRequirement>? requirements, HumanoidCharacterProfile? profile, [NotNullWhen(false)] out FormattedMessage? reason)
     {
         reason = null;
 
@@ -126,7 +128,7 @@ public bool CheckRoleTime(HashSet<JobRequirement>? requirements, [NotNullWhen(fa
         var reasons = new List<string>();
         foreach (var requirement in requirements)
         {
-            if (JobRequirements.TryRequirementMet(requirement, _roles, out var jobReason, _entManager, _prototypes, _whitelisted))
+            if (requirement.Check(_entManager, _prototypes, profile, _roles, out var jobReason, _whitelisted))
                 continue;
 
             reasons.Add(jobReason.ToMarkup());
diff --git a/Content.Client/Power/APC/ApcBoundUserInterface.cs b/Content.Client/Power/APC/ApcBoundUserInterface.cs
index fbcbf011569..759a5949ba6 100644
--- a/Content.Client/Power/APC/ApcBoundUserInterface.cs
+++ b/Content.Client/Power/APC/ApcBoundUserInterface.cs
@@ -2,6 +2,7 @@
 using Content.Shared.APC;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Power.APC
 {
@@ -19,9 +20,8 @@ protected override void Open()
         {
             base.Open();
 
-            _menu = new ApcMenu(this);
-            _menu.OnClose += Close;
-            _menu.OpenCentered();
+            _menu = this.CreateWindow<ApcMenu>();
+            _menu.OnBreaker += BreakerPressed;
         }
 
         protected override void UpdateState(BoundUserInterfaceState state)
@@ -36,15 +36,5 @@ public void BreakerPressed()
         {
             SendMessage(new ApcToggleMainBreakerMessage());
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            if (disposing)
-            {
-                _menu?.Dispose();
-            }
-        }
     }
 }
diff --git a/Content.Client/Power/APC/UI/ApcMenu.xaml.cs b/Content.Client/Power/APC/UI/ApcMenu.xaml.cs
index dbf68ea07b0..2f61ea63a86 100644
--- a/Content.Client/Power/APC/UI/ApcMenu.xaml.cs
+++ b/Content.Client/Power/APC/UI/ApcMenu.xaml.cs
@@ -17,13 +17,19 @@ namespace Content.Client.Power.APC.UI
     [GenerateTypedNameReferences]
     public sealed partial class ApcMenu : FancyWindow
     {
-        public ApcMenu(ApcBoundUserInterface owner)
+        public event Action? OnBreaker;
+
+        public ApcMenu()
         {
             IoCManager.InjectDependencies(this);
             RobustXamlLoader.Load(this);
 
-            EntityView.SetEntity(owner.Owner);
-            BreakerButton.OnPressed += _ => owner.BreakerPressed();
+            BreakerButton.OnPressed += _ => OnBreaker?.Invoke();
+        }
+
+        public void SetEntity(EntityUid entity)
+        {
+            EntityView.SetEntity(entity);
         }
 
         public void UpdateState(BoundUserInterfaceState state)
diff --git a/Content.Client/Power/EntitySystems/PowerReceiverSystem.cs b/Content.Client/Power/EntitySystems/PowerReceiverSystem.cs
index 4d56592c232..61e20f751ca 100644
--- a/Content.Client/Power/EntitySystems/PowerReceiverSystem.cs
+++ b/Content.Client/Power/EntitySystems/PowerReceiverSystem.cs
@@ -1,6 +1,7 @@
-using Content.Client.Power.Components;
+using Content.Client.Power.Components;
 using Content.Shared.Power.Components;
 using Content.Shared.Power.EntitySystems;
+using Content.Shared.Examine;
 using Robust.Shared.GameStates;
 
 namespace Content.Client.Power.EntitySystems;
@@ -10,9 +11,15 @@ public sealed class PowerReceiverSystem : SharedPowerReceiverSystem
     public override void Initialize()
     {
         base.Initialize();
+        SubscribeLocalEvent<ApcPowerReceiverComponent, ExaminedEvent>(OnExamined);
         SubscribeLocalEvent<ApcPowerReceiverComponent, ComponentHandleState>(OnHandleState);
     }
 
+    private void OnExamined(Entity<ApcPowerReceiverComponent> ent, ref ExaminedEvent args)
+    {
+        args.PushMarkup(GetExamineText(ent.Comp.Powered));
+    }
+
     private void OnHandleState(EntityUid uid, ApcPowerReceiverComponent component, ref ComponentHandleState args)
     {
         if (args.Current is not ApcPowerReceiverComponentState state)
diff --git a/Content.Client/Power/Generator/GeneratorWindow.xaml.cs b/Content.Client/Power/Generator/GeneratorWindow.xaml.cs
index bd5b75de1da..e975e5d466e 100644
--- a/Content.Client/Power/Generator/GeneratorWindow.xaml.cs
+++ b/Content.Client/Power/Generator/GeneratorWindow.xaml.cs
@@ -9,35 +9,39 @@ namespace Content.Client.Power.Generator;
 [GenerateTypedNameReferences]
 public sealed partial class GeneratorWindow : FancyWindow
 {
-    private readonly EntityUid _entity;
-
     [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly ILocalizationManager _loc = default!;
 
-    private readonly SharedPowerSwitchableSystem _switchable;
-    private readonly FuelGeneratorComponent? _component;
-    private PortableGeneratorComponentBuiState? _lastState;
+    private EntityUid _entity;
+
+    public float? MaximumPower;
+
+    public event Action<int>? OnPower;
+    public event Action<bool>? OnState;
+    public event Action? OnSwitchOutput;
+    public event Action? OnEjectFuel;
 
-    public GeneratorWindow(PortableGeneratorBoundUserInterface bui, EntityUid entity)
+    public GeneratorWindow()
     {
-        _entity = entity;
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
 
-        _entityManager.TryGetComponent(entity, out _component);
-        _switchable = _entityManager.System<SharedPowerSwitchableSystem>();
-
-        EntityView.SetEntity(entity);
         TargetPower.IsValid += IsValid;
         TargetPower.ValueChanged += (args) =>
         {
-            bui.SetTargetPower(args.Value);
+            OnPower?.Invoke(args.Value);
         };
 
-        StartButton.OnPressed += _ => bui.Start();
-        StopButton.OnPressed += _ => bui.Stop();
-        OutputSwitchButton.OnPressed += _ => bui.SwitchOutput();
-        FuelEject.OnPressed += _ => bui.EjectFuel();
+        StartButton.OnPressed += _ => OnState?.Invoke(true);
+        StopButton.OnPressed += _ => OnState?.Invoke(false);
+        OutputSwitchButton.OnPressed += _ => OnSwitchOutput?.Invoke();
+        FuelEject.OnPressed += _ => OnEjectFuel?.Invoke();
+    }
+
+    public void SetEntity(EntityUid entity)
+    {
+        _entity = entity;
+        EntityView.SetEntity(entity);
     }
 
     private bool IsValid(int arg)
@@ -45,7 +49,7 @@ private bool IsValid(int arg)
         if (arg < 0)
             return false;
 
-        if (arg > (_lastState?.MaximumPower / 1000.0f ?? 0))
+        if (arg > (MaximumPower / 1000.0f ?? 0))
             return false;
 
         return true;
@@ -53,16 +57,17 @@ private bool IsValid(int arg)
 
     public void Update(PortableGeneratorComponentBuiState state)
     {
-        if (_component == null)
+        MaximumPower = state.MaximumPower;
+
+        if (!_entityManager.TryGetComponent(_entity, out FuelGeneratorComponent? component))
             return;
 
-        _lastState = state;
         if (!TargetPower.LineEditControl.HasKeyboardFocus())
             TargetPower.OverrideValue((int)(state.TargetPower / 1000.0f));
-        var efficiency = SharedGeneratorSystem.CalcFuelEfficiency(state.TargetPower, state.OptimalPower, _component);
+        var efficiency = SharedGeneratorSystem.CalcFuelEfficiency(state.TargetPower, state.OptimalPower, component);
         Efficiency.Text = efficiency.ToString("P1");
 
-        var burnRate = _component.OptimalBurnRate / efficiency;
+        var burnRate = component.OptimalBurnRate / efficiency;
         var left = state.RemainingFuel / burnRate;
 
         Eta.Text = Loc.GetString(
@@ -102,14 +107,15 @@ public void Update(PortableGeneratorComponentBuiState state)
         }
 
         var canSwitch = _entityManager.TryGetComponent(_entity, out PowerSwitchableComponent? switchable);
+        var switcher = _entityManager.System<SharedPowerSwitchableSystem>();
         OutputSwitchLabel.Visible = canSwitch;
         OutputSwitchButton.Visible = canSwitch;
 
         if (switchable != null)
         {
-            var voltage = _switchable.VoltageString(_switchable.GetVoltage(_entity, switchable));
+            var voltage = switcher.VoltageString(switcher.GetVoltage(_entity, switchable));
             OutputSwitchLabel.Text = Loc.GetString("portable-generator-ui-current-output", ("voltage", voltage));
-            var nextVoltage = _switchable.VoltageString(_switchable.GetNextVoltage(_entity, switchable));
+            var nextVoltage = switcher.VoltageString(switcher.GetNextVoltage(_entity, switchable));
             OutputSwitchButton.Text = Loc.GetString("power-switchable-switch-voltage", ("voltage", nextVoltage));
             OutputSwitchButton.Disabled = state.On;
         }
diff --git a/Content.Client/Power/Generator/PortableGeneratorBoundUserInterface.cs b/Content.Client/Power/Generator/PortableGeneratorBoundUserInterface.cs
index 30679d71fd6..550e1041b62 100644
--- a/Content.Client/Power/Generator/PortableGeneratorBoundUserInterface.cs
+++ b/Content.Client/Power/Generator/PortableGeneratorBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Power.Generator;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Power.Generator;
 
@@ -16,10 +17,25 @@ public PortableGeneratorBoundUserInterface(EntityUid owner, Enum uiKey) : base(o
     protected override void Open()
     {
         base.Open();
-        _window = new GeneratorWindow(this, Owner);
+        _window = this.CreateWindow<GeneratorWindow>();
+        _window.SetEntity(Owner);
+        _window.OnState += args =>
+        {
+            if (args)
+            {
+                Start();
+            }
+            else
+            {
+                Stop();
+            }
+        };
+
+        _window.OnPower += SetTargetPower;
+        _window.OnEjectFuel += EjectFuel;
+        _window.OnSwitchOutput += SwitchOutput;
 
         _window.OpenCenteredLeft();
-        _window.OnClose += Close;
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -30,11 +46,6 @@ protected override void UpdateState(BoundUserInterfaceState state)
         _window?.Update(msg);
     }
 
-    protected override void Dispose(bool disposing)
-    {
-       _window?.Dispose();
-    }
-
     public void SetTargetPower(int target)
     {
         SendMessage(new PortableGeneratorSetTargetPowerMessage(target));
diff --git a/Content.Client/Power/PowerMonitoringConsoleBoundUserInterface.cs b/Content.Client/Power/PowerMonitoringConsoleBoundUserInterface.cs
index dc1dcd03ef1..cbc343c06c6 100644
--- a/Content.Client/Power/PowerMonitoringConsoleBoundUserInterface.cs
+++ b/Content.Client/Power/PowerMonitoringConsoleBoundUserInterface.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Power;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Power;
 
@@ -11,9 +12,9 @@ public PowerMonitoringConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : b
 
     protected override void Open()
     {
-        _menu = new PowerMonitoringWindow(this, Owner);
-        _menu.OpenCentered();
-        _menu.OnClose += Close;
+        _menu = this.CreateWindow<PowerMonitoringWindow>();
+        _menu.SetEntity(Owner);
+        _menu.SendPowerMonitoringConsoleMessageAction += SendPowerMonitoringConsoleMessage;
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -22,9 +23,6 @@ protected override void UpdateState(BoundUserInterfaceState state)
 
         var castState = (PowerMonitoringConsoleBoundInterfaceState) state;
 
-        if (castState == null)
-            return;
-
         EntMan.TryGetComponent<TransformComponent>(Owner, out var xform);
         _menu?.ShowEntites
             (castState.TotalSources,
@@ -40,13 +38,4 @@ public void SendPowerMonitoringConsoleMessage(NetEntity? netEntity, PowerMonitor
     {
         SendMessage(new PowerMonitoringConsoleMessage(netEntity, group));
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing)
-            return;
-
-        _menu?.Dispose();
-    }
 }
diff --git a/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs b/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs
index 74752ddc534..d9952992070 100644
--- a/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs
+++ b/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs
@@ -32,7 +32,7 @@ private void UpdateWindowConsoleEntry
         if (windowEntry == null)
             return;
 
-        // Update sources and loads 
+        // Update sources and loads
         UpdateEntrySourcesOrLoads(masterContainer, windowEntry.SourcesContainer, focusSources, _sourceIcon);
         UpdateEntrySourcesOrLoads(masterContainer, windowEntry.LoadsContainer, focusLoads, _loadIconPath);
 
@@ -134,7 +134,7 @@ private void UpdateEntrySourcesOrLoads(BoxContainer masterContainer, BoxContaine
             subEntry.Button.OnButtonUp += args => { ButtonAction(subEntry, masterContainer); };
         }
 
-        if (!_entManager.TryGetComponent<PowerMonitoringConsoleComponent>(_owner, out var console))
+        if (!_entManager.TryGetComponent<PowerMonitoringConsoleComponent>(Entity, out var console))
             return;
 
         // Update all children
@@ -379,7 +379,7 @@ public PowerMonitoringWindowEntry(PowerMonitoringConsoleEntry entry) : base(entr
 
         AddChild(MainContainer);
 
-        // Grid container to hold the list of sources when selected 
+        // Grid container to hold the list of sources when selected
         SourcesContainer = new BoxContainer()
         {
             Orientation = LayoutOrientation.Vertical,
diff --git a/Content.Client/Power/PowerMonitoringWindow.xaml.cs b/Content.Client/Power/PowerMonitoringWindow.xaml.cs
index 81fe1f4d047..e3043252486 100644
--- a/Content.Client/Power/PowerMonitoringWindow.xaml.cs
+++ b/Content.Client/Power/PowerMonitoringWindow.xaml.cs
@@ -15,13 +15,12 @@ namespace Content.Client.Power;
 [GenerateTypedNameReferences]
 public sealed partial class PowerMonitoringWindow : FancyWindow
 {
-    private readonly IEntityManager _entManager;
+    [Dependency] private IEntityManager _entManager = default!;
     private readonly SpriteSystem _spriteSystem;
-    private readonly IGameTiming _gameTiming;
+    [Dependency] private IGameTiming _gameTiming = default!;
 
     private const float BlinkFrequency = 1f;
 
-    private EntityUid? _owner;
     private NetEntity? _focusEntity;
 
     public event Action<NetEntity?, PowerMonitoringConsoleGroup>? SendPowerMonitoringConsoleMessageAction;
@@ -34,31 +33,56 @@ public sealed partial class PowerMonitoringWindow : FancyWindow
         { PowerMonitoringConsoleGroup.APC, (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_triangle.png")), Color.LimeGreen) },
     };
 
-    public PowerMonitoringWindow(PowerMonitoringConsoleBoundUserInterface userInterface, EntityUid? owner)
+    public EntityUid Entity;
+
+    public PowerMonitoringWindow()
     {
         RobustXamlLoader.Load(this);
-        _entManager = IoCManager.Resolve<IEntityManager>();
-        _gameTiming = IoCManager.Resolve<IGameTiming>();
+        IoCManager.InjectDependencies(this);
 
         _spriteSystem = _entManager.System<SpriteSystem>();
-        _owner = owner;
+
+        // Set trackable entity selected action
+        NavMap.TrackedEntitySelectedAction += SetTrackedEntityFromNavMap;
+
+        // Update nav map
+        NavMap.ForceNavMapUpdate();
+
+        // Set UI tab titles
+        MasterTabContainer.SetTabTitle(0, Loc.GetString("power-monitoring-window-label-sources"));
+        MasterTabContainer.SetTabTitle(1, Loc.GetString("power-monitoring-window-label-smes"));
+        MasterTabContainer.SetTabTitle(2, Loc.GetString("power-monitoring-window-label-substation"));
+        MasterTabContainer.SetTabTitle(3, Loc.GetString("power-monitoring-window-label-apc"));
+
+        // Track when the MasterTabContainer changes its tab
+        MasterTabContainer.OnTabChanged += OnTabChanged;
+
+        // Set UI toggles
+        ShowHVCable.OnToggled += _ => OnShowCableToggled(PowerMonitoringConsoleLineGroup.HighVoltage);
+        ShowMVCable.OnToggled += _ => OnShowCableToggled(PowerMonitoringConsoleLineGroup.MediumVoltage);
+        ShowLVCable.OnToggled += _ => OnShowCableToggled(PowerMonitoringConsoleLineGroup.Apc);
+    }
+
+    public void SetEntity(EntityUid uid)
+    {
+        Entity = uid;
 
         // Pass owner to nav map
-        NavMap.Owner = _owner;
+        NavMap.Owner = uid;
 
         // Set nav map grid uid
         var stationName = Loc.GetString("power-monitoring-window-unknown-location");
 
-        if (_entManager.TryGetComponent<TransformComponent>(owner, out var xform))
+        if (_entManager.TryGetComponent<TransformComponent>(uid, out var xform))
         {
             NavMap.MapUid = xform.GridUid;
 
-            // Assign station name      
+            // Assign station name
             if (_entManager.TryGetComponent<MetaDataComponent>(xform.GridUid, out var stationMetaData))
                 stationName = stationMetaData.EntityName;
 
             var msg = new FormattedMessage();
-            msg.AddMarkup(Loc.GetString("power-monitoring-window-station-name", ("stationName", stationName)));
+            msg.AddMarkupOrThrow(Loc.GetString("power-monitoring-window-station-name", ("stationName", stationName)));
 
             StationName.SetMessage(msg);
         }
@@ -68,29 +92,6 @@ public PowerMonitoringWindow(PowerMonitoringConsoleBoundUserInterface userInterf
             StationName.SetMessage(stationName);
             NavMap.Visible = false;
         }
-
-        // Set trackable entity selected action
-        NavMap.TrackedEntitySelectedAction += SetTrackedEntityFromNavMap;
-
-        // Update nav map
-        NavMap.ForceNavMapUpdate();
-
-        // Set UI tab titles
-        MasterTabContainer.SetTabTitle(0, Loc.GetString("power-monitoring-window-label-sources"));
-        MasterTabContainer.SetTabTitle(1, Loc.GetString("power-monitoring-window-label-smes"));
-        MasterTabContainer.SetTabTitle(2, Loc.GetString("power-monitoring-window-label-substation"));
-        MasterTabContainer.SetTabTitle(3, Loc.GetString("power-monitoring-window-label-apc"));
-
-        // Track when the MasterTabContainer changes its tab
-        MasterTabContainer.OnTabChanged += OnTabChanged;
-
-        // Set UI toggles
-        ShowHVCable.OnToggled += _ => OnShowCableToggled(PowerMonitoringConsoleLineGroup.HighVoltage);
-        ShowMVCable.OnToggled += _ => OnShowCableToggled(PowerMonitoringConsoleLineGroup.MediumVoltage);
-        ShowLVCable.OnToggled += _ => OnShowCableToggled(PowerMonitoringConsoleLineGroup.Apc);
-
-        // Set power monitoring message action
-        SendPowerMonitoringConsoleMessageAction += userInterface.SendPowerMonitoringConsoleMessage;
     }
 
     private void OnTabChanged(int tab)
@@ -113,10 +114,7 @@ public void ShowEntites
         PowerMonitoringConsoleEntry[] focusLoads,
         EntityCoordinates? monitorCoords)
     {
-        if (_owner == null)
-            return;
-
-        if (!_entManager.TryGetComponent<PowerMonitoringConsoleComponent>(_owner.Value, out var console))
+        if (!_entManager.TryGetComponent<PowerMonitoringConsoleComponent>(Entity, out var console))
             return;
 
         // Update power status text
@@ -161,13 +159,13 @@ public void ShowEntites
         }
 
         // Show monitor location
-        var mon = _entManager.GetNetEntity(_owner);
+        var mon = _entManager.GetNetEntity(Entity);
 
-        if (monitorCoords != null && mon != null)
+        if (monitorCoords != null && mon.IsValid())
         {
             var texture = _spriteSystem.Frame0(new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png")));
             var blip = new NavMapBlip(monitorCoords.Value, texture, Color.Cyan, true, false);
-            NavMap.TrackedEntities[mon.Value] = blip;
+            NavMap.TrackedEntities[mon] = blip;
         }
 
         // If the entry group doesn't match the current tab, the data is out dated, do not use it
@@ -239,7 +237,7 @@ private void SetTrackedEntityFromNavMap(NetEntity? netEntity)
         if (netEntity == null)
             return;
 
-        if (!_entManager.TryGetComponent<PowerMonitoringConsoleComponent>(_owner, out var console))
+        if (!_entManager.TryGetComponent<PowerMonitoringConsoleComponent>(Entity, out var console))
             return;
 
         if (!console.PowerMonitoringDeviceMetaData.TryGetValue(netEntity.Value, out var metaData))
@@ -266,7 +264,7 @@ protected override void FrameUpdate(FrameEventArgs args)
     {
         AutoScrollToFocus();
 
-        // Warning sign pulse        
+        // Warning sign pulse
         var lit = _gameTiming.RealTime.TotalSeconds % BlinkFrequency > BlinkFrequency / 2f;
         SystemWarningPanel.Modulate = lit ? Color.White : new Color(178, 178, 178);
     }
diff --git a/Content.Client/RCD/AlignRCDConstruction.cs b/Content.Client/RCD/AlignRCDConstruction.cs
index d5425425a76..ef99b01855c 100644
--- a/Content.Client/RCD/AlignRCDConstruction.cs
+++ b/Content.Client/RCD/AlignRCDConstruction.cs
@@ -45,7 +45,7 @@ public override void AlignPlacementMode(ScreenCoordinates mouseScreen)
         _unalignedMouseCoords = ScreenToCursorGrid(mouseScreen);
         MouseCoords = _unalignedMouseCoords.AlignWithClosestGridTile(SearchBoxSize, _entityManager, _mapManager);
 
-        var gridId = MouseCoords.GetGridUid(_entityManager);
+        var gridId = _transformSystem.GetGrid(MouseCoords);
 
         if (!_entityManager.TryGetComponent<MapGridComponent>(gridId, out var mapGrid))
             return;
@@ -75,7 +75,7 @@ public override bool IsValidPosition(EntityCoordinates position)
         if (!_entityManager.TryGetComponent<TransformComponent>(player, out var xform))
             return false;
 
-        if (!xform.Coordinates.InRange(_entityManager, _transformSystem, position, SharedInteractionSystem.InteractionRange))
+        if (!_transformSystem.InRange(xform.Coordinates, position, SharedInteractionSystem.InteractionRange))
         {
             InvalidPlaceColor = InvalidPlaceColor.WithAlpha(0);
             return false;
@@ -105,8 +105,8 @@ public override bool IsValidPosition(EntityCoordinates position)
 
         if (currentState is not GameplayStateBase screen)
             return false;
-
-        var target = screen.GetClickedEntity(_unalignedMouseCoords.ToMap(_entityManager, _transformSystem));
+        
+        var target = screen.GetClickedEntity(_transformSystem.ToMapCoordinates(_unalignedMouseCoords));
 
         // Determine if the RCD operation is valid or not
         if (!_rcdSystem.IsRCDOperationStillValid(heldEntity.Value, rcd, mapGridData.Value, target, player.Value, false))
diff --git a/Content.Client/RCD/RCDMenu.xaml.cs b/Content.Client/RCD/RCDMenu.xaml.cs
index 3eb0397a690..f0d27d6b1fb 100644
--- a/Content.Client/RCD/RCDMenu.xaml.cs
+++ b/Content.Client/RCD/RCDMenu.xaml.cs
@@ -20,31 +20,37 @@ public sealed partial class RCDMenu : RadialMenu
     [Dependency] private readonly IPrototypeManager _protoManager = default!;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
 
-    private readonly SpriteSystem _spriteSystem;
-    private readonly SharedPopupSystem _popup;
+    private SharedPopupSystem _popup;
+    private SpriteSystem _sprites;
 
     public event Action<ProtoId<RCDPrototype>>? SendRCDSystemMessageAction;
 
     private EntityUid _owner;
 
-    public RCDMenu(EntityUid owner, RCDMenuBoundUserInterface bui)
+    public RCDMenu()
     {
         IoCManager.InjectDependencies(this);
         RobustXamlLoader.Load(this);
 
-        _spriteSystem = _entManager.System<SpriteSystem>();
         _popup = _entManager.System<SharedPopupSystem>();
+        _sprites = _entManager.System<SpriteSystem>();
 
-        _owner = owner;
+        OnChildAdded += AddRCDMenuButtonOnClickActions;
+    }
+
+    public void SetEntity(EntityUid uid)
+    {
+        _owner = uid;
+        Refresh();
+    }
 
+    public void Refresh()
+    {
         // Find the main radial container
         var main = FindControl<RadialContainer>("Main");
 
-        if (main == null)
-            return;
-
         // Populate secondary radial containers
-        if (!_entManager.TryGetComponent<RCDComponent>(owner, out var rcd))
+        if (!_entManager.TryGetComponent<RCDComponent>(_owner, out var rcd))
             return;
 
         foreach (var protoId in rcd.AvailablePrototypes)
@@ -56,14 +62,10 @@ public RCDMenu(EntityUid owner, RCDMenuBoundUserInterface bui)
                 continue;
 
             var parent = FindControl<RadialContainer>(proto.Category);
-
-            if (parent == null)
-                continue;
-
             var tooltip = Loc.GetString(proto.SetName);
 
             if ((proto.Mode == RcdMode.ConstructTile || proto.Mode == RcdMode.ConstructObject) &&
-                proto.Prototype != null && _protoManager.TryIndex(proto.Prototype, out var entProto))
+                proto.Prototype != null && _protoManager.TryIndex(proto.Prototype, out var entProto, logError: false))
             {
                 tooltip = Loc.GetString(entProto.Name);
             }
@@ -84,7 +86,7 @@ public RCDMenu(EntityUid owner, RCDMenuBoundUserInterface bui)
                 {
                     VerticalAlignment = VAlignment.Center,
                     HorizontalAlignment = HAlignment.Center,
-                    Texture = _spriteSystem.Frame0(proto.Sprite),
+                    Texture = _sprites.Frame0(proto.Sprite),
                     TextureScale = new Vector2(2f, 2f),
                 };
 
@@ -112,11 +114,9 @@ public RCDMenu(EntityUid owner, RCDMenuBoundUserInterface bui)
 
         // Set up menu actions
         foreach (var child in Children)
+        {
             AddRCDMenuButtonOnClickActions(child);
-
-        OnChildAdded += AddRCDMenuButtonOnClickActions;
-
-        SendRCDSystemMessageAction += bui.SendRCDSystemMessage;
+        }
     }
 
     private static string OopsConcat(string a, string b)
@@ -153,7 +153,7 @@ private void AddRCDMenuButtonOnClickActions(Control control)
                         var name = Loc.GetString(proto.SetName);
 
                         if (proto.Prototype != null &&
-                            _protoManager.TryIndex(proto.Prototype, out var entProto))
+                            _protoManager.TryIndex(proto.Prototype, out var entProto, logError: false))
                             name = entProto.Name;
 
                         msg = Loc.GetString("rcd-component-change-build-mode", ("name", name));
diff --git a/Content.Client/RCD/RCDMenuBoundUserInterface.cs b/Content.Client/RCD/RCDMenuBoundUserInterface.cs
index a37dbcecf8c..1dd03626ae6 100644
--- a/Content.Client/RCD/RCDMenuBoundUserInterface.cs
+++ b/Content.Client/RCD/RCDMenuBoundUserInterface.cs
@@ -3,6 +3,7 @@
 using JetBrains.Annotations;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
+using Robust.Client.UserInterface;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.RCD;
@@ -24,8 +25,9 @@ protected override void Open()
     {
         base.Open();
 
-        _menu = new(Owner, this);
-        _menu.OnClose += Close;
+        _menu = this.CreateWindow<RCDMenu>();
+        _menu.SetEntity(Owner);
+        _menu.SendRCDSystemMessageAction += SendRCDSystemMessage;
 
         // Open the menu, centered on the mouse
         var vpSize = _displayManager.ScreenSize;
@@ -34,16 +36,8 @@ protected override void Open()
 
     public void SendRCDSystemMessage(ProtoId<RCDPrototype> protoId)
     {
-        // A predicted message cannot be used here as the RCD UI is closed immediately 
+        // A predicted message cannot be used here as the RCD UI is closed immediately
         // after this message is sent, which will stop the server from receiving it
         SendMessage(new RCDSystemMessage(protoId));
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing) return;
-
-        _menu?.Dispose();
-    }
 }
diff --git a/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs b/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs
index 8d5607af2d0..9ec24fae0ef 100644
--- a/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs
+++ b/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs
@@ -116,7 +116,9 @@ private void RadiationQuery(IEye? currentEye)
                     var shaderInstance = _pulses[pulseEntity];
                     shaderInstance.instance.CurrentMapCoords = _transform.GetMapCoordinates(pulseEntity);
                     shaderInstance.instance.Range = pulse.VisualRange;
-                } else {
+                }
+                else
+                {
                     _pulses[pulseEntity].shd.Dispose();
                     _pulses.Remove(pulseEntity);
                 }
@@ -129,7 +131,7 @@ private bool PulseQualifies(EntityUid pulseEntity, MapCoordinates currentEyeLoc)
             var transformComponent = _entityManager.GetComponent<TransformComponent>(pulseEntity);
             var transformSystem = _entityManager.System<SharedTransformSystem>();
             return transformComponent.MapID == currentEyeLoc.MapId
-                && transformComponent.Coordinates.InRange(_entityManager, transformSystem, EntityCoordinates.FromMap(transformComponent.ParentUid, currentEyeLoc, transformSystem, _entityManager), MaxDist);
+                && transformSystem.InRange(transformComponent.Coordinates, transformSystem.ToCoordinates(transformComponent.ParentUid, currentEyeLoc), MaxDist);
         }
 
         private sealed record RadiationShaderInstance(MapCoordinates CurrentMapCoords, float Range, TimeSpan Start, float Duration)
diff --git a/Content.Client/Radio/EntitySystems/RadioDeviceSystem.cs b/Content.Client/Radio/EntitySystems/RadioDeviceSystem.cs
new file mode 100644
index 00000000000..29d6c635ebc
--- /dev/null
+++ b/Content.Client/Radio/EntitySystems/RadioDeviceSystem.cs
@@ -0,0 +1,23 @@
+using Content.Client.Radio.Ui;
+using Content.Shared.Radio;
+using Content.Shared.Radio.Components;
+using Robust.Client.GameObjects;
+
+namespace Content.Client.Radio.EntitySystems;
+
+public sealed class RadioDeviceSystem : EntitySystem
+{
+    [Dependency] private readonly UserInterfaceSystem _ui = default!;
+
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<IntercomComponent, AfterAutoHandleStateEvent>(OnAfterHandleState);
+    }
+
+    private void OnAfterHandleState(Entity<IntercomComponent> ent, ref AfterAutoHandleStateEvent args)
+    {
+        if (_ui.TryGetOpenUi<IntercomBoundUserInterface>(ent.Owner, IntercomUiKey.Key, out var bui))
+            bui.Update(ent);
+    }
+}
diff --git a/Content.Client/Radio/Ui/IntercomBoundUserInterface.cs b/Content.Client/Radio/Ui/IntercomBoundUserInterface.cs
index abbb1d58ec4..401e7edd44a 100644
--- a/Content.Client/Radio/Ui/IntercomBoundUserInterface.cs
+++ b/Content.Client/Radio/Ui/IntercomBoundUserInterface.cs
@@ -1,6 +1,8 @@
 using Content.Shared.Radio;
+using Content.Shared.Radio.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Radio.Ui;
 
@@ -19,7 +21,12 @@ protected override void Open()
     {
         base.Open();
 
-        _menu = new();
+        _menu = this.CreateWindow<IntercomMenu>();
+
+        if (EntMan.TryGetComponent(Owner, out IntercomComponent? intercom))
+        {
+            _menu.Update((Owner, intercom));
+        }
 
         _menu.OnMicPressed += enabled =>
         {
@@ -33,26 +40,10 @@ protected override void Open()
         {
             SendMessage(new SelectIntercomChannelMessage(channel));
         };
-
-        _menu.OnClose += Close;
-        _menu.OpenCentered();
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing)
-            return;
-        _menu?.Close();
     }
 
-    protected override void UpdateState(BoundUserInterfaceState state)
+    public void Update(Entity<IntercomComponent> ent)
     {
-        base.UpdateState(state);
-
-        if (state is not IntercomBoundUIState msg)
-            return;
-
-        _menu?.Update(msg);
+        _menu?.Update(ent);
     }
 }
diff --git a/Content.Client/Radio/Ui/IntercomMenu.xaml.cs b/Content.Client/Radio/Ui/IntercomMenu.xaml.cs
index 8b4b38753c1..20d2e4a3e54 100644
--- a/Content.Client/Radio/Ui/IntercomMenu.xaml.cs
+++ b/Content.Client/Radio/Ui/IntercomMenu.xaml.cs
@@ -1,8 +1,9 @@
 using Content.Client.UserInterface.Controls;
-using Content.Shared.Radio;
+using Content.Shared.Radio.Components;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
 
 namespace Content.Client.Radio.Ui;
 
@@ -26,29 +27,43 @@ public IntercomMenu()
         SpeakerButton.OnPressed += args => OnSpeakerPressed?.Invoke(args.Button.Pressed);
     }
 
-    public void Update(IntercomBoundUIState state)
+    public void Update(Entity<IntercomComponent> entity)
     {
-        MicButton.Pressed = state.MicEnabled;
-        SpeakerButton.Pressed = state.SpeakerEnabled;
+        MicButton.Pressed = entity.Comp.MicrophoneEnabled;
+        SpeakerButton.Pressed = entity.Comp.SpeakerEnabled;
+
+        MicButton.Disabled = entity.Comp.SupportedChannels.Count == 0;
+        SpeakerButton.Disabled = entity.Comp.SupportedChannels.Count == 0;
+        ChannelOptions.Disabled = entity.Comp.SupportedChannels.Count == 0;
 
         ChannelOptions.Clear();
         _channels.Clear();
-        for (var i = 0; i < state.AvailableChannels.Count; i++)
+        for (var i = 0; i < entity.Comp.SupportedChannels.Count; i++)
         {
-            var channel = state.AvailableChannels[i];
-            if (!_prototype.TryIndex<RadioChannelPrototype>(channel, out var prototype))
+            var channel = entity.Comp.SupportedChannels[i];
+            if (!_prototype.TryIndex(channel, out var prototype))
                 continue;
 
             _channels.Add(channel);
             ChannelOptions.AddItem(Loc.GetString(prototype.Name), i);
 
-            if (channel == state.SelectedChannel)
+            if (channel == entity.Comp.CurrentChannel)
                 ChannelOptions.Select(i);
         }
+
+        if (entity.Comp.SupportedChannels.Count == 0)
+        {
+            ChannelOptions.AddItem(Loc.GetString("intercom-options-none"), 0);
+            ChannelOptions.Select(0);
+        }
+
         ChannelOptions.OnItemSelected += args =>
         {
+            if (!_channels.TryGetValue(args.Id, out var proto))
+                return;
+
             ChannelOptions.SelectId(args.Id);
-            OnChannelSelected?.Invoke(_channels[args.Id]);
+            OnChannelSelected?.Invoke(proto);
         };
     }
 }
diff --git a/Content.Client/Replay/Spectator/ReplaySpectatorSystem.Position.cs b/Content.Client/Replay/Spectator/ReplaySpectatorSystem.Position.cs
index d00e319eed9..71561703d64 100644
--- a/Content.Client/Replay/Spectator/ReplaySpectatorSystem.Position.cs
+++ b/Content.Client/Replay/Spectator/ReplaySpectatorSystem.Position.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Movement.Components;
+using Content.Shared.Station.Components;
 using Robust.Shared.GameStates;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
@@ -164,14 +165,25 @@ private bool TryFindFallbackSpawn(out EntityCoordinates coords)
         float? maxSize = null;
         var gridQuery = EntityQueryEnumerator<MapGridComponent>();
 
+        var stationFound = false;
         while (gridQuery.MoveNext(out var uid, out var grid))
         {
             var size = grid.LocalAABB.Size.LengthSquared();
-            if (maxSize == null || size > maxSize)
-            {
-                maxUid = (uid, grid);
-                maxSize = size;
-            }
+
+            var station = HasComp<StationMemberComponent>(uid);
+
+            //We want the first station grid to overwrite any previous non-station grids no matter the size, in case the vgroid was found first
+            if (maxSize is not null && size < maxSize && !(!stationFound && station))
+                continue;
+
+            if (!station && stationFound)
+               continue;
+
+            maxUid = (uid, grid);
+            maxSize = size;
+
+            if (station)
+                stationFound = true;
         }
 
         coords = new EntityCoordinates(maxUid ?? default, default);
diff --git a/Content.Client/Research/UI/DiskConsoleBoundUserInterface.cs b/Content.Client/Research/UI/DiskConsoleBoundUserInterface.cs
index da008ca04c9..9641adb5b2d 100644
--- a/Content.Client/Research/UI/DiskConsoleBoundUserInterface.cs
+++ b/Content.Client/Research/UI/DiskConsoleBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Research;
 using Content.Shared.Research.Components;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Research.UI
 {
@@ -17,10 +18,7 @@ protected override void Open()
         {
             base.Open();
 
-            _menu = new();
-
-            _menu.OnClose += Close;
-            _menu.OpenCentered();
+            _menu = this.CreateWindow<DiskConsoleMenu>();
 
             _menu.OnServerButtonPressed += () =>
             {
@@ -32,14 +30,6 @@ protected override void Open()
             };
         }
 
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing)
-                return;
-            _menu?.Close();
-        }
-
         protected override void UpdateState(BoundUserInterfaceState state)
         {
             base.UpdateState(state);
diff --git a/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs b/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs
index 07dd35a0056..288445e4dea 100644
--- a/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs
+++ b/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Research.Components;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Research.UI
 {
@@ -16,10 +17,9 @@ public ResearchClientBoundUserInterface(EntityUid owner, Enum uiKey) : base(owne
         protected override void Open()
         {
             base.Open();
-
-            _menu = new ResearchClientServerSelectionMenu(this);
-            _menu.OnClose += Close;
-            _menu.OpenCentered();
+            _menu = this.CreateWindow<ResearchClientServerSelectionMenu>();
+            _menu.OnServerSelected += SelectServer;
+            _menu.OnServerDeselected += DeselectServer;
         }
 
         public void SelectServer(int serverId)
@@ -38,12 +38,5 @@ protected override void UpdateState(BoundUserInterfaceState state)
             if (state is not ResearchClientBoundInterfaceState rState) return;
             _menu?.Populate(rState.ServerCount, rState.ServerNames, rState.ServerIds, rState.SelectedServerId);
         }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing) return;
-            _menu?.Dispose();
-        }
     }
 }
diff --git a/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs b/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs
index ceaa965e59f..d10f8b39f48 100644
--- a/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs
+++ b/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs
@@ -13,27 +13,26 @@ public sealed partial class ResearchClientServerSelectionMenu : DefaultWindow
         private int[] _serverIds = Array.Empty<int>();
         private int _selectedServerId = -1;
 
-        private ResearchClientBoundUserInterface Owner { get; }
+        public event Action<int>? OnServerSelected;
+        public event Action? OnServerDeselected;
 
-        public ResearchClientServerSelectionMenu(ResearchClientBoundUserInterface owner)
+        public ResearchClientServerSelectionMenu()
         {
             RobustXamlLoader.Load(this);
             IoCManager.InjectDependencies(this);
 
-            Owner = owner;
-
             Servers.OnItemSelected += OnItemSelected;
             Servers.OnItemDeselected += OnItemDeselected;
         }
 
         public void OnItemSelected(ItemList.ItemListSelectedEventArgs itemListSelectedEventArgs)
         {
-            Owner.SelectServer(_serverIds[itemListSelectedEventArgs.ItemIndex]);
+            OnServerSelected?.Invoke(_serverIds[itemListSelectedEventArgs.ItemIndex]);
         }
 
         public void OnItemDeselected(ItemList.ItemListDeselectedEventArgs itemListDeselectedEventArgs)
         {
-            Owner.DeselectServer();
+            OnServerDeselected?.Invoke();
         }
 
         public void Populate(int serverCount, string[] serverNames, int[] serverIds, int selectedServerId)
diff --git a/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs b/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs
index f29e66baaeb..2895ada61fb 100644
--- a/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs
+++ b/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs
@@ -1,6 +1,8 @@
 using Content.Shared.Research.Components;
+using Content.Shared.Research.Prototypes;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Research.UI;
 
@@ -20,7 +22,8 @@ protected override void Open()
 
         var owner = Owner;
 
-        _consoleMenu = new ResearchConsoleMenu(owner);
+        _consoleMenu = this.CreateWindow<ResearchConsoleMenu>();
+        _consoleMenu.SetEntity(owner);
 
         _consoleMenu.OnTechnologyCardPressed += id =>
         {
@@ -31,10 +34,20 @@ protected override void Open()
         {
             SendMessage(new ConsoleServerSelectionMessage());
         };
+    }
+
+    public override void OnProtoReload(PrototypesReloadedEventArgs args)
+    {
+        base.OnProtoReload(args);
+
+        if (!args.WasModified<TechnologyPrototype>())
+            return;
 
-        _consoleMenu.OnClose += Close;
+        if (State is not ResearchConsoleBoundInterfaceState rState)
+            return;
 
-        _consoleMenu.OpenCentered();
+        _consoleMenu?.UpdatePanels(rState);
+        _consoleMenu?.UpdateInformationPanel(rState);
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -46,12 +59,4 @@ protected override void UpdateState(BoundUserInterfaceState state)
         _consoleMenu?.UpdatePanels(castState);
         _consoleMenu?.UpdateInformationPanel(castState);
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing)
-            return;
-        _consoleMenu?.Dispose();
-    }
 }
diff --git a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
index b364b833124..eafbe75fbb9 100644
--- a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
+++ b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
@@ -25,14 +25,13 @@ public sealed partial class ResearchConsoleMenu : FancyWindow
     [Dependency] private readonly IEntityManager _entity = default!;
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IPlayerManager _player = default!;
-    private readonly TechnologyDatabaseComponent? _technologyDatabase;
     private readonly ResearchSystem _research;
     private readonly SpriteSystem _sprite;
     private readonly AccessReaderSystem _accessReader;
 
-    public readonly EntityUid Entity;
+    public EntityUid Entity;
 
-    public ResearchConsoleMenu(EntityUid entity)
+    public ResearchConsoleMenu()
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
@@ -40,21 +39,23 @@ public ResearchConsoleMenu(EntityUid entity)
         _research = _entity.System<ResearchSystem>();
         _sprite = _entity.System<SpriteSystem>();
         _accessReader = _entity.System<AccessReaderSystem>();
-        Entity = entity;
 
         ServerButton.OnPressed += _ => OnServerButtonPressed?.Invoke();
+    }
 
-        _entity.TryGetComponent(entity, out _technologyDatabase);
+    public void SetEntity(EntityUid entity)
+    {
+        Entity = entity;
     }
 
-    public void  UpdatePanels(ResearchConsoleBoundInterfaceState state)
+    public void UpdatePanels(ResearchConsoleBoundInterfaceState state)
     {
         TechnologyCardsContainer.Children.Clear();
 
         var availableTech = _research.GetAvailableTechnologies(Entity);
         SyncTechnologyList(AvailableCardsContainer, availableTech);
 
-        if (_technologyDatabase == null)
+        if (!_entity.TryGetComponent(Entity, out TechnologyDatabaseComponent? database))
             return;
 
         // i can't figure out the spacing so here you go
@@ -66,7 +67,7 @@ public void  UpdatePanels(ResearchConsoleBoundInterfaceState state)
         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)
+        foreach (var techId in database.CurrentTechnologyCards)
         {
             var tech = _prototype.Index<TechnologyPrototype>(techId);
             var cardControl = new TechnologyCardControl(tech, _prototype, _sprite, _research.GetTechnologyDescription(tech, includeTier: false), state.Points, hasAccess);
@@ -74,39 +75,39 @@ public void  UpdatePanels(ResearchConsoleBoundInterfaceState state)
             TechnologyCardsContainer.AddChild(cardControl);
         }
 
-        var unlockedTech = _technologyDatabase.UnlockedTechnologies.Select(x => _prototype.Index<TechnologyPrototype>(x));
+        var unlockedTech = database.UnlockedTechnologies.Select(x => _prototype.Index<TechnologyPrototype>(x));
         SyncTechnologyList(UnlockedCardsContainer, unlockedTech);
     }
 
     public void UpdateInformationPanel(ResearchConsoleBoundInterfaceState state)
     {
         var amountMsg = new FormattedMessage();
-        amountMsg.AddMarkup(Loc.GetString("research-console-menu-research-points-text",
+        amountMsg.AddMarkupOrThrow(Loc.GetString("research-console-menu-research-points-text",
             ("points", state.Points)));
         ResearchAmountLabel.SetMessage(amountMsg);
 
-        if (_technologyDatabase == null)
+        if (!_entity.TryGetComponent(Entity, out TechnologyDatabaseComponent? database))
             return;
 
         var disciplineText = Loc.GetString("research-discipline-none");
         var disciplineColor = Color.Gray;
-        if (_technologyDatabase.MainDiscipline != null)
+        if (database.MainDiscipline != null)
         {
-            var discipline = _prototype.Index<TechDisciplinePrototype>(_technologyDatabase.MainDiscipline);
+            var discipline = _prototype.Index<TechDisciplinePrototype>(database.MainDiscipline);
             disciplineText = Loc.GetString(discipline.Name);
             disciplineColor = discipline.Color;
         }
 
         var msg = new FormattedMessage();
-        msg.AddMarkup(Loc.GetString("research-console-menu-main-discipline",
+        msg.AddMarkupOrThrow(Loc.GetString("research-console-menu-main-discipline",
             ("name", disciplineText), ("color", disciplineColor)));
         MainDisciplineLabel.SetMessage(msg);
 
         TierDisplayContainer.Children.Clear();
-        foreach (var disciplineId in _technologyDatabase.SupportedDisciplines)
+        foreach (var disciplineId in database.SupportedDisciplines)
         {
             var discipline = _prototype.Index<TechDisciplinePrototype>(disciplineId);
-            var tier = _research.GetHighestDisciplineTier(_technologyDatabase, discipline);
+            var tier = _research.GetHighestDisciplineTier(database, discipline);
 
             // don't show tiers with no available tech
             if (tier == 0)
diff --git a/Content.Client/Research/UI/TechnologyCardControl.xaml.cs b/Content.Client/Research/UI/TechnologyCardControl.xaml.cs
index f547457203e..292ed0ebe0b 100644
--- a/Content.Client/Research/UI/TechnologyCardControl.xaml.cs
+++ b/Content.Client/Research/UI/TechnologyCardControl.xaml.cs
@@ -23,7 +23,7 @@ public TechnologyCardControl(TechnologyPrototype technology, IPrototypeManager p
         DisciplineTexture.Texture = spriteSys.Frame0(discipline.Icon);
         TechnologyNameLabel.Text = Loc.GetString(technology.Name);
         var message = new FormattedMessage();
-        message.AddMarkup(Loc.GetString("research-console-tier-discipline-info",
+        message.AddMarkupOrThrow(Loc.GetString("research-console-tier-discipline-info",
             ("tier", technology.Tier), ("color", discipline.Color), ("discipline", Loc.GetString(discipline.Name))));
         TierLabel.SetMessage(message);
         UnlocksLabel.SetMessage(description);
diff --git a/Content.Client/Robotics/UI/RoboticsConsoleBoundUserInterface.cs b/Content.Client/Robotics/UI/RoboticsConsoleBoundUserInterface.cs
index 6185979eee6..9a5159880f9 100644
--- a/Content.Client/Robotics/UI/RoboticsConsoleBoundUserInterface.cs
+++ b/Content.Client/Robotics/UI/RoboticsConsoleBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Robotics;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Robotics.UI;
 
@@ -16,7 +17,9 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new RoboticsConsoleWindow(Owner);
+        _window = this.CreateWindow<RoboticsConsoleWindow>();
+        _window.SetEntity(Owner);
+
         _window.OnDisablePressed += address =>
         {
             SendMessage(new RoboticsConsoleDisableMessage(address));
@@ -25,9 +28,6 @@ protected override void Open()
         {
             SendMessage(new RoboticsConsoleDestroyMessage(address));
         };
-        _window.OnClose += Close;
-
-        _window.OpenCentered();
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -37,14 +37,6 @@ protected override void UpdateState(BoundUserInterfaceState state)
         if (state is not RoboticsConsoleState cast)
             return;
 
-        _window?.UpdateState(cast);
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-
-        if (disposing)
-            _window?.Dispose();
+        _window.UpdateState(cast);
     }
 }
diff --git a/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs b/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs
index fc7b234bccc..87d7e62c392 100644
--- a/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs
+++ b/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs
@@ -23,11 +23,12 @@ public sealed partial class RoboticsConsoleWindow : FancyWindow
     public Action<string>? OnDisablePressed;
     public Action<string>? OnDestroyPressed;
 
-    private Entity<RoboticsConsoleComponent, LockComponent?> _console;
     private string? _selected;
     private Dictionary<string, CyborgControlData> _cyborgs = new();
 
-    public RoboticsConsoleWindow(EntityUid console)
+    public EntityUid Entity;
+
+    public RoboticsConsoleWindow()
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
@@ -35,9 +36,6 @@ public RoboticsConsoleWindow(EntityUid console)
         _lock = _entMan.System<LockSystem>();
         _sprite = _entMan.System<SpriteSystem>();
 
-        _console = (console, _entMan.GetComponent<RoboticsConsoleComponent>(console), null);
-        _entMan.TryGetComponent(_console, out _console.Comp2);
-
         Cyborgs.OnItemSelected += args =>
         {
             if (Cyborgs[args.ItemIndex].Metadata is not string address)
@@ -66,6 +64,11 @@ public RoboticsConsoleWindow(EntityUid console)
         DestroyButton.StyleClasses.Add(StyleBase.ButtonCaution);
     }
 
+    public void SetEntity(EntityUid uid)
+    {
+        Entity = uid;
+    }
+
     public void UpdateState(RoboticsConsoleState state)
     {
         _cyborgs = state.Cyborgs;
@@ -81,7 +84,7 @@ public void UpdateState(RoboticsConsoleState state)
 
         PopulateData();
 
-        var locked = _lock.IsLocked((_console, _console.Comp2));
+        var locked = _lock.IsLocked(Entity);
         DangerZone.Visible = !locked;
         LockedMessage.Visible = locked;
     }
@@ -135,13 +138,19 @@ private void PopulateData()
 
         // how the turntables
         DisableButton.Disabled = !(data.HasBrain && data.CanDisable);
-        DestroyButton.Disabled = _timing.CurTime < _console.Comp1.NextDestroy;
     }
 
     protected override void FrameUpdate(FrameEventArgs args)
     {
         base.FrameUpdate(args);
 
-        DestroyButton.Disabled = _timing.CurTime < _console.Comp1.NextDestroy;
+        if (_entMan.TryGetComponent(Entity, out RoboticsConsoleComponent? console))
+        {
+            DestroyButton.Disabled = _timing.CurTime < console.NextDestroy;
+        }
+        else
+        {
+            DestroyButton.Disabled = true;
+        }
     }
 }
diff --git a/Content.Client/Rotation/RotationVisualizerSystem.cs b/Content.Client/Rotation/RotationVisualizerSystem.cs
index 6105c10c803..6d3be4d1c05 100644
--- a/Content.Client/Rotation/RotationVisualizerSystem.cs
+++ b/Content.Client/Rotation/RotationVisualizerSystem.cs
@@ -23,8 +23,8 @@ private void OnAppearanceChange(EntityUid uid, RotationVisualsComponent componen
         if (args.Sprite == null)
             return;
 
-        // If not defined, defaults to standing.
-        _appearance.TryGetData<RotationState>(uid, RotationVisuals.RotationState, out var state, args.Component);
+        if (!_appearance.TryGetData<RotationState>(uid, RotationVisuals.RotationState, out var state, args.Component))
+            return;
 
         switch (state)
         {
diff --git a/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs b/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs
index 8f1723d1f22..fe48b042f3e 100644
--- a/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs
+++ b/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs
@@ -30,17 +30,9 @@ public SalvageExpeditionConsoleBoundUserInterface(EntityUid owner, Enum uiKey) :
     protected override void Open()
     {
         base.Open();
-        _window = new OfferingWindow();
+        _window = this.CreateWindow<OfferingWindow>();
         _window.Title = Loc.GetString("salvage-expedition-window-title");
-        _window.OnClose += Close;
-        _window?.OpenCenteredLeft();
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        _window?.Dispose();
-        _window = null;
+        _window.OpenCenteredLeft();
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -110,12 +102,21 @@ protected override void UpdateState(BoundUserInterfaceState state)
 
             offering.AddContent(new Label
             {
-                Text = faction,
+                Text = string.IsNullOrWhiteSpace(Loc.GetString(_protoManager.Index<SalvageFactionPrototype>(faction).Description))
+                        ? LogAndReturnDefaultFactionDescription(faction)
+                        : Loc.GetString(_protoManager.Index<SalvageFactionPrototype>(faction).Description),
                 FontColorOverride = StyleNano.NanoGold,
                 HorizontalAlignment = Control.HAlignment.Left,
                 Margin = new Thickness(0f, 0f, 0f, 5f),
             });
 
+            string LogAndReturnDefaultFactionDescription(string faction)
+            {
+                Logger.Error($"Description is null or white space for SalvageFactionPrototype: {faction}");
+                return Loc.GetString(_protoManager.Index<SalvageFactionPrototype>(faction).ID);
+            }
+
+
             // Duration
             offering.AddContent(new Label
             {
@@ -140,12 +141,20 @@ protected override void UpdateState(BoundUserInterfaceState state)
 
             offering.AddContent(new Label
             {
-                Text = Loc.GetString(_protoManager.Index<SalvageBiomeModPrototype>(biome).ID),
+                Text = string.IsNullOrWhiteSpace(Loc.GetString(_protoManager.Index<SalvageBiomeModPrototype>(biome).Description))
+                        ? LogAndReturnDefaultBiomDescription(biome)
+                        : Loc.GetString(_protoManager.Index<SalvageBiomeModPrototype>(biome).Description),
                 FontColorOverride = StyleNano.NanoGold,
                 HorizontalAlignment = Control.HAlignment.Left,
                 Margin = new Thickness(0f, 0f, 0f, 5f),
             });
 
+            string LogAndReturnDefaultBiomDescription(string biome)
+            {
+                Logger.Error($"Description is null or white space for SalvageBiomeModPrototype: {biome}");
+                return Loc.GetString(_protoManager.Index<SalvageBiomeModPrototype>(biome).ID);
+            }
+
             // Modifiers
             offering.AddContent(new Label
             {
diff --git a/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs b/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs
index be3ba0e046e..bee8092ea8e 100644
--- a/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs
+++ b/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs
@@ -21,13 +21,9 @@ protected override void Open()
     {
         base.Open();
 
-        if (_window is null)
-        {
-            _window = new OfferingWindow();
-            _window.Title = Loc.GetString("salvage-magnet-window-title");
-            _window.OnClose += Close;
-            _window.OpenCenteredLeft();
-        }
+        _window = this.CreateWindow<OfferingWindow>();
+        _window.Title = Loc.GetString("salvage-magnet-window-title");
+        _window.OpenCenteredLeft();
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -112,15 +108,4 @@ protected override void UpdateState(BoundUserInterfaceState state)
             _window.AddOption(option);
         }
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-
-        if (disposing)
-        {
-            _window?.Close();
-            _window?.Dispose();
-        }
-    }
 }
diff --git a/Content.Client/Sandbox/SandboxSystem.cs b/Content.Client/Sandbox/SandboxSystem.cs
index 6a1129bb75d..8a4c93fa354 100644
--- a/Content.Client/Sandbox/SandboxSystem.cs
+++ b/Content.Client/Sandbox/SandboxSystem.cs
@@ -17,6 +17,7 @@ public sealed class SandboxSystem : SharedSandboxSystem
         [Dependency] private readonly IPlacementManager _placement = default!;
         [Dependency] private readonly ContentEyeSystem _contentEye = default!;
         [Dependency] private readonly SharedTransformSystem _transform = default!;
+        [Dependency] private readonly SharedMapSystem _mapSystem = default!;
 
         private bool _sandboxEnabled;
         public bool SandboxAllowed { get; private set; }
@@ -92,7 +93,7 @@ public bool Copy(ICommonSession? session, EntityCoordinates coords, EntityUid ui
                 && EntityManager.TryGetComponent(uid, out MetaDataComponent? comp)
                 && !comp.EntityDeleted)
             {
-                if (comp.EntityPrototype == null || comp.EntityPrototype.NoSpawn || comp.EntityPrototype.Abstract)
+                if (comp.EntityPrototype == null || comp.EntityPrototype.HideSpawnMenu || comp.EntityPrototype.Abstract)
                     return false;
 
                 if (_placement.Eraser)
@@ -109,7 +110,8 @@ public bool Copy(ICommonSession? session, EntityCoordinates coords, EntityUid ui
             }
 
             // Try copy tile.
-            if (!_map.TryFindGridAt(coords.ToMap(EntityManager, _transform), out _, out var grid) || !grid.TryGetTileRef(coords, out var tileRef))
+            
+            if (!_map.TryFindGridAt(_transform.ToMapCoordinates(coords), out var gridUid, out var grid) || !_mapSystem.TryGetTileRef(gridUid, grid, coords, out var tileRef))
                 return false;
 
             if (_placement.Eraser)
diff --git a/Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs b/Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs
index 086369aa264..b8b4fb8a746 100644
--- a/Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs
+++ b/Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Shuttles.Events;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Shuttles.BUI;
 
@@ -20,8 +21,7 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new IFFConsoleWindow();
-        _window.OnClose += Close;
+        _window = this.CreateWindow<IFFConsoleWindow>();
         _window.ShowIFF += SendIFFMessage;
         _window.ShowVessel += SendVesselMessage;
         _window.OpenCenteredLeft();
diff --git a/Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs b/Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs
index 4bd44a47a8e..f75759b042f 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 Robust.Client.UserInterface;
 using RadarConsoleWindow = Content.Client.Shuttles.UI.RadarConsoleWindow;
 
 namespace Content.Client.Shuttles.BUI;
@@ -20,18 +21,7 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new RadarConsoleWindow();
-        _window.OnClose += Close;
-        _window.OpenCentered();
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (disposing)
-        {
-            _window?.Dispose();
-        }
+        _window = this.CreateWindow<RadarConsoleWindow>();
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
diff --git a/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs b/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs
index af7b6055c80..e677181419e 100644
--- a/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs
+++ b/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Shuttles.BUIStates;
 using Content.Shared.Shuttles.Events;
 using JetBrains.Annotations;
+using Robust.Client.UserInterface;
 using Robust.Shared.Map;
 
 namespace Content.Client.Shuttles.BUI;
@@ -19,9 +20,7 @@ public ShuttleConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owne
     protected override void Open()
     {
         base.Open();
-        _window = new ShuttleConsoleWindow();
-        _window.OpenCentered();
-        _window.OnClose += Close;
+        _window = this.CreateWindow<ShuttleConsoleWindow>();
 
         _window.RequestFTL += OnFTLRequest;
         _window.RequestBeaconFTL += OnFTLBeaconRequest;
diff --git a/Content.Client/Shuttles/FtlArrivalOverlay.cs b/Content.Client/Shuttles/FtlArrivalOverlay.cs
new file mode 100644
index 00000000000..f24a1e96488
--- /dev/null
+++ b/Content.Client/Shuttles/FtlArrivalOverlay.cs
@@ -0,0 +1,82 @@
+using System.Numerics;
+using Content.Shared.Shuttles.Components;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Shared.Enums;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Client.Shuttles;
+
+/// <summary>
+/// Plays a visualization whenever a shuttle is arriving from FTL.
+/// </summary>
+public sealed class FtlArrivalOverlay : Overlay
+{
+    public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowEntities;
+
+    private EntityLookupSystem _lookups;
+    private SharedMapSystem _maps;
+    private SharedTransformSystem _transforms;
+    private SpriteSystem _sprites;
+    [Dependency] private readonly IEntityManager _entManager = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IPrototypeManager _protos = default!;
+
+    private readonly HashSet<Entity<FtlVisualizerComponent>> _visualizers = new();
+
+    private ShaderInstance _shader;
+
+    public FtlArrivalOverlay()
+    {
+        IoCManager.InjectDependencies(this);
+        _lookups = _entManager.System<EntityLookupSystem>();
+        _transforms = _entManager.System<SharedTransformSystem>();
+        _maps = _entManager.System<SharedMapSystem>();
+        _sprites = _entManager.System<SpriteSystem>();
+
+        _shader = _protos.Index<ShaderPrototype>("unshaded").Instance();
+    }
+
+    protected override bool BeforeDraw(in OverlayDrawArgs args)
+    {
+        _visualizers.Clear();
+        _lookups.GetEntitiesOnMap(args.MapId, _visualizers);
+
+        return _visualizers.Count > 0;
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        args.WorldHandle.UseShader(_shader);
+
+        foreach (var (uid, comp) in _visualizers)
+        {
+            var grid = comp.Grid;
+
+            if (!_entManager.TryGetComponent(grid, out MapGridComponent? mapGrid))
+                continue;
+
+            var texture = _sprites.GetFrame(comp.Sprite, TimeSpan.FromSeconds(comp.Elapsed), loop: false);
+            comp.Elapsed += (float) _timing.FrameTime.TotalSeconds;
+
+            // Need to manually transform the viewport in terms of the visualizer entity as the grid isn't in position.
+            var (_, _, worldMatrix, invMatrix) = _transforms.GetWorldPositionRotationMatrixWithInv(uid);
+            args.WorldHandle.SetTransform(worldMatrix);
+            var localAABB = invMatrix.TransformBox(args.WorldBounds);
+
+            var tilesEnumerator = _maps.GetLocalTilesEnumerator(grid, mapGrid, localAABB);
+
+            while (tilesEnumerator.MoveNext(out var tile))
+            {
+                var bounds = _lookups.GetLocalBounds(tile, mapGrid.TileSize);
+
+                args.WorldHandle.DrawTextureRect(texture, bounds);
+            }
+        }
+
+        args.WorldHandle.UseShader(null);
+        args.WorldHandle.SetTransform(Matrix3x2.Identity);
+    }
+}
diff --git a/Content.Client/Shuttles/Systems/ShuttleSystem.Console.cs b/Content.Client/Shuttles/Systems/ShuttleSystem.Console.cs
index c134b7157c4..eb9ec285f8c 100644
--- a/Content.Client/Shuttles/Systems/ShuttleSystem.Console.cs
+++ b/Content.Client/Shuttles/Systems/ShuttleSystem.Console.cs
@@ -35,9 +35,9 @@ public MapCoordinates GetMapCoordinates(IMapObject mapObj)
         switch (mapObj)
         {
             case ShuttleBeaconObject beacon:
-                return GetCoordinates(beacon.Coordinates).ToMap(EntityManager, XformSystem);
+                return XformSystem.ToMapCoordinates(GetCoordinates(beacon.Coordinates));
             case ShuttleExclusionObject exclusion:
-                return GetCoordinates(exclusion.Coordinates).ToMap(EntityManager, XformSystem);
+                return XformSystem.ToMapCoordinates(GetCoordinates(exclusion.Coordinates));
             case GridMapObject grid:
                 var gridXform = Transform(grid.Entity);
 
diff --git a/Content.Client/Shuttles/Systems/ShuttleSystem.EmergencyConsole.cs b/Content.Client/Shuttles/Systems/ShuttleSystem.EmergencyConsole.cs
index d5154a87bef..73c11de2795 100644
--- a/Content.Client/Shuttles/Systems/ShuttleSystem.EmergencyConsole.cs
+++ b/Content.Client/Shuttles/Systems/ShuttleSystem.EmergencyConsole.cs
@@ -38,9 +38,8 @@ public bool EnableShuttlePosition
     private bool _enableShuttlePosition;
     private EmergencyShuttleOverlay? _overlay;
 
-    public override void Initialize()
+    private void InitializeEmergency()
     {
-        base.Initialize();
         SubscribeNetworkEvent<EmergencyShuttlePositionMessage>(OnShuttlePosMessage);
     }
 
diff --git a/Content.Client/Shuttles/Systems/ShuttleSystem.cs b/Content.Client/Shuttles/Systems/ShuttleSystem.cs
new file mode 100644
index 00000000000..a2c048ff90e
--- /dev/null
+++ b/Content.Client/Shuttles/Systems/ShuttleSystem.cs
@@ -0,0 +1,21 @@
+using Robust.Client.Graphics;
+
+namespace Content.Client.Shuttles.Systems;
+
+public sealed partial class ShuttleSystem
+{
+    [Dependency] private readonly IOverlayManager _overlays = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        InitializeEmergency();
+        _overlays.AddOverlay(new FtlArrivalOverlay());
+    }
+
+    public override void Shutdown()
+    {
+        base.Shutdown();
+        _overlays.RemoveOverlay<FtlArrivalOverlay>();
+    }
+}
diff --git a/Content.Client/Shuttles/UI/MapScreen.xaml.cs b/Content.Client/Shuttles/UI/MapScreen.xaml.cs
index 10800b8c5f7..0d7df38b912 100644
--- a/Content.Client/Shuttles/UI/MapScreen.xaml.cs
+++ b/Content.Client/Shuttles/UI/MapScreen.xaml.cs
@@ -261,7 +261,7 @@ private void RebuildMapObjects()
             ourMap = shuttleXform.MapID;
         }
 
-        while (mapComps.MoveNext(out var mapComp, out var mapXform, out var mapMetadata))
+        while (mapComps.MoveNext(out var mapUid, out var mapComp, out var mapXform, out var mapMetadata))
         {
             if (_console != null && !_shuttles.CanFTLTo(_shuttleEntity.Value, mapComp.MapId, _console.Value))
             {
@@ -311,7 +311,7 @@ private void RebuildMapObjects()
             };
 
             _mapHeadings.Add(mapComp.MapId, gridContents);
-            foreach (var grid in _mapManager.GetAllMapGrids(mapComp.MapId))
+            foreach (var grid in _mapManager.GetAllGrids(mapComp.MapId))
             {
                 _entManager.TryGetComponent(grid.Owner, out IFFComponent? iffComp);
 
@@ -327,8 +327,10 @@ private void RebuildMapObjects()
                 {
                     AddMapObject(mapComp.MapId, gridObj);
                 }
-                else if (!_shuttles.IsBeaconMap(_mapManager.GetMapEntityId(mapComp.MapId)) && (iffComp == null ||
-                         (iffComp.Flags & IFFFlags.Hide) == 0x0))
+                // If we can show it then add it to pending.
+                else if (!_shuttles.IsBeaconMap(mapUid) && (iffComp == null ||
+                         (iffComp.Flags & IFFFlags.Hide) == 0x0) &&
+                         !gridObj.HideButton)
                 {
                     _pendingMapObjects.Add((mapComp.MapId, gridObj));
                 }
@@ -336,11 +338,17 @@ private void RebuildMapObjects()
 
             foreach (var (beacon, _) in _shuttles.GetExclusions(mapComp.MapId, _exclusions))
             {
+                if (beacon.HideButton)
+                    continue;
+
                 _pendingMapObjects.Add((mapComp.MapId, beacon));
             }
 
             foreach (var (beacon, _) in _shuttles.GetBeacons(mapComp.MapId, _beacons))
             {
+                if (beacon.HideButton)
+                    continue;
+
                 _pendingMapObjects.Add((mapComp.MapId, beacon));
             }
 
@@ -425,9 +433,6 @@ private void AddMapObject(MapId mapId, IMapObject mapObj)
         var existing = _mapObjects.GetOrNew(mapId);
         existing.Add(mapObj);
 
-        if (mapObj.HideButton)
-            return;
-
         var gridContents = _mapHeadings[mapId];
 
         var gridButton = new Button()
diff --git a/Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs b/Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs
index 31f0eecad79..61ae0699266 100644
--- a/Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs
+++ b/Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs
@@ -107,7 +107,7 @@ protected override void Draw(DrawingHandleScreen handle)
         DrawCircles(handle);
         var gridNent = EntManager.GetNetEntity(GridEntity);
         var mapPos = _xformSystem.ToMapCoordinates(_coordinates.Value);
-        var ourGridMatrix = _xformSystem.GetWorldMatrix(gridXform.Owner);
+        var ourGridMatrix = _xformSystem.GetWorldMatrix(GridEntity.Value);
         var dockMatrix = Matrix3Helpers.CreateTransform(_coordinates.Value.Position, Angle.Zero);
         var worldFromDock = Matrix3x2.Multiply(dockMatrix, ourGridMatrix);
 
diff --git a/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs b/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs
index 8bd4a338cb0..53ad4a0b23a 100644
--- a/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs
+++ b/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs
@@ -519,7 +519,7 @@ private void AddMapObject(List<Vector2> edges, List<Vector2> verts, ValueList<Ve
             if (mapO is not ShuttleBeaconObject beacon)
                 continue;
 
-            var beaconCoords = EntManager.GetCoordinates(beacon.Coordinates).ToMap(EntManager, _xformSystem);
+            var beaconCoords = _xformSystem.ToMapCoordinates(EntManager.GetCoordinates(beacon.Coordinates));
             var position = Vector2.Transform(beaconCoords.Position, mapTransform);
             var localPos = ScalePosition(position with {Y = -position.Y});
 
diff --git a/Content.Client/Silicons/Borgs/BorgBoundUserInterface.cs b/Content.Client/Silicons/Borgs/BorgBoundUserInterface.cs
index 3cc2a35d795..ed9bf40a481 100644
--- a/Content.Client/Silicons/Borgs/BorgBoundUserInterface.cs
+++ b/Content.Client/Silicons/Borgs/BorgBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Silicons.Borgs;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Silicons.Borgs;
 
@@ -18,9 +19,8 @@ protected override void Open()
     {
         base.Open();
 
-        var owner = Owner;
-
-        _menu = new BorgMenu(owner);
+        _menu = this.CreateWindow<BorgMenu>();
+        _menu.SetEntity(Owner);
 
         _menu.BrainButtonPressed += () =>
         {
@@ -41,10 +41,6 @@ protected override void Open()
         {
             SendMessage(new BorgRemoveModuleBuiMessage(EntMan.GetNetEntity(module)));
         };
-
-        _menu.OnClose += Close;
-
-        _menu.OpenCentered();
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -55,12 +51,4 @@ protected override void UpdateState(BoundUserInterfaceState state)
             return;
         _menu?.UpdateState(msg);
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing)
-            return;
-        _menu?.Dispose();
-    }
 }
diff --git a/Content.Client/Silicons/Borgs/BorgMenu.xaml b/Content.Client/Silicons/Borgs/BorgMenu.xaml
index 7d8fd9fe57d..4cc2e41a8fb 100644
--- a/Content.Client/Silicons/Borgs/BorgMenu.xaml
+++ b/Content.Client/Silicons/Borgs/BorgMenu.xaml
@@ -10,7 +10,7 @@
                   VerticalExpand="True">
         <BoxContainer Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True" Margin="15 10 15 15">
             <BoxContainer Orientation="Horizontal">
-                <ProgressBar Name="ChargeBar" Access="Public" HorizontalExpand="True" MinValue="0" MaxValue="1">
+                <ProgressBar Name="ChargeBar" Access="Public" HorizontalExpand="True" MinValue="0" Value="1" MaxValue="1">
                     <Label Name="ChargeLabel" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5 0 0 0"/>
                 </ProgressBar>
                 <Control MinWidth="5"/>
diff --git a/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs b/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs
index 474a83b4530..f6a861aa057 100644
--- a/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs
+++ b/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs
@@ -21,25 +21,33 @@ public sealed partial class BorgMenu : FancyWindow
     public Action<string>? NameChanged;
     public Action<EntityUid>? RemoveModuleButtonPressed;
 
-    private readonly BorgChassisComponent? _chassis;
-    public readonly EntityUid Entity;
     public float AccumulatedTime;
     private string _lastValidName;
     private List<EntityUid> _modules = new();
 
-    public BorgMenu(EntityUid entity)
+    public EntityUid Entity;
+
+    public BorgMenu()
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
 
-        Entity = entity;
+        _lastValidName = NameLineEdit.Text;
 
-        if (_entity.TryGetComponent<BorgChassisComponent>(Entity, out var chassis))
-            _chassis = chassis;
+        EjectBatteryButton.OnPressed += _ => EjectBatteryButtonPressed?.Invoke();
+        BrainButton.OnPressed += _ => BrainButtonPressed?.Invoke();
 
+        NameLineEdit.OnTextChanged += OnNameChanged;
+        NameLineEdit.OnTextEntered += OnNameEntered;
+        NameLineEdit.OnFocusExit += OnNameFocusExit;
+
+        UpdateBrainButton();
+    }
+
+    public void SetEntity(EntityUid entity)
+    {
+        Entity = entity;
         BorgSprite.SetEntity(entity);
-        ChargeBar.MaxValue = 1f;
-        ChargeBar.Value = 1f;
 
         if (_entity.TryGetComponent<NameIdentifierComponent>(Entity, out var nameIdentifierComponent))
         {
@@ -55,17 +63,6 @@ public BorgMenu(EntityUid entity)
             NameIdentifierLabel.Visible = false;
             NameLineEdit.Text = _entity.GetComponent<MetaDataComponent>(Entity).EntityName;
         }
-
-        _lastValidName = NameLineEdit.Text;
-
-        EjectBatteryButton.OnPressed += _ => EjectBatteryButtonPressed?.Invoke();
-        BrainButton.OnPressed += _ => BrainButtonPressed?.Invoke();
-
-        NameLineEdit.OnTextChanged += OnNameChanged;
-        NameLineEdit.OnTextEntered += OnNameEntered;
-        NameLineEdit.OnFocusExit += OnNameFocusExit;
-
-        UpdateBrainButton();
     }
 
     protected override void FrameUpdate(FrameEventArgs args)
@@ -89,7 +86,7 @@ public void UpdateState(BorgBuiState state)
 
     private void UpdateBrainButton()
     {
-        if (_chassis?.BrainEntity is { } brain)
+        if (_entity.TryGetComponent(Entity, out BorgChassisComponent? chassis) && chassis.BrainEntity is { } brain)
         {
             BrainButton.Text = _entity.GetComponent<MetaDataComponent>(brain).EntityName;
             BrainView.Visible = true;
@@ -108,17 +105,17 @@ private void UpdateBrainButton()
 
     private void UpdateModulePanel()
     {
-        if (_chassis == null)
+        if (!_entity.TryGetComponent(Entity, out BorgChassisComponent? chassis))
             return;
 
         ModuleCounter.Text = Loc.GetString("borg-ui-module-counter",
-            ("actual", _chassis.ModuleCount),
-            ("max", _chassis.MaxModules));
+            ("actual", chassis.ModuleCount),
+            ("max", chassis.MaxModules));
 
-        if (_chassis.ModuleContainer.Count == _modules.Count)
+        if (chassis.ModuleContainer.Count == _modules.Count)
         {
             var isSame = true;
-            foreach (var module in _chassis.ModuleContainer.ContainedEntities)
+            foreach (var module in chassis.ModuleContainer.ContainedEntities)
             {
                 if (_modules.Contains(module))
                     continue;
@@ -132,7 +129,7 @@ private void UpdateModulePanel()
 
         ModuleContainer.Children.Clear();
         _modules.Clear();
-        foreach (var module in _chassis.ModuleContainer.ContainedEntities)
+        foreach (var module in chassis.ModuleContainer.ContainedEntities)
         {
             var control = new BorgModuleControl(module, _entity);
             control.RemoveButtonPressed += () =>
diff --git a/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawContainer.xaml b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawContainer.xaml
new file mode 100644
index 00000000000..1bcac4bca65
--- /dev/null
+++ b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawContainer.xaml
@@ -0,0 +1,31 @@
+<BoxContainer
+    xmlns="https://spacestation14.io"
+    xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+    xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    HorizontalExpand="True"
+    Orientation="Vertical"
+    >
+    <customControls:HSeparator></customControls:HSeparator>
+    <BoxContainer>
+        <Label StyleClasses="SiliconLawPositionLabel" Name="PositionText" Margin="5 0 0 0"></Label>
+        <PanelContainer
+            Margin="20 10 0 0"
+            MinHeight="128"
+        >
+            <PanelContainer.PanelOverride>
+                <graphics:StyleBoxFlat BackgroundColor="#1B1B1B"></graphics:StyleBoxFlat>
+            </PanelContainer.PanelOverride>
+            <BoxContainer Orientation="Horizontal" SeparationOverride="5">
+                <TextEdit Name="LawContent" HorizontalExpand="True" Editable="True" MinWidth="500" MinHeight="80"></TextEdit>
+            </BoxContainer>
+        </PanelContainer>
+    </BoxContainer>
+    <BoxContainer Orientation="Horizontal" Margin="0 5 0 0" MaxHeight="64" Align="Begin">
+        <Button Name="MoveUp" Text="{Loc silicon-law-ui-minus-one}" StyleClasses="OpenRight"></Button>
+        <Button Name="MoveDown" Text="{Loc silicon-law-ui-plus-one}" StyleClasses="OpenLeft"></Button>
+        <CheckBox Name="Corrupted" Text="{Loc silicon-law-ui-check-corrupted}" ToolTip="{Loc silicon-law-ui-check-corrupted-tooltip}"></CheckBox>
+    </BoxContainer>
+    <BoxContainer Orientation="Horizontal" Align="End" Margin="0 10 5 10">
+        <Button Name="Delete" Text="{Loc silicon-law-ui-delete}" ModulateSelfOverride="Red"></Button>
+    </BoxContainer>
+</BoxContainer>
diff --git a/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawContainer.xaml.cs b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawContainer.xaml.cs
new file mode 100644
index 00000000000..2e44b820df9
--- /dev/null
+++ b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawContainer.xaml.cs
@@ -0,0 +1,61 @@
+using Content.Shared.Silicons.Laws;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Silicons.Laws.SiliconLawEditUi;
+
+[GenerateTypedNameReferences]
+public sealed partial class SiliconLawContainer : BoxContainer
+{
+    public const string StyleClassSiliconLawPositionLabel = "SiliconLawPositionLabel";
+
+    public static readonly string CorruptedString =
+        Loc.GetString("ion-storm-law-scrambled-number", ("length", 5));
+
+    private SiliconLaw? _law;
+
+    public event Action<SiliconLaw>? MoveLawUp;
+    public event Action<SiliconLaw>? MoveLawDown;
+    public event Action<SiliconLaw>? DeleteAction;
+
+
+    public SiliconLawContainer()
+    {
+        RobustXamlLoader.Load(this);
+
+        MoveUp.OnPressed += _ => MoveLawUp?.Invoke(_law!);
+        MoveDown.OnPressed += _ => MoveLawDown?.Invoke(_law!);
+        Corrupted.OnPressed += _ =>
+        {
+            if (Corrupted.Pressed)
+            {
+                _law!.LawIdentifierOverride = CorruptedString;
+            }
+            else
+            {
+                _law!.LawIdentifierOverride = null;
+            }
+        };
+
+        LawContent.OnTextChanged += _ => _law!.LawString = Rope.Collapse(LawContent.TextRope).Trim();
+        LawContent.Placeholder = new Rope.Leaf(Loc.GetString("silicon-law-ui-placeholder"));
+        Delete.OnPressed += _ => DeleteAction?.Invoke(_law!);
+    }
+
+    public void SetLaw(SiliconLaw law)
+    {
+        _law = law;
+        LawContent.TextRope = new Rope.Leaf(Loc.GetString(law.LawString));
+        PositionText.Text = law.Order.ToString();
+        if (!string.IsNullOrEmpty(law.LawIdentifierOverride))
+        {
+            Corrupted.Pressed = true;
+        }
+        else
+        {
+            Corrupted.Pressed = false;
+        }
+    }
+}
diff --git a/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawEui.cs b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawEui.cs
new file mode 100644
index 00000000000..a4d59d1f315
--- /dev/null
+++ b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawEui.cs
@@ -0,0 +1,38 @@
+using Content.Client.Eui;
+using Content.Shared.Eui;
+using Content.Shared.Silicons.Laws;
+
+namespace Content.Client.Silicons.Laws.SiliconLawEditUi;
+
+public sealed class SiliconLawEui : BaseEui
+{
+    public readonly EntityManager _entityManager = default!;
+
+    private SiliconLawUi _siliconLawUi;
+    private EntityUid _target;
+
+    public SiliconLawEui()
+    {
+        _entityManager = IoCManager.Resolve<EntityManager>();
+
+        _siliconLawUi = new SiliconLawUi();
+        _siliconLawUi.OnClose += () => SendMessage(new CloseEuiMessage());
+        _siliconLawUi.Save.OnPressed += _ => SendMessage(new SiliconLawsSaveMessage(_siliconLawUi.GetLaws(), _entityManager.GetNetEntity(_target)));
+    }
+
+    public override void HandleState(EuiStateBase state)
+    {
+        if (state is not SiliconLawsEuiState s)
+        {
+            return;
+        }
+
+        _target = _entityManager.GetEntity(s.Target);
+        _siliconLawUi.SetLaws(s.Laws);
+    }
+
+    public override void Opened()
+    {
+        _siliconLawUi.OpenCentered();
+    }
+}
diff --git a/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawUi.xaml b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawUi.xaml
new file mode 100644
index 00000000000..19dcbac6202
--- /dev/null
+++ b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawUi.xaml
@@ -0,0 +1,22 @@
+<controls:FancyWindow
+    xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+    Title="{Loc silicon-law-ui-title}"
+    MinSize="560 400"
+>
+    <!-->
+    this shit does not layout properly unless I put the horizontal boxcontainer inside of a vertical one
+    ????
+    <!-->
+    <BoxContainer Orientation="Vertical">
+        <BoxContainer Orientation="Horizontal" Align="End">
+            <Button Name="NewLawButton" Text="{Loc silicon-law-ui-new-law}" MaxSize="256 64" StyleClasses="OpenRight"></Button>
+            <Button Name="Save" Text="{Loc silicon-law-ui-save}" MaxSize="256 64" Access="Public" StyleClasses="OpenLeft"></Button>
+        </BoxContainer>
+    </BoxContainer>
+    <BoxContainer Orientation="Vertical" Margin="4 60 0 0">
+        <ScrollContainer VerticalExpand="True" HorizontalExpand="True" HScrollEnabled="False">
+            <BoxContainer Orientation="Vertical" Name="LawContainer" Access="Public" VerticalExpand="True" />
+        </ScrollContainer>
+    </BoxContainer>
+</controls:FancyWindow>
diff --git a/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawUi.xaml.cs b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawUi.xaml.cs
new file mode 100644
index 00000000000..372961ea9a3
--- /dev/null
+++ b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawUi.xaml.cs
@@ -0,0 +1,89 @@
+using System.Linq;
+using Content.Client.UserInterface.Controls;
+using Content.Shared.FixedPoint;
+using Content.Shared.Silicons.Laws;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Silicons.Laws.SiliconLawEditUi;
+
+[GenerateTypedNameReferences]
+public sealed partial class SiliconLawUi : FancyWindow
+{
+    private List<SiliconLaw> _laws = new();
+
+    public SiliconLawUi()
+    {
+        RobustXamlLoader.Load(this);
+        NewLawButton.OnPressed += _ => AddNewLaw();
+    }
+
+    private void AddNewLaw()
+    {
+        var newLaw = new SiliconLaw();
+        newLaw.Order = FixedPoint2.New(_laws.Count + 1);
+        _laws.Add(newLaw);
+        SetLaws(_laws);
+    }
+
+    public void SetLaws(List<SiliconLaw> sLaws)
+    {
+        _laws = sLaws;
+        LawContainer.RemoveAllChildren();
+        foreach (var law in sLaws.OrderBy(l => l.Order))
+        {
+            var lawControl = new SiliconLawContainer();
+            lawControl.SetLaw(law);
+            lawControl.MoveLawDown += MoveLawDown;
+            lawControl.MoveLawUp += MoveLawUp;
+            lawControl.DeleteAction += DeleteLaw;
+
+            LawContainer.AddChild(lawControl);
+        }
+    }
+
+    public void DeleteLaw(SiliconLaw law)
+    {
+        _laws.Remove(law);
+        SetLaws(_laws);
+    }
+
+    public void MoveLawDown(SiliconLaw law)
+    {
+        if (_laws.Count == 0)
+        {
+            return;
+        }
+
+        var index = _laws.IndexOf(law);
+        if (index == -1)
+        {
+            return;
+        }
+
+        _laws[index].Order += FixedPoint2.New(1);
+        SetLaws(_laws);
+    }
+
+    public void MoveLawUp(SiliconLaw law)
+    {
+        if (_laws.Count == 0)
+        {
+            return;
+        }
+
+        var index = _laws.IndexOf(law);
+        if (index == -1)
+        {
+            return;
+        }
+
+        _laws[index].Order += FixedPoint2.New(-1);
+        SetLaws(_laws);
+    }
+
+    public List<SiliconLaw> GetLaws()
+    {
+        return _laws;
+    }
+}
diff --git a/Content.Client/Silicons/Laws/Ui/SiliconLawBoundUserInterface.cs b/Content.Client/Silicons/Laws/Ui/SiliconLawBoundUserInterface.cs
index d150735fa11..56216b91847 100644
--- a/Content.Client/Silicons/Laws/Ui/SiliconLawBoundUserInterface.cs
+++ b/Content.Client/Silicons/Laws/Ui/SiliconLawBoundUserInterface.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Silicons.Laws;
 using Content.Shared.Silicons.Laws.Components;
 using JetBrains.Annotations;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Silicons.Laws.Ui;
 
@@ -22,18 +23,7 @@ protected override void Open()
     {
         base.Open();
 
-        _menu = new();
-
-        _menu.OnClose += Close;
-        _menu.OpenCentered();
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing)
-            return;
-        _menu?.Close();
+        _menu = this.CreateWindow<SiliconLawMenu>();
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
diff --git a/Content.Client/Singularity/SingularityOverlay.cs b/Content.Client/Singularity/SingularityOverlay.cs
index c7c6aa2b5b4..e71b6e96b85 100644
--- a/Content.Client/Singularity/SingularityOverlay.cs
+++ b/Content.Client/Singularity/SingularityOverlay.cs
@@ -100,6 +100,8 @@ protected override void Draw(in OverlayDrawArgs args)
         /// </summary>
         private void OnProjectFromScreenToMap(ref PixelToMapEvent args)
         {   // Mostly copypasta from the singularity shader.
+            if (args.Viewport.Eye == null)
+                return;
             var maxDistance = MaxDistance * EyeManager.PixelsPerMeter;
             var finalCoords = args.VisiblePosition;
 
@@ -112,10 +114,11 @@ private void OnProjectFromScreenToMap(ref PixelToMapEvent args)
                 // and in local space 'Y' is measured in pixels from the top of the viewport.
                 // As a minor optimization the locations of the singularities are transformed into fragment space in BeforeDraw so the shader doesn't need to.
                 // We need to undo that here or this will transform the cursor position as if the singularities were mirrored vertically relative to the center of the viewport.
+
                 var localPosition = _positions[i];
                 localPosition.Y = args.Viewport.Size.Y - localPosition.Y;
                 var delta = args.VisiblePosition - localPosition;
-                var distance = (delta / args.Viewport.RenderScale).Length();
+                var distance = (delta / (args.Viewport.RenderScale * args.Viewport.Eye.Scale)).Length();
 
                 var deformation = _intensities[i] / MathF.Pow(distance, _falloffPowers[i]);
 
diff --git a/Content.Client/SprayPainter/UI/SprayPainterBoundUserInterface.cs b/Content.Client/SprayPainter/UI/SprayPainterBoundUserInterface.cs
index e8442d23908..7d6a6cf2a5a 100644
--- a/Content.Client/SprayPainter/UI/SprayPainterBoundUserInterface.cs
+++ b/Content.Client/SprayPainter/UI/SprayPainterBoundUserInterface.cs
@@ -1,6 +1,6 @@
 using Content.Shared.SprayPainter;
 using Content.Shared.SprayPainter.Components;
-using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 
 namespace Content.Client.SprayPainter.UI;
@@ -10,9 +10,6 @@ public sealed class SprayPainterBoundUserInterface : BoundUserInterface
     [ViewVariables]
     private SprayPainterWindow? _window;
 
-    [ViewVariables]
-    private SprayPainterSystem? _painter;
-
     public SprayPainterBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
     {
     }
@@ -21,27 +18,15 @@ protected override void Open()
     {
         base.Open();
 
-        if (!EntMan.TryGetComponent<SprayPainterComponent>(Owner, out var comp))
-            return;
-
-        _window = new SprayPainterWindow();
+        _window = this.CreateWindow<SprayPainterWindow>();
 
-        _painter = EntMan.System<SprayPainterSystem>();
-
-        _window.OnClose += Close;
         _window.OnSpritePicked = OnSpritePicked;
         _window.OnColorPicked = OnColorPicked;
 
-        _window.Populate(_painter.Entries, comp.Index, comp.PickedColor, comp.ColorPalette);
-
-        _window.OpenCentered();
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-
-        _window?.Dispose();
+        if (EntMan.TryGetComponent(Owner, out SprayPainterComponent? comp))
+        {
+            _window.Populate(EntMan.System<SprayPainterSystem>().Entries, comp.Index, comp.PickedColor, comp.ColorPalette);
+        }
     }
 
     private void OnSpritePicked(ItemList.ItemListSelectedEventArgs args)
diff --git a/Content.Client/Sprite/ContentSpriteSystem.cs b/Content.Client/Sprite/ContentSpriteSystem.cs
new file mode 100644
index 00000000000..da0547666b2
--- /dev/null
+++ b/Content.Client/Sprite/ContentSpriteSystem.cs
@@ -0,0 +1,218 @@
+using System.IO;
+using System.Numerics;
+using System.Threading;
+using System.Threading.Tasks;
+using Content.Client.Administration.Managers;
+using Content.Shared.Database;
+using Content.Shared.Verbs;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Shared.ContentPack;
+using Robust.Shared.Timing;
+using Robust.Shared.Utility;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.PixelFormats;
+using Color = Robust.Shared.Maths.Color;
+
+namespace Content.Client.Sprite;
+
+public sealed class ContentSpriteSystem : EntitySystem
+{
+    [Dependency] private readonly IClientAdminManager _adminManager = default!;
+    [Dependency] private readonly IClyde _clyde = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IResourceManager _resManager = default!;
+    [Dependency] private readonly IUserInterfaceManager _ui = default!;
+
+    private ContentSpriteControl _control = new();
+
+    public static readonly ResPath Exports = new ResPath("/Exports");
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _resManager.UserData.CreateDir(Exports);
+        _ui.RootControl.AddChild(_control);
+        SubscribeLocalEvent<GetVerbsEvent<Verb>>(GetVerbs);
+    }
+
+    public override void Shutdown()
+    {
+        base.Shutdown();
+
+        foreach (var queued in _control._queuedTextures)
+        {
+            queued.Tcs.SetCanceled();
+        }
+
+        _control._queuedTextures.Clear();
+
+        _ui.RootControl.RemoveChild(_control);
+    }
+
+    /// <summary>
+    /// Exports sprites for all directions
+    /// </summary>
+    public async Task Export(EntityUid entity, bool includeId = true, CancellationToken cancelToken = default)
+    {
+        var tasks = new Task[4];
+        var i = 0;
+
+        foreach (var dir in new Direction[]
+                 {
+                     Direction.South,
+                     Direction.East,
+                     Direction.North,
+                     Direction.West,
+                 })
+        {
+            tasks[i++] = Export(entity, dir, includeId: includeId, cancelToken);
+        }
+
+        await Task.WhenAll(tasks);
+    }
+
+    /// <summary>
+    /// Exports the sprite for a particular direction.
+    /// </summary>
+    public async Task Export(EntityUid entity, Direction direction, bool includeId = true, CancellationToken cancelToken = default)
+    {
+        if (!_timing.IsFirstTimePredicted)
+            return;
+
+        if (!TryComp(entity, out SpriteComponent? spriteComp))
+            return;
+
+        // Don't want to wait for engine pr
+        var size = Vector2i.Zero;
+
+        foreach (var layer in spriteComp.AllLayers)
+        {
+            if (!layer.Visible)
+                continue;
+
+            size = Vector2i.ComponentMax(size, layer.PixelSize);
+        }
+
+        // Stop asserts
+        if (size.Equals(Vector2i.Zero))
+            return;
+
+        var texture = _clyde.CreateRenderTarget(new Vector2i(size.X, size.Y), new RenderTargetFormatParameters(RenderTargetColorFormat.Rgba8Srgb), name: "export");
+        var tcs = new TaskCompletionSource(cancelToken);
+
+        _control._queuedTextures.Enqueue((texture, direction, entity, includeId, tcs));
+
+        await tcs.Task;
+    }
+
+    private void GetVerbs(GetVerbsEvent<Verb> ev)
+    {
+        if (!_adminManager.IsAdmin())
+            return;
+
+        Verb verb = new()
+        {
+            Text = Loc.GetString("export-entity-verb-get-data-text"),
+            Category = VerbCategory.Debug,
+            Act = () =>
+            {
+                Export(ev.Target);
+            },
+        };
+
+        ev.Verbs.Add(verb);
+    }
+
+    /// <summary>
+    /// This is horrible. I asked PJB if there's an easy way to render straight to a texture outside of the render loop
+    /// and she also mentioned this as a bad possibility.
+    /// </summary>
+    private sealed class ContentSpriteControl : Control
+    {
+        [Dependency] private readonly IEntityManager _entManager = default!;
+        [Dependency] private readonly ILogManager _logMan = default!;
+        [Dependency] private readonly IResourceManager _resManager = default!;
+
+        internal Queue<(
+            IRenderTexture Texture,
+            Direction Direction,
+            EntityUid Entity,
+            bool IncludeId,
+            TaskCompletionSource Tcs)> _queuedTextures = new();
+
+        private ISawmill _sawmill;
+
+        public ContentSpriteControl()
+        {
+            IoCManager.InjectDependencies(this);
+            _sawmill = _logMan.GetSawmill("sprite.export");
+        }
+
+        protected override void Draw(DrawingHandleScreen handle)
+        {
+            base.Draw(handle);
+
+            while (_queuedTextures.TryDequeue(out var queued))
+            {
+                if (queued.Tcs.Task.IsCanceled)
+                    continue;
+
+                try
+                {
+                    if (!_entManager.TryGetComponent(queued.Entity, out MetaDataComponent? metadata))
+                        continue;
+
+                    var filename = metadata.EntityName;
+                    var result = queued;
+
+                    handle.RenderInRenderTarget(queued.Texture, () =>
+                    {
+                        handle.DrawEntity(result.Entity, result.Texture.Size / 2, Vector2.One, Angle.Zero,
+                            overrideDirection: result.Direction);
+                    }, Color.Transparent);
+
+                    ResPath fullFileName;
+
+                    if (queued.IncludeId)
+                    {
+                        fullFileName = Exports / $"{filename}-{queued.Direction}-{queued.Entity}.png";
+                    }
+                    else
+                    {
+                        fullFileName = Exports / $"{filename}-{queued.Direction}.png";
+                    }
+
+                    queued.Texture.CopyPixelsToMemory<Rgba32>(image =>
+                    {
+                        if (_resManager.UserData.Exists(fullFileName))
+                        {
+                            _sawmill.Info($"Found existing file {fullFileName} to replace.");
+                            _resManager.UserData.Delete(fullFileName);
+                        }
+
+                        using var file =
+                            _resManager.UserData.Open(fullFileName, FileMode.CreateNew, FileAccess.Write,
+                                FileShare.None);
+
+                        image.SaveAsPng(file);
+                    });
+
+                    _sawmill.Info($"Saved screenshot to {fullFileName}");
+                    queued.Tcs.SetResult();
+                }
+                catch (Exception exc)
+                {
+                    queued.Texture.Dispose();
+
+                    if (!string.IsNullOrEmpty(exc.StackTrace))
+                        _sawmill.Fatal(exc.StackTrace);
+
+                    queued.Tcs.SetException(exc);
+                }
+            }
+        }
+    }
+}
diff --git a/Content.Client/Stack/StackSystem.cs b/Content.Client/Stack/StackSystem.cs
index c081581338f..7e681aeba3e 100644
--- a/Content.Client/Stack/StackSystem.cs
+++ b/Content.Client/Stack/StackSystem.cs
@@ -44,7 +44,7 @@ public override void SetCount(EntityUid uid, int amount, StackComponent? compone
             // TODO PREDICT ENTITY DELETION: This should really just be a normal entity deletion call.
             if (component.Count <= 0 && !component.Lingering)
             {
-                Xform.DetachParentToNull(uid, Transform(uid));
+                Xform.DetachEntity(uid, Transform(uid));
                 return;
             }
 
diff --git a/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs b/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs
index 720a2efb9dd..e7bab71e38e 100644
--- a/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs
+++ b/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs
@@ -1,4 +1,5 @@
 using Content.Shared.StationRecords;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.StationRecords;
 
@@ -15,15 +16,12 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new();
+        _window = this.CreateWindow<GeneralStationRecordConsoleWindow>();
         _window.OnKeySelected += key =>
             SendMessage(new SelectStationRecord(key));
         _window.OnFiltersChanged += (type, filterValue) =>
             SendMessage(new SetStationRecordFilter(type, filterValue));
         _window.OnDeleted += id => SendMessage(new DeleteStationRecord(id));
-        _window.OnClose += Close;
-
-        _window.OpenCentered();
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -35,11 +33,4 @@ protected override void UpdateState(BoundUserInterfaceState state)
 
         _window?.UpdateState(cast);
     }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-
-        _window?.Close();
-    }
 }
diff --git a/Content.Client/Stealth/StealthSystem.cs b/Content.Client/Stealth/StealthSystem.cs
index 0b94e41f6bc..adb25e1ef63 100644
--- a/Content.Client/Stealth/StealthSystem.cs
+++ b/Content.Client/Stealth/StealthSystem.cs
@@ -11,6 +11,7 @@ namespace Content.Client.Stealth;
 public sealed class StealthSystem : SharedStealthSystem
 {
     [Dependency] private readonly IPrototypeManager _protoMan = default!;
+    [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
 
     private ShaderInstance _shader = default!;
 
@@ -81,7 +82,7 @@ private void OnShaderRender(EntityUid uid, StealthComponent component, BeforePos
         if (!parent.IsValid())
             return; // should never happen, but lets not kill the client.
         var parentXform = Transform(parent);
-        var reference = args.Viewport.WorldToLocal(parentXform.WorldPosition);
+        var reference = args.Viewport.WorldToLocal(_transformSystem.GetWorldPosition(parentXform));
         reference.X = -reference.X;
         var visibility = GetVisibility(uid, component);
 
diff --git a/Content.Client/Sticky/Visualizers/StickyVisualizerSystem.cs b/Content.Client/Sticky/Visualizers/StickyVisualizerSystem.cs
index 8bf8ac56eab..f7764479c01 100644
--- a/Content.Client/Sticky/Visualizers/StickyVisualizerSystem.cs
+++ b/Content.Client/Sticky/Visualizers/StickyVisualizerSystem.cs
@@ -5,21 +5,26 @@ namespace Content.Client.Sticky.Visualizers;
 
 public sealed class StickyVisualizerSystem : VisualizerSystem<StickyVisualizerComponent>
 {
+    private EntityQuery<SpriteComponent> _spriteQuery;
+
     public override void Initialize()
     {
         base.Initialize();
+
+        _spriteQuery = GetEntityQuery<SpriteComponent>();
+
         SubscribeLocalEvent<StickyVisualizerComponent, ComponentInit>(OnInit);
     }
 
-    private void OnInit(EntityUid uid, StickyVisualizerComponent component, ComponentInit args)
+    private void OnInit(Entity<StickyVisualizerComponent> ent, ref ComponentInit args)
     {
-        if (!TryComp(uid, out SpriteComponent? sprite))
+        if (!_spriteQuery.TryComp(ent, out var sprite))
             return;
 
-        component.DefaultDrawDepth = sprite.DrawDepth;
+        ent.Comp.OriginalDrawDepth = sprite.DrawDepth;
     }
 
-    protected override void OnAppearanceChange(EntityUid uid, StickyVisualizerComponent component, ref AppearanceChangeEvent args)
+    protected override void OnAppearanceChange(EntityUid uid, StickyVisualizerComponent comp, ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null)
             return;
@@ -27,8 +32,7 @@ protected override void OnAppearanceChange(EntityUid uid, StickyVisualizerCompon
         if (!AppearanceSystem.TryGetData<bool>(uid, StickyVisuals.IsStuck, out var isStuck, args.Component))
             return;
 
-        var drawDepth = isStuck ? component.StuckDrawDepth : component.DefaultDrawDepth;
+        var drawDepth = isStuck ? comp.StuckDrawDepth : comp.OriginalDrawDepth;
         args.Sprite.DrawDepth = drawDepth;
-
     }
 }
diff --git a/Content.Client/Storage/Systems/ItemCounterSystem.cs b/Content.Client/Storage/Systems/ItemCounterSystem.cs
index 605f47d3b8a..fcb1ca17dc6 100644
--- a/Content.Client/Storage/Systems/ItemCounterSystem.cs
+++ b/Content.Client/Storage/Systems/ItemCounterSystem.cs
@@ -31,7 +31,7 @@ private void OnAppearanceChange(EntityUid uid, ItemCounterComponent comp, ref Ap
 
         if (!_appearanceSystem.TryGetData<bool>(uid, StackVisuals.Hide, out var hidden, args.Component))
             hidden = false;
-        
+
         if (comp.IsComposite)
             ProcessCompositeSprite(uid, actual, maxCount, comp.LayerStates, hidden, sprite: args.Sprite);
         else
diff --git a/Content.Client/Storage/Systems/StorageSystem.cs b/Content.Client/Storage/Systems/StorageSystem.cs
index a74a118cd0f..eea7b9ec797 100644
--- a/Content.Client/Storage/Systems/StorageSystem.cs
+++ b/Content.Client/Storage/Systems/StorageSystem.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Numerics;
 using Content.Client.Animations;
 using Content.Shared.Hands;
@@ -142,14 +142,14 @@ public void PickupAnimation(EntityUid item, EntityCoordinates initialCoords, Ent
     {
         if (!_timing.IsFirstTimePredicted)
             return;
-
-        if (finalCoords.InRange(EntityManager, TransformSystem, initialCoords, 0.1f) ||
+        
+        if (TransformSystem.InRange(finalCoords, initialCoords, 0.1f) ||
             !Exists(initialCoords.EntityId) || !Exists(finalCoords.EntityId))
         {
             return;
         }
 
-        var finalMapPos = finalCoords.ToMapPos(EntityManager, TransformSystem);
+        var finalMapPos = TransformSystem.ToMapCoordinates(finalCoords).Position;
         var finalPos = Vector2.Transform(finalMapPos, TransformSystem.GetInvWorldMatrix(initialCoords.EntityId));
 
         _entityPickupAnimation.AnimateEntityPickup(item, initialCoords, finalPos, initialAngle);
diff --git a/Content.Client/Store/Ui/StoreBoundUserInterface.cs b/Content.Client/Store/Ui/StoreBoundUserInterface.cs
index 0010aedd964..7ed67f7b5dd 100644
--- a/Content.Client/Store/Ui/StoreBoundUserInterface.cs
+++ b/Content.Client/Store/Ui/StoreBoundUserInterface.cs
@@ -2,6 +2,7 @@
 using JetBrains.Annotations;
 using System.Linq;
 using Content.Shared.Store.Components;
+using Robust.Client.UserInterface;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.Store.Ui;
@@ -26,13 +27,10 @@ public StoreBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
 
     protected override void Open()
     {
-        _menu = new StoreMenu();
+        _menu = this.CreateWindow<StoreMenu>();
         if (EntMan.TryGetComponent<StoreComponent>(Owner, out var store))
             _menu.Title = Loc.GetString(store.Name);
 
-        _menu.OpenCentered();
-        _menu.OnClose += Close;
-
         _menu.OnListingButtonPressed += (_, listing) =>
         {
             SendMessage(new StoreBuyListingMessage(listing));
@@ -77,15 +75,6 @@ protected override void UpdateState(BoundUserInterfaceState state)
         }
     }
 
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing)
-            return;
-        _menu?.Close();
-        _menu?.Dispose();
-    }
-
     private void UpdateListingsWithSearchFilter()
     {
         if (_menu == null)
diff --git a/Content.Client/Strip/StrippingMenu.cs b/Content.Client/Strip/StrippingMenu.cs
index eea867b7948..1c46b4be35c 100644
--- a/Content.Client/Strip/StrippingMenu.cs
+++ b/Content.Client/Strip/StrippingMenu.cs
@@ -1,4 +1,3 @@
-using Content.Client.Inventory;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Timing;
@@ -11,14 +10,12 @@ public sealed class StrippingMenu : DefaultWindow
         public LayoutContainer InventoryContainer = new();
         public BoxContainer HandsContainer = new() { Orientation = LayoutOrientation.Horizontal };
         public BoxContainer SnareContainer = new();
-        private StrippableBoundUserInterface _bui;
         public bool Dirty = true;
 
-        public StrippingMenu(string title, StrippableBoundUserInterface bui)
-        {
-            Title = title;
-            _bui = bui;
+        public event Action? OnDirty;
 
+        public StrippingMenu()
+        {
             var box = new BoxContainer() { Orientation = LayoutOrientation.Vertical, Margin = new Thickness(0, 8) };
             Contents.AddChild(box);
             box.AddChild(SnareContainer);
@@ -39,7 +36,7 @@ protected override void FrameUpdate(FrameEventArgs args)
                 return;
 
             Dirty = false;
-            _bui.UpdateMenu();
+            OnDirty?.Invoke();
         }
     }
 }
diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs
index 4df332ec32d..fe3843c34a6 100644
--- a/Content.Client/Stylesheets/StyleNano.cs
+++ b/Content.Client/Stylesheets/StyleNano.cs
@@ -4,6 +4,7 @@
 using Content.Client.Examine;
 using Content.Client.PDA;
 using Content.Client.Resources;
+using Content.Client.Silicons.Laws.SiliconLawEditUi;
 using Content.Client.UserInterface.Controls;
 using Content.Client.UserInterface.Controls.FancyTree;
 using Content.Client.Verbs.UI;
@@ -151,6 +152,11 @@ public sealed class StyleNano : StyleBase
 
         public static readonly Color ChatBackgroundColor = Color.FromHex("#25252ADD");
 
+        //Bwoink
+        public const string StyleClassPinButtonPinned = "pinButtonPinned";
+        public const string StyleClassPinButtonUnpinned = "pinButtonUnpinned";
+
+
         public override Stylesheet Stylesheet { get; }
 
         public StyleNano(IResourceCache resCache) : base(resCache)
@@ -1343,6 +1349,9 @@ public StyleNano(IResourceCache resCache) : base(resCache)
                     new StyleProperty(Label.StylePropertyAlignMode, Label.AlignMode.Center),
                 }),
 
+                Element<PanelContainer>().Class(OptionButton.StyleClassOptionsBackground)
+                    .Prop(PanelContainer.StylePropertyPanel, new StyleBoxFlat(Color.FromHex("#25252A"))),
+
                 new StyleRule(new SelectorElement(typeof(PanelContainer), new []{ ClassHighDivider}, null, null), new []
                 {
                     new StyleProperty(PanelContainer.StylePropertyPanel, new StyleBoxFlat { BackgroundColor = NanoGold, ContentMarginBottomOverride = 2, ContentMarginLeftOverride = 2}),
@@ -1605,6 +1614,25 @@ public StyleNano(IResourceCache resCache) : base(resCache)
                     {
                         BackgroundColor = FancyTreeSelectedRowColor,
                     }),
+
+                // Silicon law edit ui
+                Element<Label>().Class(SiliconLawContainer.StyleClassSiliconLawPositionLabel)
+                    .Prop(Label.StylePropertyFontColor, NanoGold),
+                // Pinned button style
+                new StyleRule(
+                    new SelectorElement(typeof(TextureButton), new[] { StyleClassPinButtonPinned }, null, null),
+                    new[]
+                    {
+                        new StyleProperty(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Bwoink/pinned.png"))
+                    }),
+
+                // Unpinned button style
+                new StyleRule(
+                    new SelectorElement(typeof(TextureButton), new[] { StyleClassPinButtonUnpinned }, null, null),
+                    new[]
+                    {
+                        new StyleProperty(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Bwoink/un_pinned.png"))
+                    })
             }).ToList());
         }
     }
diff --git a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs
index 9132dd6ed5f..e3646c00cc3 100644
--- a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs
+++ b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs
@@ -1,6 +1,7 @@
 using Content.Client.Eye;
 using Content.Shared.SurveillanceCamera;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.SurveillanceCamera.UI;
 
@@ -25,20 +26,12 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new SurveillanceCameraMonitorWindow();
-
-        if (State != null)
-        {
-            UpdateState(State);
-        }
-
-        _window.OpenCentered();
+        _window = this.CreateWindow<SurveillanceCameraMonitorWindow>();
 
         _window.CameraSelected += OnCameraSelected;
         _window.SubnetOpened += OnSubnetRequest;
         _window.CameraRefresh += OnCameraRefresh;
         _window.SubnetRefresh += OnSubnetRefresh;
-        _window.OnClose += Close;
         _window.CameraSwitchTimer += OnCameraSwitchTimer;
         _window.CameraDisconnect += OnCameraDisconnect;
     }
diff --git a/Content.Client/Tabletop/TabletopSystem.cs b/Content.Client/Tabletop/TabletopSystem.cs
index 0b55a1839c0..034d3e4f02c 100644
--- a/Content.Client/Tabletop/TabletopSystem.cs
+++ b/Content.Client/Tabletop/TabletopSystem.cs
@@ -27,6 +27,7 @@ public sealed class TabletopSystem : SharedTabletopSystem
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly AppearanceSystem _appearance = default!;
+        [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
 
         // Time in seconds to wait until sending the location of a dragged entity to the server again
         private const float Delay = 1f / 10; // 10 Hz
@@ -100,7 +101,7 @@ public override void FrameUpdate(float frameTime)
             if (clampedCoords.Equals(MapCoordinates.Nullspace)) return;
 
             // Move the entity locally every update
-            EntityManager.GetComponent<TransformComponent>(_draggedEntity.Value).WorldPosition = clampedCoords.Position;
+            _transformSystem.SetWorldPosition(_draggedEntity.Value, clampedCoords.Position);
 
             // Increment total time passed
             _timePassed += frameTime;
diff --git a/Content.Client/Thief/ThiefBackpackBoundUserInterface.cs b/Content.Client/Thief/ThiefBackpackBoundUserInterface.cs
index 37384daafef..0631d98993a 100644
--- a/Content.Client/Thief/ThiefBackpackBoundUserInterface.cs
+++ b/Content.Client/Thief/ThiefBackpackBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Thief;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Thief;
 
@@ -15,21 +16,9 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new ThiefBackpackMenu(this);
-        _window.OnClose += Close;
-        _window.OpenCentered();
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing)
-            return;
-
-        if (_window != null)
-            _window.OnClose -= Close;
-
-        _window?.Dispose();
+        _window = this.CreateWindow<ThiefBackpackMenu>();
+        _window.OnApprove += SendApprove;
+        _window.OnSetChange += SendChangeSelected;
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
diff --git a/Content.Client/Thief/ThiefBackpackMenu.xaml.cs b/Content.Client/Thief/ThiefBackpackMenu.xaml.cs
index 543772c704c..aaee3576174 100644
--- a/Content.Client/Thief/ThiefBackpackMenu.xaml.cs
+++ b/Content.Client/Thief/ThiefBackpackMenu.xaml.cs
@@ -12,46 +12,42 @@ public sealed partial class ThiefBackpackMenu : FancyWindow
     [Dependency] private readonly IEntitySystemManager _sysMan = default!;
     private readonly SpriteSystem _spriteSystem;
 
-    private readonly ThiefBackpackBoundUserInterface _owner;
+    public event Action? OnApprove;
+    public event Action<int>? OnSetChange;
 
-    public ThiefBackpackMenu(ThiefBackpackBoundUserInterface owner)
+    public ThiefBackpackMenu()
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
         _spriteSystem = _sysMan.GetEntitySystem<SpriteSystem>();
 
-        _owner = owner;
-
-        ApproveButton.OnButtonDown += (args) =>
+        ApproveButton.OnPressed += args =>
         {
-            _owner.SendApprove();
+            OnApprove?.Invoke();
         };
     }
 
     public void UpdateState(ThiefBackpackBoundUserInterfaceState state)
     {
-        SetsGrid.RemoveAllChildren();
-        int count = 0;
-        int selectedNumber = 0;
-        foreach (var set in state.Sets)
+        SetsGrid.DisposeAllChildren();
+        var selectedNumber = 0;
+        foreach (var (set, info) in state.Sets)
         {
-            var child = new ThiefBackpackSet(set.Value, _spriteSystem);
+            var child = new ThiefBackpackSet(info, _spriteSystem);
 
             child.SetButton.OnButtonDown += (args) =>
             {
-                _owner.SendChangeSelected(set.Key);
+                OnSetChange?.Invoke(set);
             };
 
             SetsGrid.AddChild(child);
 
-            count++;
-
-            if (set.Value.Selected)
+            if (info.Selected)
                 selectedNumber++;
         }
 
         Description.Text = Loc.GetString("thief-backpack-window-description", ("maxCount", state.MaxSelectedSets));
         SelectedSets.Text = Loc.GetString("thief-backpack-window-selected", ("selectedCount", selectedNumber), ("maxCount", state.MaxSelectedSets));
-        ApproveButton.Disabled = selectedNumber == state.MaxSelectedSets ? false : true;
+        ApproveButton.Disabled = selectedNumber != state.MaxSelectedSets;
     }
 }
diff --git a/Content.Client/Throwing/ThrownItemVisualizerSystem.cs b/Content.Client/Throwing/ThrownItemVisualizerSystem.cs
index b25b4fbb7de..28a07ae94a7 100644
--- a/Content.Client/Throwing/ThrownItemVisualizerSystem.cs
+++ b/Content.Client/Throwing/ThrownItemVisualizerSystem.cs
@@ -59,7 +59,6 @@ private void OnShutdown(EntityUid uid, ThrownItemComponent component, ComponentS
         if (length <= TimeSpan.Zero)
             return null;
 
-        length += TimeSpan.FromSeconds(ThrowingSystem.FlyTime);
         var scale = ent.Comp2.Scale;
         var lenFloat = (float) length.TotalSeconds;
 
diff --git a/Content.Client/Tips/TippyUI.xaml.cs b/Content.Client/Tips/TippyUI.xaml.cs
index de3eaf4f51b..4a2c4bfe2f2 100644
--- a/Content.Client/Tips/TippyUI.xaml.cs
+++ b/Content.Client/Tips/TippyUI.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Client.Paper;
+using Content.Client.Paper.UI;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
diff --git a/Content.Client/Tips/TippyUIController.cs b/Content.Client/Tips/TippyUIController.cs
index 2cc694d97d4..7737a3d6982 100644
--- a/Content.Client/Tips/TippyUIController.cs
+++ b/Content.Client/Tips/TippyUIController.cs
@@ -1,21 +1,17 @@
-using Content.Client.Gameplay;
 using System.Numerics;
 using Content.Client.Message;
-using Content.Client.Paper;
+using Content.Client.Paper.UI;
 using Content.Shared.CCVar;
 using Content.Shared.Movement.Components;
 using Content.Shared.Tips;
 using Robust.Client.GameObjects;
 using Robust.Client.ResourceManagement;
-using Robust.Client.State;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controllers;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.Audio;
 using Robust.Shared.Configuration;
-using Robust.Shared.Console;
 using Robust.Shared.Map;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using static Content.Client.Tips.TippyUI;
 
diff --git a/Content.Client/UserInterface/Controls/RadialContainer.cs b/Content.Client/UserInterface/Controls/RadialContainer.cs
index be263d12772..be9b8817a06 100644
--- a/Content.Client/UserInterface/Controls/RadialContainer.cs
+++ b/Content.Client/UserInterface/Controls/RadialContainer.cs
@@ -67,11 +67,18 @@ public RadialContainer()
     {
 
     }
-
+	
     protected override void Draw(DrawingHandleScreen handle)
     {
+		
+        const float baseRadius = 100f;
+        const float radiusIncrement = 5f;
+		
         var children = ReserveSpaceForHiddenChildren ? Children : Children.Where(x => x.Visible);
         var childCount = children.Count();
+		
+		// Add padding from the center at higher child counts so they don't overlap.
+		Radius = baseRadius + (childCount * radiusIncrement);
 
         // Determine the size of the arc, accounting for clockwise and anti-clockwise arrangements
         var arc = AngularRange.Y - AngularRange.X;
diff --git a/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs b/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs
index 69ac3ab0230..453cedd0721 100644
--- a/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs
+++ b/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs
@@ -184,10 +184,13 @@ private bool TargetingOnUse(in PointerInputCmdArgs args)
         switch (action)
         {
             case WorldTargetActionComponent mapTarget:
-                    return TryTargetWorld(args, actionId, mapTarget, user, comp) || !mapTarget.InteractOnMiss;
+                return TryTargetWorld(args, actionId, mapTarget, user, comp) || !mapTarget.InteractOnMiss;
 
             case EntityTargetActionComponent entTarget:
-                    return TryTargetEntity(args, actionId, entTarget, user, comp) || !entTarget.InteractOnMiss;
+                return TryTargetEntity(args, actionId, entTarget, user, comp) || !entTarget.InteractOnMiss;
+
+            case EntityWorldTargetActionComponent entMapTarget:
+                return TryTargetEntityWorld(args, actionId, entMapTarget, user, comp) || !entMapTarget.InteractOnMiss;
 
             default:
                 Logger.Error($"Unknown targeting action: {actionId.GetType()}");
@@ -266,6 +269,47 @@ private bool TryTargetEntity(in PointerInputCmdArgs args, EntityUid actionId, En
         return true;
     }
 
+    private bool TryTargetEntityWorld(in PointerInputCmdArgs args,
+        EntityUid actionId,
+        EntityWorldTargetActionComponent action,
+        EntityUid user,
+        ActionsComponent actionComp)
+    {
+        if (_actionsSystem == null)
+            return false;
+
+        var entity = args.EntityUid;
+        var coords = args.Coordinates;
+
+        if (!_actionsSystem.ValidateEntityWorldTarget(user, entity, coords, (actionId, action)))
+        {
+            if (action.DeselectOnMiss)
+                StopTargeting();
+
+            return false;
+        }
+
+        if (action.ClientExclusive)
+        {
+            if (action.Event != null)
+            {
+                action.Event.Entity = entity;
+                action.Event.Coords = coords;
+                action.Event.Performer = user;
+                action.Event.Action = actionId;
+            }
+
+            _actionsSystem.PerformAction(user, actionComp, actionId, action, action.Event, _timing.CurTime);
+        }
+        else
+            EntityManager.RaisePredictiveEvent(new RequestPerformActionEvent(EntityManager.GetNetEntity(actionId), EntityManager.GetNetEntity(args.EntityUid), EntityManager.GetNetCoordinates(coords)));
+
+        if (!action.Repeat)
+            StopTargeting();
+
+        return true;
+    }
+
     public void UnloadButton()
     {
         if (ActionButton == null)
diff --git a/Content.Client/UserInterface/Systems/Actions/Windows/ActionsWindow.xaml b/Content.Client/UserInterface/Systems/Actions/Windows/ActionsWindow.xaml
index 52346adba27..443b79242e7 100644
--- a/Content.Client/UserInterface/Systems/Actions/Windows/ActionsWindow.xaml
+++ b/Content.Client/UserInterface/Systems/Actions/Windows/ActionsWindow.xaml
@@ -3,7 +3,7 @@
     xmlns:windows="clr-namespace:Content.Client.UserInterface.Systems.Actions.Windows"
     Name="ActionsList"
     HorizontalExpand="True"
-    Title="Actions"
+    Title="{Loc ui-actionmenu-title}"
     VerticalExpand="True"
     Resizable="True"
     MinHeight="300"
diff --git a/Content.Client/UserInterface/Systems/Actions/Windows/ActionsWindow.xaml.cs b/Content.Client/UserInterface/Systems/Actions/Windows/ActionsWindow.xaml.cs
index fbe1e71535d..f972a96eb74 100644
--- a/Content.Client/UserInterface/Systems/Actions/Windows/ActionsWindow.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Actions/Windows/ActionsWindow.xaml.cs
@@ -26,7 +26,7 @@ public ActionsWindow()
 
         foreach (var filter in Enum.GetValues<Filters>())
         {
-            FilterButton.AddItem(filter.ToString(), filter);
+            FilterButton.AddItem(Loc.GetString($"ui-actionmenu-{filter.ToString().ToLower()}"), filter);
         }
     }
 
diff --git a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankBoundUserInterface.cs b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankBoundUserInterface.cs
index 4702f8f3659..4ae74a5d65e 100644
--- a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankBoundUserInterface.cs
+++ b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankBoundUserInterface.cs
@@ -1,5 +1,7 @@
 using Content.Shared.Atmos.Components;
 using JetBrains.Annotations;
+using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.UserInterface.Systems.Atmos.GasTank
 {
@@ -13,7 +15,7 @@ public GasTankBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKe
         {
         }
 
-        public void SetOutputPressure(in float value)
+        public void SetOutputPressure(float value)
         {
             SendMessage(new GasTankSetPressureMessage
             {
@@ -29,9 +31,10 @@ public void ToggleInternals()
         protected override void Open()
         {
             base.Open();
-            _window = new GasTankWindow(this, EntMan.GetComponent<MetaDataComponent>(Owner).EntityName);
-            _window.OnClose += Close;
-            _window.OpenCentered();
+            _window = this.CreateWindow<GasTankWindow>();
+            _window.SetTitle(EntMan.GetComponent<MetaDataComponent>(Owner).EntityName);
+            _window.OnOutputPressure += SetOutputPressure;
+            _window.OnToggleInternals += ToggleInternals;
         }
 
         protected override void UpdateState(BoundUserInterfaceState state)
diff --git a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs
index c23850a6503..fd5624ad8a7 100644
--- a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs
+++ b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs
@@ -15,23 +15,29 @@ namespace Content.Client.UserInterface.Systems.Atmos.GasTank;
 public sealed class GasTankWindow
     : BaseWindow
 {
+    [Dependency] private readonly IResourceCache _cache = default!;
+
     private readonly RichTextLabel _lblPressure;
     private readonly FloatSpinBox _spbPressure;
     private readonly RichTextLabel _lblInternals;
     private readonly Button _btnInternals;
+    private readonly Label _topLabel;
+
+    public event Action<float>? OnOutputPressure;
+    public event Action? OnToggleInternals;
 
-    public GasTankWindow(GasTankBoundUserInterface owner, string uidName)
+    public GasTankWindow()
     {
+        IoCManager.InjectDependencies(this);
         Control contentContainer;
         BoxContainer topContainer;
         TextureButton btnClose;
-        var resourceCache = IoCManager.Resolve<IResourceCache>();
         var rootContainer = new LayoutContainer { Name = "GasTankRoot" };
         AddChild(rootContainer);
 
         MouseFilter = MouseFilterMode.Stop;
 
-        var panelTex = resourceCache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png");
+        var panelTex = _cache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png");
         var back = new StyleBoxTexture
         {
             Texture = panelTex,
@@ -78,7 +84,17 @@ public GasTankWindow(GasTankBoundUserInterface owner, string uidName)
 
         LayoutContainer.SetAnchorPreset(topContainerWrap, LayoutContainer.LayoutPreset.Wide);
 
-        var font = resourceCache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 13);
+        var font = _cache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 13);
+
+        _topLabel = new Label
+        {
+            FontOverride = font,
+            FontColorOverride = StyleNano.NanoGold,
+            VerticalAlignment = VAlignment.Center,
+            HorizontalExpand = true,
+            HorizontalAlignment = HAlignment.Left,
+            Margin = new Thickness(0, 0, 20, 0),
+        };
 
         var topRow = new BoxContainer
         {
@@ -86,16 +102,7 @@ public GasTankWindow(GasTankBoundUserInterface owner, string uidName)
             Margin = new Thickness(4, 2, 12, 2),
             Children =
             {
-                (new Label
-                {
-                    Text = uidName,
-                    FontOverride = font,
-                    FontColorOverride = StyleNano.NanoGold,
-                    VerticalAlignment = VAlignment.Center,
-                    HorizontalExpand = true,
-                    HorizontalAlignment = HAlignment.Left,
-                    Margin = new Thickness(0, 0, 20, 0),
-                }),
+                _topLabel,
                 (btnClose = new TextureButton
                 {
                     StyleClasses = {DefaultWindow.StyleClassWindowCloseButton},
@@ -168,17 +175,22 @@ public GasTankWindow(GasTankBoundUserInterface owner, string uidName)
         // Handlers
         _spbPressure.OnValueChanged += args =>
         {
-            owner.SetOutputPressure(args.Value);
+            OnOutputPressure?.Invoke(args.Value);
         };
 
         _btnInternals.OnPressed += args =>
         {
-            owner.ToggleInternals();
+            OnToggleInternals?.Invoke();
         };
 
         btnClose.OnPressed += _ => Close();
     }
 
+    public void SetTitle(string name)
+    {
+        _topLabel.Text = name;
+    }
+
     public void UpdateState(GasTankBoundUserInterfaceState state)
     {
         _lblPressure.SetMarkup(Loc.GetString("gas-tank-window-tank-pressure-text", ("tankPressure", $"{state.TankPressure:0.##}")));
diff --git a/Content.Client/UserInterface/Systems/Character/CharacterUIController.cs b/Content.Client/UserInterface/Systems/Character/CharacterUIController.cs
index 88edb6a4f12..1e4d2f27657 100644
--- a/Content.Client/UserInterface/Systems/Character/CharacterUIController.cs
+++ b/Content.Client/UserInterface/Systems/Character/CharacterUIController.cs
@@ -1,11 +1,13 @@
 using System.Linq;
 using Content.Client.CharacterInfo;
 using Content.Client.Gameplay;
+using Content.Client.Stylesheets;
 using Content.Client.UserInterface.Controls;
 using Content.Client.UserInterface.Systems.Character.Controls;
 using Content.Client.UserInterface.Systems.Character.Windows;
 using Content.Client.UserInterface.Systems.Objectives.Controls;
 using Content.Shared.Input;
+using Content.Shared.Objectives.Systems;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.Player;
@@ -121,11 +123,17 @@ private void CharacterUpdated(CharacterData data)
                 Modulate = Color.Gray
             };
 
-            objectiveControl.AddChild(new Label
+
+            var objectiveText = new FormattedMessage();
+            objectiveText.TryAddMarkup(groupId, out _);
+
+            var objectiveLabel = new RichTextLabel
             {
-                Text = groupId,
-                Modulate = Color.LightSkyBlue
-            });
+                StyleClasses = {StyleNano.StyleClassTooltipActionTitle}
+            };
+            objectiveLabel.SetMessage(objectiveText);
+
+            objectiveControl.AddChild(objectiveLabel);
 
             foreach (var condition in conditions)
             {
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/GhostTargetWindow.xaml b/Content.Client/UserInterface/Systems/Ghost/Controls/GhostTargetWindow.xaml
index 32cab732d14..1d3002ed966 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/GhostTargetWindow.xaml
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/GhostTargetWindow.xaml
@@ -2,7 +2,7 @@
     <BoxContainer Orientation="Vertical" HorizontalExpand="True" SizeFlagsStretchRatio="0.4">
         <Button Name="GhostnadoButton" Text="{Loc 'ghost-target-window-warp-to-most-followed'}" HorizontalAlignment="Center" Margin="0 4" />
         <LineEdit Name="SearchBar" PlaceHolder="Search" HorizontalExpand="True" Margin="0 4" />
-        <ScrollContainer VerticalExpand="True" HorizontalExpand="True" HScrollEnabled="False">
+        <ScrollContainer Name="GhostScroll" VerticalExpand="True" HorizontalExpand="True" HScrollEnabled="False">
             <BoxContainer Name="ButtonContainer" Orientation="Vertical" VerticalExpand="True" SeparationOverride="5">
                 <!-- Target buttons get added here by code -->
             </BoxContainer>
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/GhostTargetWindow.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/GhostTargetWindow.xaml.cs
index 9a20226fdf4..3ef69578a06 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/GhostTargetWindow.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/GhostTargetWindow.xaml.cs
@@ -90,6 +90,8 @@ private void OnSearchTextChanged(LineEdit.LineEditEventArgs args)
             _searchText = args.Text;
 
             UpdateVisibleButtons();
+            // Reset scroll bar so they can see the relevant results.
+            GhostScroll.SetScrollValue(Vector2.Zero);
         }
     }
 }
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs
index 33358a68a4d..6b183362e56 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs
@@ -93,7 +93,7 @@ public override void HandleState(EuiStateBase state)
                 bool hasAccess = true;
                 FormattedMessage? reason;
 
-                if (!requirementsManager.CheckRoleTime(group.Key.Requirements, out reason))
+                if (!requirementsManager.CheckRoleRequirements(group.Key.Requirements, null, out reason))
                 {
                     hasAccess = false;
                 }
diff --git a/Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs b/Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs
index fb747799170..5d7a775104c 100644
--- a/Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs
+++ b/Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs
@@ -132,6 +132,9 @@ private void UpdateInventoryHotbar(InventorySlotsComponent? clientInv)
         if (clientInv == null)
         {
             _inventoryHotbar?.ClearButtons();
+            if (_inventoryButton != null)
+                _inventoryButton.Visible = false;
+
             return;
         }
 
@@ -409,6 +412,8 @@ private void UnloadSlots()
         {
             slotGroup.ClearButtons();
         }
+
+        UpdateInventoryHotbar(null);
     }
 
     private void SpriteUpdated(SlotSpriteUpdate update)
diff --git a/Content.Client/UserInterface/Systems/Viewport/ViewportUIController.cs b/Content.Client/UserInterface/Systems/Viewport/ViewportUIController.cs
index 59747b1b0f4..613f71e79b2 100644
--- a/Content.Client/UserInterface/Systems/Viewport/ViewportUIController.cs
+++ b/Content.Client/UserInterface/Systems/Viewport/ViewportUIController.cs
@@ -15,7 +15,6 @@ public sealed class ViewportUIController : UIController
     [Dependency] private readonly IPlayerManager _playerMan = default!;
     [Dependency] private readonly IEntityManager _entMan = default!;
     [Dependency] private readonly IConfigurationManager _configurationManager = default!;
-
     public static readonly Vector2i ViewportSize = (EyeManager.PixelsPerMeter * 21, EyeManager.PixelsPerMeter * 15);
     public const int ViewportHeight = 15;
     private MainViewport? Viewport => UIManager.ActiveScreen?.GetWidget<MainViewport>();
diff --git a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
index 2c71fa8c40e..ac51cdbac5e 100644
--- a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
+++ b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
@@ -17,7 +17,6 @@ public sealed partial class VendingMachineMenu : FancyWindow
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IEntityManager _entityManager = default!;
-        [Dependency] private readonly IGameTiming _timing = default!;
 
         private readonly Dictionary<EntProtoId, EntityUid> _dummies = [];
 
diff --git a/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs
index 17ddba77ffc..eafab84ed63 100644
--- a/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs
+++ b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs
@@ -2,6 +2,7 @@
 using Content.Shared.VendingMachines;
 using Robust.Client.UserInterface.Controls;
 using System.Linq;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.VendingMachines
 {
@@ -28,15 +29,14 @@ protected override void Open()
 
             _cachedInventory = vendingMachineSys.GetAllInventory(Owner);
 
-            _menu = new VendingMachineMenu { Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName };
+            _menu = this.CreateWindow<VendingMachineMenu>();
+            _menu.OpenCenteredLeft();
+            _menu.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
 
-            _menu.OnClose += Close;
             _menu.OnItemSelected += OnItemSelected;
             _menu.OnSearchChanged += OnSearchChanged;
 
             _menu.Populate(_cachedInventory, out _cachedFilteredIndex);
-
-            _menu.OpenCenteredLeft();
         }
 
         protected override void UpdateState(BoundUserInterfaceState state)
diff --git a/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs b/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
index f700c6663b9..891804674d3 100644
--- a/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
+++ b/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
@@ -1,12 +1,13 @@
 using Content.Shared.VoiceMask;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.VoiceMask;
 
 public sealed class VoiceMaskBoundUserInterface : BoundUserInterface
 {
-    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly IPrototypeManager _protomanager = default!;
 
     [ViewVariables]
     private VoiceMaskNameChangeWindow? _window;
@@ -19,12 +20,11 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new(_proto);
+        _window = this.CreateWindow<VoiceMaskNameChangeWindow>();
+        _window.ReloadVerbs(_protomanager);
 
-        _window.OpenCentered();
         _window.OnNameChange += OnNameSelected;
         _window.OnVerbChange += verb => SendMessage(new VoiceMaskChangeVerbMessage(verb));
-        _window.OnClose += Close;
     }
 
     private void OnNameSelected(string name)
diff --git a/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs b/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
index 16a28f9d9b3..0dc41f807ab 100644
--- a/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
+++ b/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
@@ -17,7 +17,7 @@ public sealed partial class VoiceMaskNameChangeWindow : FancyWindow
 
     private string? _verb;
 
-    public VoiceMaskNameChangeWindow(IPrototypeManager proto)
+    public VoiceMaskNameChangeWindow()
     {
         RobustXamlLoader.Load(this);
 
@@ -32,12 +32,10 @@ public VoiceMaskNameChangeWindow(IPrototypeManager proto)
             SpeechVerbSelector.SelectId(args.Id);
         };
 
-        ReloadVerbs(proto);
-
         AddVerbs();
     }
 
-    private void ReloadVerbs(IPrototypeManager proto)
+    public void ReloadVerbs(IPrototypeManager proto)
     {
         foreach (var verb in proto.EnumeratePrototypes<SpeechVerbPrototype>())
         {
diff --git a/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs b/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs
index 3e1a4b1906d..540d76c129b 100644
--- a/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs
+++ b/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs
@@ -213,7 +213,7 @@ private Animation GetLungeAnimation(Vector2 direction)
     private void UpdateEffects()
     {
         var query = EntityQueryEnumerator<TrackUserComponent, TransformComponent>();
-        while (query.MoveNext(out var arcComponent, out var xform))
+        while (query.MoveNext(out var uid, out var arcComponent, out var xform))
         {
             if (arcComponent.User == null)
                 continue;
@@ -226,7 +226,7 @@ private void UpdateEffects()
                 targetPos += entRotation.RotateVec(arcComponent.Offset);
             }
 
-            TransformSystem.SetWorldPosition(xform, targetPos);
+            TransformSystem.SetWorldPosition(uid, targetPos);
         }
     }
 }
diff --git a/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
index eba4f21acbc..7604d5f8808 100644
--- a/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
+++ b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
@@ -220,7 +220,7 @@ private void ClientHeavyAttack(EntityUid user, EntityCoordinates coordinates, En
             return;
         }
 
-        var targetMap = coordinates.ToMap(EntityManager, TransformSystem);
+        var targetMap = TransformSystem.ToMapCoordinates(coordinates);
 
         if (targetMap.MapId != userXform.MapID)
             return;
diff --git a/Content.Client/Weapons/Melee/UI/MeleeSpeechBoundUserInterface.cs b/Content.Client/Weapons/Melee/UI/MeleeSpeechBoundUserInterface.cs
index f3e0c0a539a..3f01808c422 100644
--- a/Content.Client/Weapons/Melee/UI/MeleeSpeechBoundUserInterface.cs
+++ b/Content.Client/Weapons/Melee/UI/MeleeSpeechBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using Robust.Client.GameObjects;
 using Content.Shared.Speech.Components;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Weapons.Melee.UI;
 
@@ -19,17 +20,10 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new MeleeSpeechWindow();
-        if (State != null)
-            UpdateState(State);
-
-        _window.OpenCentered();
-
-        _window.OnClose += Close;
+        _window = this.CreateWindow<MeleeSpeechWindow>();
         _window.OnBattlecryEntered += OnBattlecryChanged;
     }
 
-
     private void OnBattlecryChanged(string newBattlecry)
     {
         SendMessage(new MeleeSpeechBattlecryChangedMessage(newBattlecry));
diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
index ac5914d47c0..1af471f28a3 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
@@ -88,7 +88,9 @@ public override void Initialize()
 
     private void OnMuzzleFlash(MuzzleFlashEvent args)
     {
-        CreateEffect(GetEntity(args.Uid), args);
+        var gunUid = GetEntity(args.Uid);
+
+        CreateEffect(gunUid, args, gunUid);
     }
 
     private void OnHitscan(HitscanEvent ev)
@@ -176,7 +178,7 @@ public override void Update(float frameTime)
         }
 
         // Define target coordinates relative to gun entity, so that network latency on moving grids doesn't fuck up the target location.
-        var coordinates = EntityCoordinates.FromMap(entity, mousePos, TransformSystem, EntityManager);
+        var coordinates = TransformSystem.ToCoordinates(entity, mousePos);
 
         NetEntity? target = null;
         if (_state.CurrentState is GameplayStateBase screen)
@@ -200,7 +202,7 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
         // Rather than splitting client / server for every ammo provider it's easier
         // to just delete the spawned entities. This is for programmer sanity despite the wasted perf.
         // This also means any ammo specific stuff can be grabbed as necessary.
-        var direction = fromCoordinates.ToMapPos(EntityManager, TransformSystem) - toCoordinates.ToMapPos(EntityManager, TransformSystem);
+        var direction = TransformSystem.ToMapCoordinates(fromCoordinates).Position - TransformSystem.ToMapCoordinates(toCoordinates).Position;
         var worldAngle = direction.ToAngle().Opposite();
 
         foreach (var (ent, shootable) in ammo)
@@ -271,11 +273,19 @@ protected override void Popup(string message, EntityUid? uid, EntityUid? user)
         PopupSystem.PopupEntity(message, uid.Value, user.Value);
     }
 
-    protected override void CreateEffect(EntityUid gunUid, MuzzleFlashEvent message, EntityUid? user = null)
+    protected override void CreateEffect(EntityUid gunUid, MuzzleFlashEvent message, EntityUid? tracked = null)
     {
         if (!Timing.IsFirstTimePredicted)
             return;
 
+        // EntityUid check added to stop throwing exceptions due to https://github.com/space-wizards/space-station-14/issues/28252
+        // TODO: Check to see why invalid entities are firing effects.
+        if (gunUid == EntityUid.Invalid)
+        {
+            Log.Debug($"Invalid Entity sent MuzzleFlashEvent (proto: {message.Prototype}, gun: {ToPrettyString(gunUid)})");
+            return;
+        }
+
         var gunXform = Transform(gunUid);
         var gridUid = gunXform.GridUid;
         EntityCoordinates coordinates;
@@ -296,10 +306,10 @@ protected override void CreateEffect(EntityUid gunUid, MuzzleFlashEvent message,
         var ent = Spawn(message.Prototype, coordinates);
         TransformSystem.SetWorldRotationNoLerp(ent, message.Angle);
 
-        if (user != null)
+        if (tracked != null)
         {
             var track = EnsureComp<TrackUserComponent>(ent);
-            track.User = user;
+            track.User = tracked;
             track.Offset = Vector2.UnitX / 2f;
         }
 
@@ -375,6 +385,6 @@ protected override void CreateEffect(EntityUid gunUid, MuzzleFlashEvent message,
         var uidPlayer = EnsureComp<AnimationPlayerComponent>(gunUid);
 
         _animPlayer.Stop(gunUid, uidPlayer, "muzzle-flash-light");
-        _animPlayer.Play((gunUid, uidPlayer), animTwo,"muzzle-flash-light");
+        _animPlayer.Play((gunUid, uidPlayer), animTwo, "muzzle-flash-light");
     }
 }
diff --git a/Content.Client/Wires/UI/WiresBoundUserInterface.cs b/Content.Client/Wires/UI/WiresBoundUserInterface.cs
index 5a8869a204e..edf1a2d3770 100644
--- a/Content.Client/Wires/UI/WiresBoundUserInterface.cs
+++ b/Content.Client/Wires/UI/WiresBoundUserInterface.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Wires;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Wires.UI
 {
@@ -15,10 +16,8 @@ public WiresBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
         protected override void Open()
         {
             base.Open();
-
-            _menu = new WiresMenu(this);
-            _menu.OnClose += Close;
-            _menu.OpenCenteredLeft();
+            _menu = this.CreateWindow<WiresMenu>();
+            _menu.OnAction += PerformAction;
         }
 
         protected override void UpdateState(BoundUserInterfaceState state)
diff --git a/Content.Client/Wires/UI/WiresMenu.cs b/Content.Client/Wires/UI/WiresMenu.cs
index 7bccc208616..eccc548297c 100644
--- a/Content.Client/Wires/UI/WiresMenu.cs
+++ b/Content.Client/Wires/UI/WiresMenu.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Numerics;
 using Content.Client.Examine;
 using Content.Client.Resources;
@@ -12,10 +11,6 @@
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Animations;
 using Robust.Shared.Input;
-using Robust.Shared.IoC;
-using Robust.Shared.Localization;
-using Robust.Shared.Maths;
-using Robust.Shared.Random;
 using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Content.Client.Wires.UI
@@ -24,8 +19,6 @@ public sealed class WiresMenu : BaseWindow
     {
         [Dependency] private readonly IResourceCache _resourceCache = default!;
 
-        public WiresBoundUserInterface Owner { get; }
-
         private readonly Control _wiresHBox;
         private readonly Control _topContainer;
         private readonly Control _statusContainer;
@@ -35,11 +28,12 @@ public sealed class WiresMenu : BaseWindow
 
         public TextureButton CloseButton { get; set; }
 
-        public WiresMenu(WiresBoundUserInterface owner)
+        public event Action<int, WiresAction>? OnAction;
+
+        public WiresMenu()
         {
             IoCManager.InjectDependencies(this);
 
-            Owner = owner;
             var rootContainer = new LayoutContainer {Name = "WireRoot"};
             AddChild(rootContainer);
 
@@ -257,12 +251,12 @@ public void Populate(WiresBoundUserInterfaceState state)
 
                 control.WireClicked += () =>
                 {
-                    Owner.PerformAction(wire.Id, wire.IsCut ? WiresAction.Mend : WiresAction.Cut);
+                    OnAction?.Invoke(wire.Id, wire.IsCut ? WiresAction.Mend : WiresAction.Cut);
                 };
 
                 control.ContactsClicked += () =>
                 {
-                    Owner.PerformAction(wire.Id, WiresAction.Pulse);
+                    OnAction?.Invoke(wire.Id, WiresAction.Pulse);
                 };
             }
 
diff --git a/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs b/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs
index 2538caf6eb8..c7a74815b6b 100644
--- a/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs
+++ b/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Xenoarchaeology.Equipment;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Xenoarchaeology.Ui;
 
@@ -18,10 +19,7 @@ protected override void Open()
     {
         base.Open();
 
-        _consoleMenu = new AnalysisConsoleMenu();
-
-        _consoleMenu.OnClose += Close;
-        _consoleMenu.OpenCentered();
+        _consoleMenu = this.CreateWindow<AnalysisConsoleMenu>();
 
         _consoleMenu.OnServerSelectionButtonPressed += () =>
         {
diff --git a/Content.IntegrationTests/Pair/TestPair.cs b/Content.IntegrationTests/Pair/TestPair.cs
index 0b681dcde10..43b188fd327 100644
--- a/Content.IntegrationTests/Pair/TestPair.cs
+++ b/Content.IntegrationTests/Pair/TestPair.cs
@@ -9,6 +9,7 @@
 using Robust.Shared.IoC;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
+using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Robust.UnitTesting;
 
@@ -28,6 +29,12 @@ public sealed partial class TestPair
     public TestMapData? TestMap;
     private List<NetUserId> _modifiedProfiles = new();
 
+    private int _nextServerSeed;
+    private int _nextClientSeed;
+
+    public int ServerSeed;
+    public int ClientSeed;
+
     public RobustIntegrationTest.ServerIntegrationInstance Server { get; private set; } = default!;
     public RobustIntegrationTest.ClientIntegrationInstance Client { get;  private set; } = default!;
 
@@ -74,22 +81,27 @@ public async Task Initialize(PoolSettings settings, TextWriter testOut, List<str
             await Server.WaitPost(() => gameTicker.RestartRound());
         }
 
-        if (settings.ShouldBeConnected)
+        // Always initially connect clients to generate an initial random set of preferences/profiles.
+        // This is to try and prevent issues where if the first test that connects the client is consistently some test
+        // that uses a fixed seed, it would effectively prevent it from beingrandomized.
+
+        Client.SetConnectTarget(Server);
+        await Client.WaitIdleAsync();
+        var netMgr = Client.ResolveDependency<IClientNetManager>();
+        await Client.WaitPost(() => netMgr.ClientConnect(null!, 0, null!));
+        await ReallyBeIdle(10);
+        await Client.WaitRunTicks(1);
+
+        if (!settings.ShouldBeConnected)
         {
-            Client.SetConnectTarget(Server);
-            await Client.WaitIdleAsync();
-            var netMgr = Client.ResolveDependency<IClientNetManager>();
-
-            await Client.WaitPost(() =>
-            {
-                if (!netMgr.IsConnected)
-                {
-                    netMgr.ClientConnect(null!, 0, null!);
-                }
-            });
+            await Client.WaitPost(() => netMgr.ClientDisconnect("Initial disconnect"));
             await ReallyBeIdle(10);
-            await Client.WaitRunTicks(1);
         }
+
+        var cRand = Client.ResolveDependency<IRobustRandom>();
+        var sRand = Server.ResolveDependency<IRobustRandom>();
+        _nextClientSeed = cRand.Next();
+        _nextServerSeed = sRand.Next();
     }
 
     public void Kill()
@@ -129,4 +141,33 @@ public enum PairState : byte
         CleanDisposed = 2,
         Dead = 3,
     }
+
+    public void SetupSeed()
+    {
+        var sRand = Server.ResolveDependency<IRobustRandom>();
+        if (Settings.ServerSeed is { } severSeed)
+        {
+            ServerSeed = severSeed;
+            sRand.SetSeed(ServerSeed);
+        }
+        else
+        {
+            ServerSeed = _nextServerSeed;
+            sRand.SetSeed(ServerSeed);
+            _nextServerSeed = sRand.Next();
+        }
+
+        var cRand = Client.ResolveDependency<IRobustRandom>();
+        if (Settings.ClientSeed is { } clientSeed)
+        {
+            ClientSeed = clientSeed;
+            cRand.SetSeed(ClientSeed);
+        }
+        else
+        {
+            ClientSeed = _nextClientSeed;
+            cRand.SetSeed(ClientSeed);
+            _nextClientSeed = cRand.Next();
+        }
+    }
 }
diff --git a/Content.IntegrationTests/PoolManager.cs b/Content.IntegrationTests/PoolManager.cs
index 21c93ea8aeb..34ac4060ddc 100644
--- a/Content.IntegrationTests/PoolManager.cs
+++ b/Content.IntegrationTests/PoolManager.cs
@@ -252,7 +252,7 @@ await testOut.WriteLineAsync(
         }
         finally
         {
-            if (pair != null && pair.TestHistory.Count > 1)
+            if (pair != null && pair.TestHistory.Count > 0)
             {
                 await testOut.WriteLineAsync($"{nameof(GetServerClientPair)}: Pair {pair.Id} Test History Start");
                 for (var i = 0; i < pair.TestHistory.Count; i++)
@@ -268,12 +268,14 @@ await testOut.WriteLineAsync(
         var poolRetrieveTime = poolRetrieveTimeWatch.Elapsed;
         await testOut.WriteLineAsync(
             $"{nameof(GetServerClientPair)}: Retrieving pair {pair.Id} from pool took {poolRetrieveTime.TotalMilliseconds} ms");
-        await testOut.WriteLineAsync(
-            $"{nameof(GetServerClientPair)}: Returning pair {pair.Id}");
 
         pair.ClearModifiedCvars();
         pair.Settings = poolSettings;
         pair.TestHistory.Add(currentTestName);
+        pair.SetupSeed();
+        await testOut.WriteLineAsync(
+            $"{nameof(GetServerClientPair)}: Returning pair {pair.Id} with client/server seeds: {pair.ClientSeed}/{pair.ServerSeed}");
+
         pair.Watch.Restart();
         return pair;
     }
diff --git a/Content.IntegrationTests/PoolSettings.cs b/Content.IntegrationTests/PoolSettings.cs
index a78173808f8..9da514e66b8 100644
--- a/Content.IntegrationTests/PoolSettings.cs
+++ b/Content.IntegrationTests/PoolSettings.cs
@@ -1,5 +1,7 @@
 #nullable enable
 
+using Robust.Shared.Random;
+
 namespace Content.IntegrationTests;
 
 /// <summary>
@@ -9,16 +11,6 @@ namespace Content.IntegrationTests;
 /// </summary>
 public sealed class PoolSettings
 {
-    /// <summary>
-    /// If the returned pair must not be reused
-    /// </summary>
-    public bool MustNotBeReused => Destructive || NoLoadContent || NoLoadTestPrototypes;
-
-    /// <summary>
-    /// If the given pair must be brand new
-    /// </summary>
-    public bool MustBeNew => Fresh || NoLoadContent || NoLoadTestPrototypes;
-
     /// <summary>
     /// Set to true if the test will ruin the server/client pair.
     /// </summary>
@@ -34,8 +26,6 @@ public sealed class PoolSettings
     /// </summary>
     public bool DummyTicker { get; init; } = true;
 
-    public bool UseDummyTicker => !InLobby && DummyTicker;
-
     /// <summary>
     /// If true, this enables the creation of admin logs during the test.
     /// </summary>
@@ -48,8 +38,6 @@ public sealed class PoolSettings
     /// </summary>
     public bool Connected { get; init; }
 
-    public bool ShouldBeConnected => InLobby || Connected;
-
     /// <summary>
     /// Set to true if the given server/client pair should be in the lobby.
     /// If the pair is not in the lobby at the end of the test, this test must be marked as dirty.
@@ -92,6 +80,34 @@ public sealed class PoolSettings
     /// </summary>
     public string? TestName { get; set; }
 
+    /// <summary>
+    /// If set, this will be used to call <see cref="IRobustRandom.SetSeed"/>
+    /// </summary>
+    public int? ServerSeed { get; set; }
+
+    /// <summary>
+    /// If set, this will be used to call <see cref="IRobustRandom.SetSeed"/>
+    /// </summary>
+    public int? ClientSeed { get; set; }
+
+    #region Inferred Properties
+
+    /// <summary>
+    /// If the returned pair must not be reused
+    /// </summary>
+    public bool MustNotBeReused => Destructive || NoLoadContent || NoLoadTestPrototypes;
+
+    /// <summary>
+    /// If the given pair must be brand new
+    /// </summary>
+    public bool MustBeNew => Fresh || NoLoadContent || NoLoadTestPrototypes;
+
+    public bool UseDummyTicker => !InLobby && DummyTicker;
+
+    public bool ShouldBeConnected => InLobby || Connected;
+
+    #endregion
+
     /// <summary>
     /// Tries to guess if we can skip recycling the server/client pair.
     /// </summary>
@@ -114,4 +130,4 @@ public bool CanFastRecycle(PoolSettings nextSettings)
                && Map == nextSettings.Map
                && InLobby == nextSettings.InLobby;
     }
-}
\ No newline at end of file
+}
diff --git a/Content.IntegrationTests/Tests/Actions/ActionsAddedTest.cs b/Content.IntegrationTests/Tests/Actions/ActionsAddedTest.cs
index 32b15252261..c232e823132 100644
--- a/Content.IntegrationTests/Tests/Actions/ActionsAddedTest.cs
+++ b/Content.IntegrationTests/Tests/Actions/ActionsAddedTest.cs
@@ -18,7 +18,7 @@ public sealed class ActionsAddedTest
     [Test]
     public async Task TestCombatActionsAdded()
     {
-        await using var pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true, DummyTicker = false});
+        await using var pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true, DummyTicker = false });
         var server = pair.Server;
         var client = pair.Client;
         var sEntMan = server.ResolveDependency<IEntityManager>();
diff --git a/Content.IntegrationTests/Tests/Atmos/GridJoinTest.cs b/Content.IntegrationTests/Tests/Atmos/GridJoinTest.cs
new file mode 100644
index 00000000000..3a1ec7fd40e
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Atmos/GridJoinTest.cs
@@ -0,0 +1,53 @@
+using Content.Server.Atmos.Components;
+using Content.Server.Atmos.EntitySystems;
+using Content.Server.Atmos.Piping.Components;
+using Content.Server.Atmos.Piping.EntitySystems;
+using Robust.Shared.GameObjects;
+
+namespace Content.IntegrationTests.Tests.Atmos;
+
+[TestFixture]
+public sealed class GridJoinTest
+{
+    private const string CanisterProtoId = "AirCanister";
+
+    [Test]
+    public async Task TestGridJoinAtmosphere()
+    {
+        await using var pair = await PoolManager.GetServerClient();
+        var server = pair.Server;
+
+        var entMan = server.EntMan;
+        var protoMan = server.ProtoMan;
+        var atmosSystem = entMan.System<AtmosphereSystem>();
+        var atmosDeviceSystem = entMan.System<AtmosDeviceSystem>();
+        var transformSystem = entMan.System<SharedTransformSystem>();
+
+        var testMap = await pair.CreateTestMap();
+
+        await server.WaitPost(() =>
+        {
+            // Spawn an atmos device on the grid
+            var canister = entMan.Spawn(CanisterProtoId);
+            transformSystem.SetCoordinates(canister, testMap.GridCoords);
+            var deviceComp = entMan.GetComponent<AtmosDeviceComponent>(canister);
+            var canisterEnt = (canister, deviceComp);
+
+            // Make sure the canister is tracked as an off-grid device
+            Assert.That(atmosDeviceSystem.IsJoinedOffGrid(canisterEnt));
+
+            // Add an atmosphere to the grid
+            entMan.AddComponent<GridAtmosphereComponent>(testMap.Grid);
+
+            // Force AtmosDeviceSystem to update off-grid devices
+            // This means the canister is now considered on-grid,
+            // but it's still tracked as off-grid!
+            Assert.DoesNotThrow(() => atmosDeviceSystem.Update(atmosSystem.AtmosTime));
+
+            // Make sure that the canister is now properly tracked as on-grid
+            Assert.That(atmosDeviceSystem.IsJoinedOffGrid(canisterEnt), Is.False);
+        });
+
+        await pair.CleanReturnAsync();
+    }
+}
diff --git a/Content.IntegrationTests/Tests/Body/GibTest.cs b/Content.IntegrationTests/Tests/Body/GibTest.cs
index c0032a85244..4627c79f64d 100644
--- a/Content.IntegrationTests/Tests/Body/GibTest.cs
+++ b/Content.IntegrationTests/Tests/Body/GibTest.cs
@@ -5,7 +5,7 @@
 namespace Content.IntegrationTests.Tests.Body;
 
 [TestFixture]
-public sealed  class GibTest
+public sealed class GibTest
 {
     [Test]
     public async Task TestGib()
diff --git a/Content.IntegrationTests/Tests/Body/LegTest.cs b/Content.IntegrationTests/Tests/Body/LegTest.cs
index e86966f8f54..7b49bbe84a3 100644
--- a/Content.IntegrationTests/Tests/Body/LegTest.cs
+++ b/Content.IntegrationTests/Tests/Body/LegTest.cs
@@ -5,7 +5,6 @@
 using Content.Shared.Rotation;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
-using Robust.Shared.Maths;
 
 namespace Content.IntegrationTests.Tests.Body
 {
@@ -40,13 +39,14 @@ public async Task RemoveLegsFallTest()
             var appearanceSystem = entityManager.System<SharedAppearanceSystem>();
             var xformSystem = entityManager.System<SharedTransformSystem>();
 
+            var map = await pair.CreateTestMap();
+
             await server.WaitAssertion(() =>
             {
-                var mapId = mapManager.CreateMap();
                 BodyComponent body = null;
 
                 human = entityManager.SpawnEntity("HumanBodyAndAppearanceDummy",
-                    new MapCoordinates(Vector2.Zero, mapId));
+                    new MapCoordinates(Vector2.Zero, map.MapId));
 
                 Assert.Multiple(() =>
                 {
@@ -61,7 +61,7 @@ await server.WaitAssertion(() =>
 
                 foreach (var leg in legs)
                 {
-                    xformSystem.DetachParentToNull(leg.Id, entityManager.GetComponent<TransformComponent>(leg.Id));
+                    xformSystem.DetachEntity(leg.Id, entityManager.GetComponent<TransformComponent>(leg.Id));
                 }
             });
 
diff --git a/Content.IntegrationTests/Tests/Body/LungTest.cs b/Content.IntegrationTests/Tests/Body/LungTest.cs
index dce3741c98d..9b5ee431f1f 100644
--- a/Content.IntegrationTests/Tests/Body/LungTest.cs
+++ b/Content.IntegrationTests/Tests/Body/LungTest.cs
@@ -60,8 +60,8 @@ public async Task AirConsistencyTest()
             var mapManager = server.ResolveDependency<IMapManager>();
             var entityManager = server.ResolveDependency<IEntityManager>();
             var mapLoader = entityManager.System<MapLoaderSystem>();
+            var mapSys = entityManager.System<SharedMapSystem>();
 
-            MapId mapId;
             EntityUid? grid = null;
             BodyComponent body = default;
             RespiratorComponent resp = default;
@@ -73,7 +73,7 @@ public async Task AirConsistencyTest()
 
             await server.WaitPost(() =>
             {
-                mapId = mapManager.CreateMap();
+                mapSys.CreateMap(out var mapId);
                 Assert.That(mapLoader.TryLoad(mapId, testMapName, out var roots));
 
                 var query = entityManager.GetEntityQuery<MapGridComponent>();
@@ -142,8 +142,8 @@ public async Task NoSuffocationTest()
             var entityManager = server.ResolveDependency<IEntityManager>();
             var cfg = server.ResolveDependency<IConfigurationManager>();
             var mapLoader = entityManager.System<MapLoaderSystem>();
+            var mapSys = entityManager.System<SharedMapSystem>();
 
-            MapId mapId;
             EntityUid? grid = null;
             RespiratorComponent respirator = null;
             EntityUid human = default;
@@ -152,7 +152,7 @@ public async Task NoSuffocationTest()
 
             await server.WaitPost(() =>
             {
-                mapId = mapManager.CreateMap();
+                mapSys.CreateMap(out var mapId);
 
                 Assert.That(mapLoader.TryLoad(mapId, testMapName, out var ents), Is.True);
                 var query = entityManager.GetEntityQuery<MapGridComponent>();
diff --git a/Content.IntegrationTests/Tests/Body/SaveLoadReparentTest.cs b/Content.IntegrationTests/Tests/Body/SaveLoadReparentTest.cs
index 670ce1a474d..01482ba8ee2 100644
--- a/Content.IntegrationTests/Tests/Body/SaveLoadReparentTest.cs
+++ b/Content.IntegrationTests/Tests/Body/SaveLoadReparentTest.cs
@@ -33,10 +33,11 @@ public async Task Test()
         var mapLoader = entities.System<MapLoaderSystem>();
         var bodySystem = entities.System<SharedBodySystem>();
         var containerSystem = entities.System<SharedContainerSystem>();
+        var mapSys = entities.System<SharedMapSystem>();
 
         await server.WaitAssertion(() =>
         {
-            var mapId = maps.CreateMap();
+            mapSys.CreateMap(out var mapId);
             maps.CreateGrid(mapId);
             var human = entities.SpawnEntity("HumanBodyDummy", new MapCoordinates(0, 0, mapId));
 
@@ -115,7 +116,7 @@ await server.WaitAssertion(() =>
             mapLoader.SaveMap(mapId, mapPath);
             maps.DeleteMap(mapId);
 
-            mapId = maps.CreateMap();
+            mapSys.CreateMap(out mapId);
             Assert.That(mapLoader.TryLoad(mapId, mapPath, out _), Is.True);
 
             var query = EnumerateQueryEnumerator(
diff --git a/Content.IntegrationTests/Tests/Buckle/BuckleDragTest.cs b/Content.IntegrationTests/Tests/Buckle/BuckleDragTest.cs
index 8df151d5a0e..82d5d3baa04 100644
--- a/Content.IntegrationTests/Tests/Buckle/BuckleDragTest.cs
+++ b/Content.IntegrationTests/Tests/Buckle/BuckleDragTest.cs
@@ -38,13 +38,13 @@ public async Task BucklePullTest()
         await RunTicks(5);
         Assert.That(buckle.Buckled, Is.True);
         Assert.That(buckle.BuckledTo, Is.EqualTo(STarget));
-        Assert.That(strap.BuckledEntities, Is.EquivalentTo(new[]{sUrist}));
+        Assert.That(strap.BuckledEntities, Is.EquivalentTo(new[] { sUrist }));
         Assert.That(puller.Pulling, Is.Null);
         Assert.That(pullable.Puller, Is.Null);
         Assert.That(pullable.BeingPulled, Is.False);
 
         // Start pulling, and thus unbuckle them
-        await PressKey(ContentKeyFunctions.TryPullObject, cursorEntity:urist);
+        await PressKey(ContentKeyFunctions.TryPullObject, cursorEntity: urist);
         await RunTicks(5);
         Assert.That(buckle.Buckled, Is.False);
         Assert.That(buckle.BuckledTo, Is.Null);
diff --git a/Content.IntegrationTests/Tests/CargoTest.cs b/Content.IntegrationTests/Tests/CargoTest.cs
index 2da84f4f9db..3451117aba7 100644
--- a/Content.IntegrationTests/Tests/CargoTest.cs
+++ b/Content.IntegrationTests/Tests/CargoTest.cs
@@ -19,11 +19,11 @@ namespace Content.IntegrationTests.Tests;
 [TestFixture]
 public sealed class CargoTest
 {
-    public static HashSet<ProtoId<CargoProductPrototype>> Ignored = new ()
-    {
+    private static readonly HashSet<ProtoId<CargoProductPrototype>> Ignored =
+    [
         // This is ignored because it is explicitly intended to be able to sell for more than it costs.
-        // new("FunCrateGambling")
-    };
+        // new("FunCrateGambling") // DeltaV - no gambling
+    ];
 
     [Test]
     public async Task NoCargoOrderArbitrage()
diff --git a/Content.IntegrationTests/Tests/Chemistry/FixedPoint2SerializationTest.cs b/Content.IntegrationTests/Tests/Chemistry/FixedPoint2SerializationTest.cs
index 8e3b89bff11..0e3f89c2825 100644
--- a/Content.IntegrationTests/Tests/Chemistry/FixedPoint2SerializationTest.cs
+++ b/Content.IntegrationTests/Tests/Chemistry/FixedPoint2SerializationTest.cs
@@ -9,10 +9,10 @@ namespace Content.IntegrationTests.Tests.Chemistry
 {
     public sealed class FixedPoint2SerializationTest : SerializationTest
     {
-        protected override Assembly[] Assemblies => new[]
-        {
+        protected override Assembly[] Assemblies =>
+        [
             typeof(FixedPoint2SerializationTest).Assembly
-        };
+        ];
 
         [Test]
         public void DeserializeNullTest()
@@ -53,6 +53,6 @@ public void DeserializeNullDefinitionTest()
     [DataDefinition]
     public sealed partial class FixedPoint2TestDefinition
     {
-        [DataField("unit")] public FixedPoint2? Unit { get; set; } = FixedPoint2.New(5);
+        [DataField] public FixedPoint2? Unit { get; set; } = FixedPoint2.New(5);
     }
 }
diff --git a/Content.IntegrationTests/Tests/Chemistry/SolutionRoundingTest.cs b/Content.IntegrationTests/Tests/Chemistry/SolutionRoundingTest.cs
index 4d19a96d9e7..89d33186a27 100644
--- a/Content.IntegrationTests/Tests/Chemistry/SolutionRoundingTest.cs
+++ b/Content.IntegrationTests/Tests/Chemistry/SolutionRoundingTest.cs
@@ -1,5 +1,5 @@
-using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
@@ -76,7 +76,7 @@ public async Task Test()
 
         await server.WaitPost(() =>
         {
-            var system = server.System<SolutionContainerSystem>();
+            var system = server.System<SharedSolutionContainerSystem>();
             var beaker = server.EntMan.SpawnEntity("SolutionRoundingTestContainer", testMap.GridCoords);
 
             system.TryGetSolution(beaker, "beaker", out var newSolutionEnt, out var newSolution);
diff --git a/Content.IntegrationTests/Tests/Chemistry/SolutionSystemTests.cs b/Content.IntegrationTests/Tests/Chemistry/SolutionSystemTests.cs
index d96a035b2dc..6b71dd08be0 100644
--- a/Content.IntegrationTests/Tests/Chemistry/SolutionSystemTests.cs
+++ b/Content.IntegrationTests/Tests/Chemistry/SolutionSystemTests.cs
@@ -1,5 +1,5 @@
-using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.FixedPoint;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
@@ -11,7 +11,7 @@ namespace Content.IntegrationTests.Tests.Chemistry;
 // To ensure volume(A) + volume(B) = volume(A+B)
 // reactions can change this assumption
 [TestFixture]
-[TestOf(typeof(SolutionContainerSystem))]
+[TestOf(typeof(SharedSolutionContainerSystem))]
 public sealed class SolutionSystemTests
 {
     [TestPrototypes]
@@ -51,7 +51,7 @@ public async Task TryAddTwoNonReactiveReagent()
 
         var entityManager = server.ResolveDependency<IEntityManager>();
         var protoMan = server.ResolveDependency<IPrototypeManager>();
-        var containerSystem = entityManager.System<SolutionContainerSystem>();
+        var containerSystem = entityManager.System<SharedSolutionContainerSystem>();
         var testMap = await pair.CreateTestMap();
         var coordinates = testMap.GridCoords;
 
@@ -97,7 +97,7 @@ public async Task TryAddTooMuchNonReactiveReagent()
 
         var entityManager = server.ResolveDependency<IEntityManager>();
         var protoMan = server.ResolveDependency<IPrototypeManager>();
-        var containerSystem = entityManager.System<SolutionContainerSystem>();
+        var containerSystem = entityManager.System<SharedSolutionContainerSystem>();
         var coordinates = testMap.GridCoords;
 
         EntityUid beaker;
@@ -141,7 +141,7 @@ public async Task TryMixAndOverflowTooMuchReagent()
         var entityManager = server.ResolveDependency<IEntityManager>();
         var protoMan = server.ResolveDependency<IPrototypeManager>();
         var testMap = await pair.CreateTestMap();
-        var containerSystem = entityManager.System<SolutionContainerSystem>();
+        var containerSystem = entityManager.System<SharedSolutionContainerSystem>();
         var coordinates = testMap.GridCoords;
 
         EntityUid beaker;
@@ -194,7 +194,7 @@ public async Task TryMixAndOverflowTooBigOverflow()
 
         var entityManager = server.ResolveDependency<IEntityManager>();
         var protoMan = server.ResolveDependency<IPrototypeManager>();
-        var containerSystem = entityManager.System<SolutionContainerSystem>();
+        var containerSystem = entityManager.System<SharedSolutionContainerSystem>();
         var testMap = await pair.CreateTestMap();
         var coordinates = testMap.GridCoords;
 
diff --git a/Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs b/Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
index ddfe7b3481e..3664cda922a 100644
--- a/Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
+++ b/Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
@@ -1,4 +1,3 @@
-using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Components;
 using Robust.Shared.GameObjects;
@@ -6,6 +5,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 using System.Linq;
+using Content.Shared.Chemistry.EntitySystems;
 
 namespace Content.IntegrationTests.Tests.Chemistry
 {
@@ -34,7 +34,7 @@ public async Task TryAllTest()
             var prototypeManager = server.ResolveDependency<IPrototypeManager>();
             var testMap = await pair.CreateTestMap();
             var coordinates = testMap.GridCoords;
-            var solutionContainerSystem = entityManager.System<SolutionContainerSystem>();
+            var solutionContainerSystem = entityManager.System<SharedSolutionContainerSystem>();
 
             foreach (var reactionPrototype in prototypeManager.EnumeratePrototypes<ReactionPrototype>())
             {
diff --git a/Content.IntegrationTests/Tests/ClickableTest.cs b/Content.IntegrationTests/Tests/ClickableTest.cs
index 76085381852..59836509081 100644
--- a/Content.IntegrationTests/Tests/ClickableTest.cs
+++ b/Content.IntegrationTests/Tests/ClickableTest.cs
@@ -52,7 +52,6 @@ public async Task<bool> Test(string prototype, float clickPosX, float clickPosY,
             var serverEntManager = server.ResolveDependency<IEntityManager>();
             var eyeManager = client.ResolveDependency<IEyeManager>();
             var spriteQuery = clientEntManager.GetEntityQuery<SpriteComponent>();
-            var xformQuery = clientEntManager.GetEntityQuery<TransformComponent>();
             var eye = client.ResolveDependency<IEyeManager>().CurrentEye;
 
             var testMap = await pair.CreateTestMap();
@@ -80,9 +79,8 @@ await client.WaitPost(() =>
                 eyeManager.CurrentEye.Rotation = 0;
 
                 var pos = clientEntManager.System<SharedTransformSystem>().GetWorldPosition(clientEnt);
-                var clickable = clientEntManager.GetComponent<ClickableComponent>(clientEnt);
 
-                hit = clickable.CheckClick(sprite, xformQuery.GetComponent(clientEnt), xformQuery, new Vector2(clickPosX, clickPosY) + pos, eye, out _, out _, out _);
+                hit = clientEntManager.System<ClickableSystem>().CheckClick((clientEnt, null, sprite, null), new Vector2(clickPosX, clickPosY) + pos, eye, out _, out _, out _);
             });
 
             await server.WaitPost(() =>
diff --git a/Content.IntegrationTests/Tests/Commands/PardonCommand.cs b/Content.IntegrationTests/Tests/Commands/PardonCommand.cs
index b3a66e3211c..4db9eabf5c6 100644
--- a/Content.IntegrationTests/Tests/Commands/PardonCommand.cs
+++ b/Content.IntegrationTests/Tests/Commands/PardonCommand.cs
@@ -28,7 +28,7 @@ public async Task PardonTest()
 
             Assert.That(netMan.IsConnected);
 
-            Assert.That(sPlayerManager.Sessions.Count(), Is.EqualTo(1));
+            Assert.That(sPlayerManager.Sessions, Has.Length.EqualTo(1));
             // No bans on record
             Assert.Multiple(async () =>
             {
@@ -50,7 +50,7 @@ public async Task PardonTest()
 
             var banReason = "test";
 
-            Assert.That(sPlayerManager.Sessions.Count(), Is.EqualTo(1));
+            Assert.That(sPlayerManager.Sessions, Has.Length.EqualTo(1));
             // Ban the client for 24 hours
             await server.WaitPost(() => sConsole.ExecuteCommand($"ban {clientSession.Name} {banReason} 1440"));
 
@@ -63,7 +63,7 @@ public async Task PardonTest()
             });
 
             await pair.RunTicksSync(5);
-            Assert.That(sPlayerManager.Sessions.Count(), Is.EqualTo(0));
+            Assert.That(sPlayerManager.Sessions, Has.Length.EqualTo(0));
             Assert.That(!netMan.IsConnected);
 
             // Try to pardon a ban that does not exist
@@ -143,11 +143,11 @@ public async Task PardonTest()
             });
 
             // Reconnect client. Slightly faster than dirtying the pair.
-            Assert.That(sPlayerManager.Sessions.Count(), Is.EqualTo(0));
+            Assert.That(sPlayerManager.Sessions, Is.Empty);
             client.SetConnectTarget(server);
             await client.WaitPost(() => netMan.ClientConnect(null!, 0, null!));
             await pair.RunTicksSync(5);
-            Assert.That(sPlayerManager.Sessions.Count(), Is.EqualTo(1));
+            Assert.That(sPlayerManager.Sessions, Has.Length.EqualTo(1));
 
             await pair.CleanReturnAsync();
         }
diff --git a/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs b/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs
index 2fda3ad58e6..cfc80073066 100644
--- a/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs
+++ b/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs
@@ -37,9 +37,9 @@ public async Task RejuvenateDeadTest()
             var server = pair.Server;
             var entManager = server.ResolveDependency<IEntityManager>();
             var prototypeManager = server.ResolveDependency<IPrototypeManager>();
-            var mobStateSystem = entManager.EntitySysManager.GetEntitySystem<MobStateSystem>();
-            var damSystem = entManager.EntitySysManager.GetEntitySystem<DamageableSystem>();
-            var rejuvenateSystem = entManager.EntitySysManager.GetEntitySystem<RejuvenateSystem>();
+            var mobStateSystem = entManager.System<MobStateSystem>();
+            var damSystem = entManager.System<DamageableSystem>();
+            var rejuvenateSystem = entManager.System<RejuvenateSystem>();
 
             await server.WaitAssertion(() =>
             {
diff --git a/Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs b/Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs
index ff24ec09686..72a05b5246f 100644
--- a/Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs
+++ b/Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs
@@ -26,7 +26,7 @@ public async Task RestartRoundAfterStart(bool lobbyEnabled)
 
             var configManager = server.ResolveDependency<IConfigurationManager>();
             var entityManager = server.ResolveDependency<IEntityManager>();
-            var gameTicker = entityManager.EntitySysManager.GetEntitySystem<GameTicker>();
+            var gameTicker = entityManager.System<GameTicker>();
 
             await pair.RunTicksSync(5);
 
diff --git a/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs b/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs
index c61a70faf0b..37c4b0c9b57 100644
--- a/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs
+++ b/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs
@@ -43,11 +43,11 @@ public async Task TestA()
 
             EntityUid dummy = default;
             var mapManager = server.ResolveDependency<IMapManager>();
-            var mapId = mapManager.CreateMap();
+            var map = await pair.CreateTestMap();
 
             await server.WaitPost(() =>
             {
-                var pos = new MapCoordinates(Vector2.Zero, mapId);
+                var pos = new MapCoordinates(Vector2.Zero, map.MapId);
                 var entStorage = serverEntManager.EntitySysManager.GetEntitySystem<EntityStorageSystem>();
                 var container = serverEntManager.SpawnEntity("ContainerOcclusionA", pos);
                 dummy = serverEntManager.SpawnEntity("ContainerOcclusionDummy", pos);
@@ -85,11 +85,12 @@ public async Task TestB()
 
             EntityUid dummy = default;
             var mapManager = server.ResolveDependency<IMapManager>();
-            var mapId = mapManager.CreateMap();
+
+            var map = await pair.CreateTestMap();
 
             await server.WaitPost(() =>
             {
-                var pos = new MapCoordinates(Vector2.Zero, mapId);
+                var pos = new MapCoordinates(Vector2.Zero, map.MapId);
                 var entStorage = serverEntManager.EntitySysManager.GetEntitySystem<EntityStorageSystem>();
                 var container = serverEntManager.SpawnEntity("ContainerOcclusionB", pos);
                 dummy = serverEntManager.SpawnEntity("ContainerOcclusionDummy", pos);
@@ -127,11 +128,12 @@ public async Task TestAb()
 
             EntityUid dummy = default;
             var mapManager = server.ResolveDependency<IMapManager>();
-            var mapId = mapManager.CreateMap();
+
+            var map = await pair.CreateTestMap();
 
             await server.WaitPost(() =>
             {
-                var pos = new MapCoordinates(Vector2.Zero, mapId);
+                var pos = new MapCoordinates(Vector2.Zero, map.MapId);
                 var entStorage = serverEntManager.EntitySysManager.GetEntitySystem<EntityStorageSystem>();
                 var containerA = serverEntManager.SpawnEntity("ContainerOcclusionA", pos);
                 var containerB = serverEntManager.SpawnEntity("ContainerOcclusionB", pos);
diff --git a/Content.IntegrationTests/Tests/Damageable/DamageSpecifierTest.cs b/Content.IntegrationTests/Tests/Damageable/DamageSpecifierTest.cs
index 41d17ddedae..bd5cac05dd1 100644
--- a/Content.IntegrationTests/Tests/Damageable/DamageSpecifierTest.cs
+++ b/Content.IntegrationTests/Tests/Damageable/DamageSpecifierTest.cs
@@ -14,39 +14,39 @@ public void TestDamageSpecifierOperations()
         // Test basic math operations.
         // I've already nearly broken these once. When editing the operators.
 
-        DamageSpecifier input1 = new() { DamageDict = _input1 };
-        DamageSpecifier input2 = new() { DamageDict = _input2 };
-        DamageSpecifier output1 = new() { DamageDict = _output1 };
-        DamageSpecifier output2 = new() { DamageDict = _output2 };
-        DamageSpecifier output3 = new() { DamageDict = _output3 };
-        DamageSpecifier output4 = new() { DamageDict = _output4 };
-        DamageSpecifier output5 = new() { DamageDict = _output5 };
+        DamageSpecifier input1 = new() { DamageDict = Input1 };
+        DamageSpecifier input2 = new() { DamageDict = Input2 };
+        DamageSpecifier output1 = new() { DamageDict = Output1 };
+        DamageSpecifier output2 = new() { DamageDict = Output2 };
+        DamageSpecifier output3 = new() { DamageDict = Output3 };
+        DamageSpecifier output4 = new() { DamageDict = Output4 };
+        DamageSpecifier output5 = new() { DamageDict = Output5 };
 
         Assert.Multiple(() =>
         {
-            Assert.That((-input1).Equals(output1));
-            Assert.That((input1 / 2).Equals(output2));
-            Assert.That((input1 * 2).Equals(output3));
+            Assert.That(-input1, Is.EqualTo(output1));
+            Assert.That(input1 / 2, Is.EqualTo(output2));
+            Assert.That(input1 * 2, Is.EqualTo(output3));
         });
 
-        var difference = (input1 - input2);
-        Assert.That(difference.Equals(output4));
+        var difference = input1 - input2;
+        Assert.That(difference, Is.EqualTo(output4));
 
-        var difference2 = (-input2) + input1;
-        Assert.That(difference.Equals(difference2));
+        var difference2 = -input2 + input1;
+        Assert.That(difference, Is.EqualTo(difference2));
 
         difference.Clamp(-0.25f, 0.25f);
-        Assert.That(difference.Equals(output5));
+        Assert.That(difference, Is.EqualTo(output5));
     }
 
-    static Dictionary<string, FixedPoint2> _input1 = new()
+    private static readonly Dictionary<string, FixedPoint2> Input1 = new()
     {
         { "A", 1.5f },
         { "B", 2 },
         { "C", 3 }
     };
 
-    static Dictionary<string, FixedPoint2> _input2 = new()
+    private static readonly Dictionary<string, FixedPoint2> Input2 = new()
     {
         { "A", 1 },
         { "B", 2 },
@@ -54,28 +54,28 @@ public void TestDamageSpecifierOperations()
         { "D", 0.05f }
     };
 
-    static Dictionary<string, FixedPoint2> _output1 = new()
+    private static readonly Dictionary<string, FixedPoint2> Output1 = new()
     {
         { "A", -1.5f },
         { "B", -2 },
         { "C", -3 }
     };
 
-    static Dictionary<string, FixedPoint2> _output2 = new()
+    private static readonly Dictionary<string, FixedPoint2> Output2 = new()
     {
         { "A", 0.75f },
         { "B", 1 },
         { "C", 1.5 }
     };
 
-    static Dictionary<string, FixedPoint2> _output3 = new()
+    private static readonly Dictionary<string, FixedPoint2> Output3 = new()
     {
         { "A", 3f },
         { "B", 4 },
         { "C", 6 }
     };
 
-    static Dictionary<string, FixedPoint2> _output4 = new()
+    private static readonly Dictionary<string, FixedPoint2> Output4 = new()
     {
         { "A", 0.5f },
         { "B", 0 },
@@ -83,7 +83,7 @@ public void TestDamageSpecifierOperations()
         { "D", -0.05f }
     };
 
-    static Dictionary<string, FixedPoint2> _output5 = new()
+    private static readonly Dictionary<string, FixedPoint2> Output5 = new()
     {
         { "A", 0.25f },
         { "B", 0 },
diff --git a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
index c40b8ed286f..69069fc82fe 100644
--- a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
+++ b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
@@ -107,10 +107,11 @@ public async Task TestDamageableComponents()
 
             FixedPoint2 typeDamage;
 
+            var map = await pair.CreateTestMap();
+
             await server.WaitPost(() =>
             {
-                var map = sMapManager.CreateMap();
-                var coordinates = new MapCoordinates(0, 0, map);
+                var coordinates = map.MapCoords;
 
                 sDamageableEntity = sEntityManager.SpawnEntity("TestDamageableEntityId", coordinates);
                 sDamageableComponent = sEntityManager.GetComponent<DamageableComponent>(sDamageableEntity);
diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs
index e14a8264678..a50238d8f50 100644
--- a/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs
+++ b/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs
@@ -3,6 +3,7 @@
 using Content.Server.Destructible.Thresholds.Behaviors;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
+using Content.Shared.Destructible.Thresholds;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
 using static Content.IntegrationTests.Tests.Destructible.DestructibleTestPrototypes;
diff --git a/Content.IntegrationTests/Tests/Doors/AirlockTest.cs b/Content.IntegrationTests/Tests/Doors/AirlockTest.cs
index 2fbaa91456f..e47c73611a4 100644
--- a/Content.IntegrationTests/Tests/Doors/AirlockTest.cs
+++ b/Content.IntegrationTests/Tests/Doors/AirlockTest.cs
@@ -123,24 +123,24 @@ public async Task AirlockBlockTest()
             var xformSystem = entityManager.System<SharedTransformSystem>();
 
             PhysicsComponent physBody = null;
-            EntityUid AirlockPhysicsDummy = default;
+            EntityUid airlockPhysicsDummy = default;
             EntityUid airlock = default;
             DoorComponent doorComponent = null;
 
-            var AirlockPhysicsDummyStartingX = -1;
+            var airlockPhysicsDummyStartingX = -1;
+
+            var map = await pair.CreateTestMap();
 
             await server.WaitAssertion(() =>
             {
-                var mapId = mapManager.CreateMap();
-
-                var humanCoordinates = new MapCoordinates(new Vector2(AirlockPhysicsDummyStartingX, 0), mapId);
-                AirlockPhysicsDummy = entityManager.SpawnEntity("AirlockPhysicsDummy", humanCoordinates);
+                var humanCoordinates = new MapCoordinates(new Vector2(airlockPhysicsDummyStartingX, 0), map.MapId);
+                airlockPhysicsDummy = entityManager.SpawnEntity("AirlockPhysicsDummy", humanCoordinates);
 
-                airlock = entityManager.SpawnEntity("AirlockDummy", new MapCoordinates(new Vector2(0, 0), mapId));
+                airlock = entityManager.SpawnEntity("AirlockDummy", new MapCoordinates(new Vector2(0, 0), map.MapId));
 
                 Assert.Multiple(() =>
                 {
-                    Assert.That(entityManager.TryGetComponent(AirlockPhysicsDummy, out physBody), Is.True);
+                    Assert.That(entityManager.TryGetComponent(airlockPhysicsDummy, out physBody), Is.True);
                     Assert.That(entityManager.TryGetComponent(airlock, out doorComponent), Is.True);
                 });
                 Assert.That(doorComponent.State, Is.EqualTo(DoorState.Closed));
@@ -152,7 +152,7 @@ await server.WaitAssertion(() =>
             await server.WaitAssertion(() => Assert.That(physBody, Is.Not.EqualTo(null)));
             await server.WaitPost(() =>
             {
-                physicsSystem.SetLinearVelocity(AirlockPhysicsDummy, new Vector2(0.5f, 0f), body: physBody);
+                physicsSystem.SetLinearVelocity(airlockPhysicsDummy, new Vector2(0.5f, 0f), body: physBody);
             });
 
             for (var i = 0; i < 240; i += 10)
@@ -176,7 +176,7 @@ await server.WaitPost(() =>
             // Blocked by the airlock
             await server.WaitAssertion(() =>
             {
-                Assert.That(Math.Abs(xformSystem.GetWorldPosition(AirlockPhysicsDummy).X - 1), Is.GreaterThan(0.01f));
+                Assert.That(Math.Abs(xformSystem.GetWorldPosition(airlockPhysicsDummy).X - 1), Is.GreaterThan(0.01f));
             });
             await pair.CleanReturnAsync();
         }
diff --git a/Content.IntegrationTests/Tests/DummyIconTest.cs b/Content.IntegrationTests/Tests/DummyIconTest.cs
index a11191a51ea..df2d28a2ea2 100644
--- a/Content.IntegrationTests/Tests/DummyIconTest.cs
+++ b/Content.IntegrationTests/Tests/DummyIconTest.cs
@@ -21,7 +21,7 @@ await client.WaitAssertion(() =>
             {
                 foreach (var proto in prototypeManager.EnumeratePrototypes<EntityPrototype>())
                 {
-                    if (proto.NoSpawn || proto.Abstract || pair.IsTestPrototype(proto) || !proto.Components.ContainsKey("Sprite"))
+                    if (proto.HideSpawnMenu || proto.Abstract || pair.IsTestPrototype(proto) || !proto.Components.ContainsKey("Sprite"))
                         continue;
 
                     Assert.DoesNotThrow(() =>
diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs
index 1fc739fb0c7..42bea8989cd 100644
--- a/Content.IntegrationTests/Tests/EntityTest.cs
+++ b/Content.IntegrationTests/Tests/EntityTest.cs
@@ -1,15 +1,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
-using Content.Server.Humanoid.Components;
-using Content.Shared.Coordinates;
-using Content.Shared.Prototypes;
 using Robust.Shared;
 using Robust.Shared.Configuration;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Log;
 using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 
@@ -47,7 +43,7 @@ await server.WaitPost(() =>
 
                 foreach (var protoId in protoIds)
                 {
-                    var mapId = mapManager.CreateMap();
+                    mapSystem.CreateMap(out var mapId);
                     var grid = mapManager.CreateGridEntity(mapId);
                     // TODO: Fix this better in engine.
                     mapSystem.SetTile(grid.Owner, grid.Comp, Vector2i.Zero, new Tile(1));
@@ -155,6 +151,7 @@ public async Task SpawnAndDirtyAllEntities()
             var prototypeMan = server.ResolveDependency<IPrototypeManager>();
             var mapManager = server.ResolveDependency<IMapManager>();
             var sEntMan = server.ResolveDependency<IEntityManager>();
+            var mapSys = server.System<SharedMapSystem>();
 
             Assert.That(cfg.GetCVar(CVars.NetPVS), Is.False);
 
@@ -170,7 +167,7 @@ await server.WaitPost(() =>
             {
                 foreach (var protoId in protoIds)
                 {
-                    var mapId = mapManager.CreateMap();
+                    mapSys.CreateMap(out var mapId);
                     var grid = mapManager.CreateGridEntity(mapId);
                     var ent = sEntMan.SpawnEntity(protoId, new EntityCoordinates(grid.Owner, 0.5f, 0.5f));
                     foreach (var (_, component) in sEntMan.GetNetComponents(ent))
@@ -227,6 +224,7 @@ public async Task SpawnAndDeleteEntityCountTest()
             var settings = new PoolSettings { Connected = true, Dirty = true };
             await using var pair = await PoolManager.GetServerClient(settings);
             var mapManager = pair.Server.ResolveDependency<IMapManager>();
+            var mapSys = pair.Server.System<SharedMapSystem>();
             var server = pair.Server;
             var client = pair.Client;
 
@@ -256,7 +254,7 @@ public async Task SpawnAndDeleteEntityCountTest()
 
             await server.WaitPost(() =>
             {
-               mapId = mapManager.CreateMap();
+                mapSys.CreateMap(out mapId);
             });
 
             var coords = new MapCoordinates(Vector2.Zero, mapId);
diff --git a/Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs b/Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs
index 6e88d6928e6..d6f9bf35986 100644
--- a/Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs
+++ b/Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs
@@ -16,14 +16,15 @@ namespace Content.IntegrationTests.Tests.Fluids;
 [TestOf(typeof(SpreaderSystem))]
 public sealed class FluidSpill
 {
-    private static PuddleComponent? GetPuddle(IEntityManager entityManager, MapGridComponent mapGrid, Vector2i pos)
+    private static PuddleComponent? GetPuddle(IEntityManager entityManager, Entity<MapGridComponent> mapGrid, Vector2i pos)
     {
         return GetPuddleEntity(entityManager, mapGrid, pos)?.Comp;
     }
 
-    private static Entity<PuddleComponent>? GetPuddleEntity(IEntityManager entityManager, MapGridComponent mapGrid, Vector2i pos)
+    private static Entity<PuddleComponent>? GetPuddleEntity(IEntityManager entityManager, Entity<MapGridComponent> mapGrid, Vector2i pos)
     {
-        foreach (var uid in mapGrid.GetAnchoredEntities(pos))
+        var mapSys = entityManager.System<SharedMapSystem>();
+        foreach (var uid in mapSys.GetAnchoredEntities(mapGrid, mapGrid.Comp, pos))
         {
             if (entityManager.TryGetComponent(uid, out PuddleComponent? puddleComponent))
                 return (uid, puddleComponent);
@@ -39,9 +40,9 @@ public async Task SpillCorner()
         var server = pair.Server;
         var mapManager = server.ResolveDependency<IMapManager>();
         var entityManager = server.ResolveDependency<IEntityManager>();
-        var puddleSystem = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<PuddleSystem>();
+        var puddleSystem = server.System<PuddleSystem>();
+        var mapSystem = server.System<SharedMapSystem>();
         var gameTiming = server.ResolveDependency<IGameTiming>();
-        MapId mapId;
         EntityUid gridId = default;
 
         /*
@@ -52,7 +53,7 @@ . . .
         */
         await server.WaitPost(() =>
         {
-            mapId = mapManager.CreateMap();
+            mapSystem.CreateMap(out var mapId);
             var grid = mapManager.CreateGridEntity(mapId);
             gridId = grid.Owner;
 
@@ -60,12 +61,12 @@ await server.WaitPost(() =>
             {
                 for (var y = 0; y < 3; y++)
                 {
-                    grid.Comp.SetTile(new Vector2i(x, y), new Tile(1));
+                    mapSystem.SetTile(grid, new Vector2i(x, y), new Tile(1));
                 }
             }
 
-            entityManager.SpawnEntity("WallReinforced", grid.Comp.GridTileToLocal(new Vector2i(0, 1)));
-            entityManager.SpawnEntity("WallReinforced", grid.Comp.GridTileToLocal(new Vector2i(1, 0)));
+            entityManager.SpawnEntity("WallReinforced", mapSystem.GridTileToLocal(grid, grid.Comp, new Vector2i(0, 1)));
+            entityManager.SpawnEntity("WallReinforced", mapSystem.GridTileToLocal(grid, grid.Comp, new Vector2i(1, 0)));
         });
 
 
@@ -74,10 +75,10 @@ await server.WaitAssertion(() =>
         {
             var grid = entityManager.GetComponent<MapGridComponent>(gridId);
             var solution = new Solution("Blood", FixedPoint2.New(100));
-            var tileRef = grid.GetTileRef(puddleOrigin);
+            var tileRef = mapSystem.GetTileRef(gridId, grid, puddleOrigin);
 #pragma warning disable NUnit2045 // Interdependent tests
             Assert.That(puddleSystem.TrySpillAt(tileRef, solution, out _), Is.True);
-            Assert.That(GetPuddle(entityManager, grid, puddleOrigin), Is.Not.Null);
+            Assert.That(GetPuddle(entityManager, (gridId, grid), puddleOrigin), Is.Not.Null);
 #pragma warning restore NUnit2045
         });
 
@@ -87,7 +88,7 @@ await server.WaitAssertion(() =>
         await server.WaitAssertion(() =>
         {
             var grid = entityManager.GetComponent<MapGridComponent>(gridId);
-            var puddle = GetPuddleEntity(entityManager, grid, puddleOrigin);
+            var puddle = GetPuddleEntity(entityManager, (gridId, grid), puddleOrigin);
 
 #pragma warning disable NUnit2045 // Interdependent tests
             Assert.That(puddle, Is.Not.Null);
@@ -104,7 +105,7 @@ await server.WaitAssertion(() =>
                     }
 
                     var newPos = new Vector2i(x, y);
-                    var sidePuddle = GetPuddle(entityManager, grid, newPos);
+                    var sidePuddle = GetPuddle(entityManager, (gridId, grid), newPos);
                     Assert.That(sidePuddle, Is.Null);
                 }
             }
diff --git a/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs b/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs
index a9069892dff..ee2d0cb1f7a 100644
--- a/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs
+++ b/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs
@@ -5,7 +5,6 @@
 using Content.Shared.Fluids.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
 
 namespace Content.IntegrationTests.Tests.Fluids
 {
@@ -21,8 +20,7 @@ public async Task TilePuddleTest()
 
             var testMap = await pair.CreateTestMap();
 
-            var entitySystemManager = server.ResolveDependency<IEntitySystemManager>();
-            var spillSystem = entitySystemManager.GetEntitySystem<PuddleSystem>();
+            var spillSystem = server.System<PuddleSystem>();
 
             await server.WaitAssertion(() =>
             {
@@ -46,17 +44,19 @@ public async Task SpaceNoPuddleTest()
             var server = pair.Server;
 
             var testMap = await pair.CreateTestMap();
-            var grid = testMap.Grid.Comp;
+            var grid = testMap.Grid;
 
             var entitySystemManager = server.ResolveDependency<IEntitySystemManager>();
-            var spillSystem = entitySystemManager.GetEntitySystem<PuddleSystem>();
+            var spillSystem = server.System<PuddleSystem>();
+            var mapSystem = server.System<SharedMapSystem>();
 
             // Remove all tiles
             await server.WaitPost(() =>
             {
-                foreach (var tile in grid.GetAllTiles())
+                var tiles = mapSystem.GetAllTiles(grid.Owner, grid.Comp);
+                foreach (var tile in tiles)
                 {
-                    grid.SetTile(tile.GridIndices, Tile.Empty);
+                    mapSystem.SetTile(grid, tile.GridIndices, Tile.Empty);
                 }
             });
 
diff --git a/Content.IntegrationTests/Tests/FollowerSystemTest.cs b/Content.IntegrationTests/Tests/FollowerSystemTest.cs
index 4d308c6d911..f4447426c77 100644
--- a/Content.IntegrationTests/Tests/FollowerSystemTest.cs
+++ b/Content.IntegrationTests/Tests/FollowerSystemTest.cs
@@ -22,6 +22,7 @@ public async Task FollowerMapDeleteTest()
         var mapMan = server.ResolveDependency<IMapManager>();
         var sysMan = server.ResolveDependency<IEntitySystemManager>();
         var logMan = server.ResolveDependency<ILogManager>();
+        var mapSys = server.System<SharedMapSystem>();
         var logger = logMan.RootSawmill;
 
         await server.WaitPost(() =>
@@ -29,7 +30,7 @@ await server.WaitPost(() =>
             var followerSystem = sysMan.GetEntitySystem<FollowerSystem>();
 
             // Create a map to spawn the observers on.
-            var map = mapMan.CreateMap();
+            mapSys.CreateMap(out var map);
 
             // Spawn an observer to be followed.
             var followed = entMan.SpawnEntity(GameTicker.ObserverPrototypeName, new MapCoordinates(0, 0, map));
@@ -41,7 +42,7 @@ await server.WaitPost(() =>
 
             followerSystem.StartFollowingEntity(follower, followed);
 
-            entMan.DeleteEntity(mapMan.GetMapEntityId(map));
+            entMan.DeleteEntity(mapSys.GetMap(map));
         });
         await pair.CleanReturnAsync();
     }
diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs b/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs
index 0ac6b68a3ec..2570e2246a6 100644
--- a/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs
+++ b/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs
@@ -1,5 +1,4 @@
 #nullable enable
-using System.Numerics;
 using Content.Server.Cuffs;
 using Content.Shared.Body.Components;
 using Content.Shared.Cuffs.Components;
@@ -7,7 +6,6 @@
 using Robust.Server.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
-using Robust.Shared.Maths;
 
 namespace Content.IntegrationTests.Tests.GameObjects.Components.ActionBlocking
 {
@@ -52,10 +50,11 @@ public async Task Test()
             var mapManager = server.ResolveDependency<IMapManager>();
             var host = server.ResolveDependency<IServerConsoleHost>();
 
+            var map = await pair.CreateTestMap();
+
             await server.WaitAssertion(() =>
             {
-                var mapId = mapManager.CreateMap();
-                var coordinates = new MapCoordinates(Vector2.Zero, mapId);
+                var coordinates = map.MapCoords;
 
                 var cuffableSys = entityManager.System<CuffableSystem>();
                 var xformSys = entityManager.System<SharedTransformSystem>();
diff --git a/Content.IntegrationTests/Tests/GameRules/AntagPreferenceTest.cs b/Content.IntegrationTests/Tests/GameRules/AntagPreferenceTest.cs
index 1bea33a82bc..b215584c57a 100644
--- a/Content.IntegrationTests/Tests/GameRules/AntagPreferenceTest.cs
+++ b/Content.IntegrationTests/Tests/GameRules/AntagPreferenceTest.cs
@@ -47,7 +47,7 @@ public async Task TestLobbyPlayersValid()
         Assert.That(sys.IsEntityValid(client.AttachedEntity, def), Is.True);
 
         // By default, traitor/antag preferences are disabled, so the pool should be empty.
-        var sessions = new List<ICommonSession>{pair.Player!};
+        var sessions = new List<ICommonSession> { pair.Player! };
         var pool = sys.GetPlayerPool(rule, sessions, def);
         Assert.That(pool.Count, Is.EqualTo(0));
 
diff --git a/Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs b/Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs
index 1fed226beee..185316adf36 100644
--- a/Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs
+++ b/Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs
@@ -1,9 +1,9 @@
-#nullable enable
+#nullable enable
 using Content.Server.GameTicking;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Presets;
 using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
+using Content.Shared.GameTicking.Components;
 using Robust.Shared.GameObjects;
 
 namespace Content.IntegrationTests.Tests.GameRules;
@@ -36,7 +36,7 @@ public sealed class FailAndStartPresetTest
 - type: entity
   id: TestRule
   parent: BaseGameRule
-  noSpawn: true
+  categories: [ GameRules ]
   components:
   - type: GameRule
     minPlayers: 0
@@ -45,7 +45,7 @@ public sealed class FailAndStartPresetTest
 - type: entity
   id: TestRuleTenPlayers
   parent: BaseGameRule
-  noSpawn: true
+  categories: [ GameRules ]
   components:
   - type: GameRule
     minPlayers: 10
@@ -110,7 +110,7 @@ public async Task FailAndStartTest()
         player = pair.Player!.AttachedEntity!.Value;
         Assert.That(entMan.EntityExists(player));
 
-        ticker.SetGamePreset((GamePresetPrototype?)null);
+        ticker.SetGamePreset((GamePresetPrototype?) null);
         server.CfgMan.SetCVar(CCVars.GridFill, false);
         server.CfgMan.SetCVar(CCVars.GameLobbyFallbackEnabled, true);
         server.CfgMan.SetCVar(CCVars.GameLobbyDefaultPreset, "secret");
diff --git a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
index 48fe46a8c85..a4563aa37e6 100644
--- a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
+++ b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
@@ -5,8 +5,8 @@
 using Content.Server.GameTicking.Presets;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Mind;
-using Content.Server.Pinpointer;
 using Content.Server.Roles;
+using Content.Server.RoundEnd;
 using Content.Server.Shuttles.Components;
 using Content.Server.Station.Components;
 using Content.Shared.CCVar;
@@ -17,6 +17,8 @@
 using Content.Shared.Inventory;
 using Content.Shared.NPC.Systems;
 using Content.Shared.NukeOps;
+using Content.Shared.Pinpointer;
+using Content.Shared.Station.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map.Components;
@@ -49,6 +51,7 @@ public async Task TryStopNukeOpsFromConstantlyFailing()
         var roleSys = server.System<RoleSystem>();
         var invSys = server.System<InventorySystem>();
         var factionSys = server.System<NpcFactionSystem>();
+        var roundEndSys = server.System<RoundEndSystem>();
 
         server.CfgMan.SetCVar(CCVars.GridFill, true);
 
@@ -63,11 +66,11 @@ public async Task TryStopNukeOpsFromConstantlyFailing()
 
         // Opt into the nukies role.
         await pair.SetAntagPreference("NukeopsCommander", true);
-        await pair.SetAntagPreference( "NukeopsMedic", true, dummies[1].UserId);
+        await pair.SetAntagPreference("NukeopsMedic", true, dummies[1].UserId);
 
         // Initially, the players have no attached entities
         Assert.That(pair.Player?.AttachedEntity, Is.Null);
-        Assert.That(dummies.All(x => x.AttachedEntity  == null));
+        Assert.That(dummies.All(x => x.AttachedEntity == null));
 
         // There are no grids or maps
         Assert.That(entMan.Count<MapComponent>(), Is.Zero);
@@ -102,8 +105,6 @@ public async Task TryStopNukeOpsFromConstantlyFailing()
         // Maps now exist
         Assert.That(entMan.Count<MapComponent>(), Is.GreaterThan(0));
         Assert.That(entMan.Count<MapGridComponent>(), Is.GreaterThan(0));
-        Assert.That(entMan.Count<StationDataComponent>(), Is.EqualTo(2)); // The main station & nukie station
-        Assert.That(entMan.Count<StationMemberComponent>(), Is.GreaterThan(2)); // Each station has at least 1 grid, plus some shuttles // DeltaV - Changed to 2, ATS isn't a station member
         Assert.That(entMan.Count<StationCentcommComponent>(), Is.EqualTo(1));
 
         // And we now have nukie related components
@@ -150,20 +151,22 @@ void CheckDummy(int i)
         }
 
         // The game rule exists, and all the stations/shuttles/maps are properly initialized
-        var rule = entMan.AllComponents<NukeopsRuleComponent>().Single().Component;
+        var rule = entMan.AllComponents<NukeopsRuleComponent>().Single();
+        var ruleComp = rule.Component;
         var gridsRule = entMan.AllComponents<RuleGridsComponent>().Single().Component;
         foreach (var grid in gridsRule.MapGrids)
         {
             Assert.That(entMan.EntityExists(grid));
             Assert.That(entMan.HasComponent<MapGridComponent>(grid));
-            Assert.That(entMan.HasComponent<StationMemberComponent>(grid));
         }
-        Assert.That(entMan.EntityExists(rule.TargetStation));
+        Assert.That(entMan.EntityExists(ruleComp.TargetStation));
 
-        Assert.That(entMan.HasComponent<StationDataComponent>(rule.TargetStation));
+        Assert.That(entMan.HasComponent<StationDataComponent>(ruleComp.TargetStation));
 
-        var nukieShuttlEnt = entMan.AllComponents<NukeOpsShuttleComponent>().FirstOrDefault().Uid;
+        var nukieShuttle = entMan.AllComponents<NukeOpsShuttleComponent>().Single();
+        var nukieShuttlEnt = nukieShuttle.Uid;
         Assert.That(entMan.EntityExists(nukieShuttlEnt));
+        Assert.That(nukieShuttle.Component.AssociatedRule, Is.EqualTo(rule.Uid));
 
         EntityUid? nukieStationEnt = null;
         foreach (var grid in gridsRule.MapGrids)
@@ -175,22 +178,16 @@ void CheckDummy(int i)
             }
         }
 
-        Assert.That(entMan.EntityExists(nukieStationEnt));
-        var nukieStation = entMan.GetComponent<StationMemberComponent>(nukieStationEnt!.Value);
-
-        Assert.That(entMan.EntityExists(nukieStation.Station));
-        Assert.That(nukieStation.Station, Is.Not.EqualTo(rule.TargetStation));
-
+        Assert.That(!entMan.EntityExists(nukieStationEnt)); // its not supposed to be a station!
         Assert.That(server.MapMan.MapExists(gridsRule.Map));
         var nukieMap = mapSys.GetMap(gridsRule.Map!.Value);
 
-        var targetStation = entMan.GetComponent<StationDataComponent>(rule.TargetStation!.Value);
+        var targetStation = entMan.GetComponent<StationDataComponent>(ruleComp.TargetStation!.Value);
         var targetGrid = targetStation.Grids.First();
         var targetMap = entMan.GetComponent<TransformComponent>(targetGrid).MapUid!.Value;
         Assert.That(targetMap, Is.Not.EqualTo(nukieMap));
 
         Assert.That(entMan.GetComponent<TransformComponent>(player).MapUid, Is.EqualTo(nukieMap));
-        Assert.That(entMan.GetComponent<TransformComponent>(nukieStationEnt.Value).MapUid, Is.EqualTo(nukieMap));
         Assert.That(entMan.GetComponent<TransformComponent>(nukieShuttlEnt).MapUid, Is.EqualTo(nukieMap));
 
         // The maps are all map-initialized, including the player
@@ -204,9 +201,8 @@ void CheckDummy(int i)
         Assert.That(LifeStage(player), Is.GreaterThan(EntityLifeStage.Initialized));
         Assert.That(LifeStage(nukieMap), Is.GreaterThan(EntityLifeStage.Initialized));
         Assert.That(LifeStage(targetMap), Is.GreaterThan(EntityLifeStage.Initialized));
-        Assert.That(LifeStage(nukieStationEnt.Value), Is.GreaterThan(EntityLifeStage.Initialized));
         Assert.That(LifeStage(nukieShuttlEnt), Is.GreaterThan(EntityLifeStage.Initialized));
-        Assert.That(LifeStage(rule.TargetStation), Is.GreaterThan(EntityLifeStage.Initialized));
+        Assert.That(LifeStage(ruleComp.TargetStation), Is.GreaterThan(EntityLifeStage.Initialized));
 
         // Make sure the player has hands. We've had fucking disarmed nukies before.
         Assert.That(entMan.HasComponent<HandsComponent>(player));
@@ -222,10 +218,10 @@ void CheckDummy(int i)
         }
         Assert.That(total, Is.GreaterThan(3));
 
-        // Finally lets check the nukie commander passed basic training and figured out how to breathe.
+        // Check the nukie commander passed basic training and figured out how to breathe.
         var totalSeconds = 30;
         var totalTicks = (int) Math.Ceiling(totalSeconds / server.Timing.TickPeriod.TotalSeconds);
-        int increment = 5;
+        var increment = 5;
         var resp = entMan.GetComponent<RespiratorComponent>(player);
         var damage = entMan.GetComponent<DamageableComponent>(player);
         for (var tick = 0; tick < totalTicks; tick += increment)
@@ -235,7 +231,24 @@ void CheckDummy(int i)
             Assert.That(damage.TotalDamage, Is.EqualTo(FixedPoint2.Zero));
         }
 
-        ticker.SetGamePreset((GamePresetPrototype?)null);
+        // Check that the round does not end prematurely when agents are deleted in the outpost
+        var nukies = dummyEnts.Where(entMan.HasComponent<NukeOperativeComponent>).Append(player).ToArray();
+        await server.WaitAssertion(() =>
+        {
+            for (var i = 0; i < nukies.Length - 1; i++)
+            {
+                entMan.DeleteEntity(nukies[i]);
+                Assert.That(roundEndSys.IsRoundEndRequested, Is.False,
+                    $"The round ended, but {nukies.Length - i - 1} nukies are still alive!");
+            }
+            // Delete the last nukie and make sure the round ends.
+            entMan.DeleteEntity(nukies[^1]);
+
+            Assert.That(roundEndSys.IsRoundEndRequested,
+                "All nukies were deleted, but the round didn't end!");
+        });
+
+        ticker.SetGamePreset((GamePresetPrototype?) null);
         await pair.CleanReturnAsync();
     }
 }
diff --git a/Content.IntegrationTests/Tests/GameRules/RuleMaxTimeRestartTest.cs b/Content.IntegrationTests/Tests/GameRules/RuleMaxTimeRestartTest.cs
index 20a157e33e8..4708bd10c08 100644
--- a/Content.IntegrationTests/Tests/GameRules/RuleMaxTimeRestartTest.cs
+++ b/Content.IntegrationTests/Tests/GameRules/RuleMaxTimeRestartTest.cs
@@ -1,9 +1,9 @@
 using Content.Server.GameTicking;
 using Content.Server.GameTicking.Commands;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Shared.CCVar;
+using Content.Shared.GameTicking.Components;
 using Robust.Shared.Configuration;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Timing;
diff --git a/Content.IntegrationTests/Tests/GameRules/TraitorRuleTest.cs b/Content.IntegrationTests/Tests/GameRules/TraitorRuleTest.cs
new file mode 100644
index 00000000000..31d33ba6174
--- /dev/null
+++ b/Content.IntegrationTests/Tests/GameRules/TraitorRuleTest.cs
@@ -0,0 +1,133 @@
+using System.Linq;
+using Content.Server.Antag.Components;
+using Content.Server.GameTicking;
+using Content.Server.GameTicking.Rules;
+using Content.Server.GameTicking.Rules.Components;
+using Content.Server.Mind;
+using Content.Server.Roles;
+using Content.Shared.GameTicking;
+using Content.Shared.GameTicking.Components;
+using Content.Shared.Mind;
+using Content.Shared.NPC.Systems;
+using Content.Shared.Objectives.Components;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Prototypes;
+
+namespace Content.IntegrationTests.Tests.GameRules;
+
+[TestFixture]
+public sealed class TraitorRuleTest
+{
+    private const string TraitorGameRuleProtoId = "Traitor";
+    private const string TraitorAntagRoleName = "Traitor";
+
+    [Test]
+    public async Task TestTraitorObjectives()
+    {
+        await using var pair = await PoolManager.GetServerClient(new PoolSettings()
+        {
+            Dirty = true,
+            DummyTicker = false,
+            Connected = true,
+            InLobby = true,
+        });
+        var server = pair.Server;
+        var client = pair.Client;
+        var entMan = server.EntMan;
+        var protoMan = server.ProtoMan;
+        var compFact = server.ResolveDependency<IComponentFactory>();
+        var ticker = server.System<GameTicker>();
+        var mindSys = server.System<MindSystem>();
+        var roleSys = server.System<RoleSystem>();
+        var factionSys = server.System<NpcFactionSystem>();
+        var traitorRuleSys = server.System<TraitorRuleSystem>();
+
+        // Look up the minimum player count and max total objective difficulty for the game rule
+        var minPlayers = 1;
+        var maxDifficulty = 0f;
+        await server.WaitAssertion(() =>
+        {
+            Assert.That(protoMan.TryIndex<EntityPrototype>(TraitorGameRuleProtoId, out var gameRuleEnt),
+            $"Failed to lookup traitor game rule entity prototype with ID \"{TraitorGameRuleProtoId}\"!");
+
+            Assert.That(gameRuleEnt.TryGetComponent<GameRuleComponent>(out var gameRule, compFact),
+            $"Game rule entity {TraitorGameRuleProtoId} does not have a GameRuleComponent!");
+
+            Assert.That(gameRuleEnt.TryGetComponent<AntagRandomObjectivesComponent>(out var randomObjectives, compFact),
+            $"Game rule entity {TraitorGameRuleProtoId} does not have an AntagRandomObjectivesComponent!");
+
+            minPlayers = gameRule.MinPlayers;
+            maxDifficulty = randomObjectives.MaxDifficulty;
+        });
+
+        // Initially in the lobby
+        Assert.That(ticker.RunLevel, Is.EqualTo(GameRunLevel.PreRoundLobby));
+        Assert.That(client.AttachedEntity, Is.Null);
+        Assert.That(ticker.PlayerGameStatuses[client.User!.Value], Is.EqualTo(PlayerGameStatus.NotReadyToPlay));
+
+        // Add enough dummy players for the game rule
+        var dummies = await pair.Server.AddDummySessions(minPlayers);
+        await pair.RunTicksSync(5);
+
+        // Initially, the players have no attached entities
+        Assert.That(pair.Player?.AttachedEntity, Is.Null);
+        Assert.That(dummies.All(x => x.AttachedEntity == null));
+
+        // Opt-in the player for the traitor role
+        await pair.SetAntagPreference(TraitorAntagRoleName, true);
+
+        // Add the game rule
+        var gameRuleEnt = ticker.AddGameRule(TraitorGameRuleProtoId);
+        Assert.That(entMan.TryGetComponent<TraitorRuleComponent>(gameRuleEnt, out var traitorRule));
+
+        // Ready up
+        ticker.ToggleReadyAll(true);
+        Assert.That(ticker.PlayerGameStatuses.Values.All(x => x == PlayerGameStatus.ReadyToPlay));
+
+        // Start the round
+        await server.WaitPost(() =>
+        {
+            ticker.StartRound();
+            // Force traitor mode to start (skip the delay)
+            ticker.StartGameRule(gameRuleEnt);
+        });
+        await pair.RunTicksSync(10);
+
+        // Game should have started
+        Assert.That(ticker.RunLevel, Is.EqualTo(GameRunLevel.InRound));
+        Assert.That(ticker.PlayerGameStatuses.Values.All(x => x == PlayerGameStatus.JoinedGame));
+        Assert.That(client.EntMan.EntityExists(client.AttachedEntity));
+
+        // Check the player and dummies are spawned
+        var dummyEnts = dummies.Select(x => x.AttachedEntity ?? default).ToArray();
+        var player = pair.Player!.AttachedEntity!.Value;
+        Assert.That(entMan.EntityExists(player));
+        Assert.That(dummyEnts.All(entMan.EntityExists));
+
+        // Make sure the player is a traitor.
+        var mind = mindSys.GetMind(player)!.Value;
+        Assert.That(roleSys.MindIsAntagonist(mind));
+        Assert.That(factionSys.IsMember(player, "Syndicate"), Is.True);
+        Assert.That(factionSys.IsMember(player, "NanoTrasen"), Is.False);
+        Assert.That(traitorRule.TotalTraitors, Is.EqualTo(1));
+        Assert.That(traitorRule.TraitorMinds[0], Is.EqualTo(mind));
+
+        // Check total objective difficulty
+        Assert.That(entMan.TryGetComponent<MindComponent>(mind, out var mindComp));
+        var totalDifficulty = mindComp.Objectives.Sum(o => entMan.GetComponent<ObjectiveComponent>(o).Difficulty);
+        Assert.That(totalDifficulty, Is.AtMost(maxDifficulty),
+            $"MaxDifficulty exceeded! Objectives: {string.Join(", ", mindComp.Objectives.Select(o => FormatObjective(o, entMan)))}");
+        Assert.That(mindComp.Objectives, Is.Not.Empty,
+            $"No objectives assigned!");
+
+
+        await pair.CleanReturnAsync();
+    }
+
+    private static string FormatObjective(Entity<ObjectiveComponent> entity, IEntityManager entMan)
+    {
+        var meta = entMan.GetComponent<MetaDataComponent>(entity);
+        var objective = entMan.GetComponent<ObjectiveComponent>(entity);
+        return $"{meta.EntityName} ({objective.Difficulty})";
+    }
+}
diff --git a/Content.IntegrationTests/Tests/GravityGridTest.cs b/Content.IntegrationTests/Tests/GravityGridTest.cs
index 7f817e8a1e0..64f7a6d0820 100644
--- a/Content.IntegrationTests/Tests/GravityGridTest.cs
+++ b/Content.IntegrationTests/Tests/GravityGridTest.cs
@@ -34,29 +34,25 @@ public async Task Test()
 
             var testMap = await pair.CreateTestMap();
 
-            EntityUid generator = default;
-            var entityMan = server.ResolveDependency<IEntityManager>();
-            var mapMan = server.ResolveDependency<IMapManager>();
+            var entityMan = server.EntMan;
+            var mapMan = server.MapMan;
             var mapSys = entityMan.System<SharedMapSystem>();
 
-            MapGridComponent grid1 = null;
-            MapGridComponent grid2 = null;
-            EntityUid grid1Entity = default!;
-            EntityUid grid2Entity = default!;
+            EntityUid generator = default;
+            Entity<MapGridComponent> grid1 = default;
+            Entity<MapGridComponent> grid2 = default;
 
             // Create grids
             await server.WaitAssertion(() =>
             {
                 var mapId = testMap.MapId;
-                grid1 = mapMan.CreateGrid(mapId);
-                grid2 = mapMan.CreateGrid(mapId);
-                grid1Entity = grid1.Owner;
-                grid2Entity = grid2.Owner;
+                grid1 = mapMan.CreateGridEntity(mapId);
+                grid2 = mapMan.CreateGridEntity(mapId);
 
-                mapSys.SetTile(grid1Entity, grid1, Vector2i.Zero, new Tile(1));
-                mapSys.SetTile(grid2Entity, grid2, Vector2i.Zero, new Tile(1));
+                mapSys.SetTile(grid1, grid1, Vector2i.Zero, new Tile(1));
+                mapSys.SetTile(grid2, grid2, Vector2i.Zero, new Tile(1));
 
-                generator = entityMan.SpawnEntity("GridGravityGeneratorDummy", new EntityCoordinates(grid1Entity, 0.5f, 0.5f));
+                generator = entityMan.SpawnEntity("GridGravityGeneratorDummy", new EntityCoordinates(grid1, 0.5f, 0.5f));
                 Assert.Multiple(() =>
                 {
                     Assert.That(entityMan.HasComponent<GravityGeneratorComponent>(generator));
@@ -77,8 +73,8 @@ await server.WaitAssertion(() =>
                 Assert.Multiple(() =>
                 {
                     Assert.That(generatorComponent.GravityActive, Is.True);
-                    Assert.That(!entityMan.GetComponent<GravityComponent>(grid1Entity).EnabledVV);
-                    Assert.That(entityMan.GetComponent<GravityComponent>(grid2Entity).EnabledVV);
+                    Assert.That(!entityMan.GetComponent<GravityComponent>(grid1).EnabledVV);
+                    Assert.That(entityMan.GetComponent<GravityComponent>(grid2).EnabledVV);
                 });
 
                 // Re-enable needs power so it turns off again.
@@ -95,7 +91,7 @@ await server.WaitAssertion(() =>
                 Assert.Multiple(() =>
                 {
                     Assert.That(generatorComponent.GravityActive, Is.False);
-                    Assert.That(entityMan.GetComponent<GravityComponent>(grid2Entity).EnabledVV, Is.False);
+                    Assert.That(entityMan.GetComponent<GravityComponent>(grid2).EnabledVV, Is.False);
                 });
             });
 
diff --git a/Content.IntegrationTests/Tests/Hands/HandTests.cs b/Content.IntegrationTests/Tests/Hands/HandTests.cs
index 9ecabbeebf6..5e96015feb7 100644
--- a/Content.IntegrationTests/Tests/Hands/HandTests.cs
+++ b/Content.IntegrationTests/Tests/Hands/HandTests.cs
@@ -1,8 +1,10 @@
 using System.Linq;
+using Content.Server.Storage.EntitySystems;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
+using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 
@@ -11,6 +13,19 @@ namespace Content.IntegrationTests.Tests.Hands;
 [TestFixture]
 public sealed class HandTests
 {
+    [TestPrototypes]
+    private const string Prototypes = @"
+- type: entity
+  id: TestPickUpThenDropInContainerTestBox
+  name: box
+  components:
+  - type: EntityStorage
+  - type: ContainerContainer
+    containers:
+      entity_storage: !type:Container
+";
+
+
     [Test]
     public async Task TestPickupDrop()
     {
@@ -57,4 +72,69 @@ await server.WaitPost(() =>
         await server.WaitPost(() => mapMan.DeleteMap(data.MapId));
         await pair.CleanReturnAsync();
     }
+
+    [Test]
+    public async Task TestPickUpThenDropInContainer()
+    {
+        await using var pair = await PoolManager.GetServerClient(new PoolSettings
+        {
+            Connected = true,
+            DummyTicker = false
+        });
+        var server = pair.Server;
+        var map = await pair.CreateTestMap();
+        await pair.RunTicksSync(5);
+
+        var entMan = server.ResolveDependency<IEntityManager>();
+        var playerMan = server.ResolveDependency<IPlayerManager>();
+        var mapMan = server.ResolveDependency<IMapManager>();
+        var sys = entMan.System<SharedHandsSystem>();
+        var tSys = entMan.System<TransformSystem>();
+        var containerSystem = server.System<SharedContainerSystem>();
+
+        EntityUid item = default;
+        EntityUid box = default;
+        EntityUid player = default;
+        HandsComponent hands = default!;
+
+        // spawn the elusive box and crowbar at the coordinates
+        await server.WaitPost(() => box = server.EntMan.SpawnEntity("TestPickUpThenDropInContainerTestBox", map.GridCoords));
+        await server.WaitPost(() => item = server.EntMan.SpawnEntity("Crowbar", map.GridCoords));
+        // place the player at the exact same coordinates and have them grab the crowbar
+        await server.WaitPost(() =>
+        {
+            player = playerMan.Sessions.First().AttachedEntity!.Value;
+            tSys.PlaceNextTo(player, item);
+            hands = entMan.GetComponent<HandsComponent>(player);
+            sys.TryPickup(player, item, hands.ActiveHand!);
+        });
+        await pair.RunTicksSync(5);
+        Assert.That(hands.ActiveHandEntity, Is.EqualTo(item));
+
+        // Open then close the box to place the player, who is holding the crowbar, inside of it
+        var storage = server.System<EntityStorageSystem>();
+        await server.WaitPost(() =>
+        {
+            storage.OpenStorage(box);
+            storage.CloseStorage(box);
+        });
+        await pair.RunTicksSync(5);
+        Assert.That(containerSystem.IsEntityInContainer(player), Is.True);
+
+        // Dropping the item while the player is inside the box should cause the item
+        // to also be inside the same container the player is in now,
+        // with the item not being in the player's hands
+        await server.WaitPost(() =>
+        {
+            sys.TryDrop(player, item, null!);
+        });
+        await pair.RunTicksSync(5);
+        var xform = entMan.GetComponent<TransformComponent>(player);
+        var itemXform = entMan.GetComponent<TransformComponent>(item);
+        Assert.That(hands.ActiveHandEntity, Is.Not.EqualTo(item));
+        Assert.That(containerSystem.IsInSameOrNoContainer((player, xform), (item, itemXform)));
+
+        await server.WaitPost(() => mapMan.DeleteMap(map.MapId));
+        await pair.CleanReturnAsync();
+    }
 }
diff --git a/Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs b/Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs
index 2b844d34f0c..6ac40e92a1e 100644
--- a/Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs
+++ b/Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs
@@ -48,13 +48,9 @@ public async Task InteractionTest()
             var sysMan = server.ResolveDependency<IEntitySystemManager>();
             var handSys = sysMan.GetEntitySystem<SharedHandsSystem>();
 
-            var mapId = MapId.Nullspace;
-            var coords = MapCoordinates.Nullspace;
-            await server.WaitAssertion(() =>
-            {
-                mapId = mapManager.CreateMap();
-                coords = new MapCoordinates(Vector2.Zero, mapId);
-            });
+            var map = await pair.CreateTestMap();
+            var mapId = map.MapId;
+            var coords = map.MapCoords;
 
             await server.WaitIdleAsync();
             EntityUid user = default;
@@ -119,13 +115,9 @@ public async Task InteractionObstructionTest()
             var sysMan = server.ResolveDependency<IEntitySystemManager>();
             var handSys = sysMan.GetEntitySystem<SharedHandsSystem>();
 
-            var mapId = MapId.Nullspace;
-            var coords = MapCoordinates.Nullspace;
-            await server.WaitAssertion(() =>
-            {
-                mapId = mapManager.CreateMap();
-                coords = new MapCoordinates(Vector2.Zero, mapId);
-            });
+            var map = await pair.CreateTestMap();
+            var mapId = map.MapId;
+            var coords = map.MapCoords;
 
             await server.WaitIdleAsync();
             EntityUid user = default;
@@ -190,13 +182,9 @@ public async Task InteractionInRangeTest()
             var sysMan = server.ResolveDependency<IEntitySystemManager>();
             var handSys = sysMan.GetEntitySystem<SharedHandsSystem>();
 
-            var mapId = MapId.Nullspace;
-            var coords = MapCoordinates.Nullspace;
-            await server.WaitAssertion(() =>
-            {
-                mapId = mapManager.CreateMap();
-                coords = new MapCoordinates(Vector2.Zero, mapId);
-            });
+            var map = await pair.CreateTestMap();
+            var mapId = map.MapId;
+            var coords = map.MapCoords;
 
             await server.WaitIdleAsync();
             EntityUid user = default;
@@ -261,13 +249,9 @@ public async Task InteractionOutOfRangeTest()
             var sysMan = server.ResolveDependency<IEntitySystemManager>();
             var handSys = sysMan.GetEntitySystem<SharedHandsSystem>();
 
-            var mapId = MapId.Nullspace;
-            var coords = MapCoordinates.Nullspace;
-            await server.WaitAssertion(() =>
-            {
-                mapId = mapManager.CreateMap();
-                coords = new MapCoordinates(Vector2.Zero, mapId);
-            });
+            var map = await pair.CreateTestMap();
+            var mapId = map.MapId;
+            var coords = map.MapCoords;
 
             await server.WaitIdleAsync();
             EntityUid user = default;
@@ -331,13 +315,9 @@ public async Task InsideContainerInteractionBlockTest()
             var handSys = sysMan.GetEntitySystem<SharedHandsSystem>();
             var conSystem = sysMan.GetEntitySystem<SharedContainerSystem>();
 
-            var mapId = MapId.Nullspace;
-            var coords = MapCoordinates.Nullspace;
-            await server.WaitAssertion(() =>
-            {
-                mapId = mapManager.CreateMap();
-                coords = new MapCoordinates(Vector2.Zero, mapId);
-            });
+            var map = await pair.CreateTestMap();
+            var mapId = map.MapId;
+            var coords = map.MapCoords;
 
             await server.WaitIdleAsync();
             EntityUid user = default;
diff --git a/Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs b/Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs
index 719367e54e6..801433ae72b 100644
--- a/Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs
@@ -39,10 +39,11 @@ public async Task EntityEntityTest()
             EntityUid other = default;
             MapCoordinates mapCoordinates = default;
 
+            var map = await pair.CreateTestMap();
+
             await server.WaitAssertion(() =>
             {
-                var mapId = mapManager.CreateMap();
-                var coordinates = new MapCoordinates(Vector2.Zero, mapId);
+                var coordinates = map.MapCoords;
 
                 origin = sEntities.SpawnEntity(HumanId, coordinates);
                 other = sEntities.SpawnEntity(HumanId, coordinates);
diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
index a61a0593017..5483d4ab2ad 100644
--- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
@@ -171,7 +171,7 @@ await Server.WaitPost(() =>
             // turn on welders
             if (enableToggleable && SEntMan.TryGetComponent(item, out itemToggle) && !itemToggle.Activated)
             {
-                Assert.That(ItemToggleSys.TryActivate(item, playerEnt, itemToggle: itemToggle));
+                Assert.That(ItemToggleSys.TryActivate((item, itemToggle), user: playerEnt));
             }
         });
 
@@ -571,11 +571,11 @@ protected async Task AssertTile(string? proto, NetCoordinates? coords = null)
 
         var tile = Tile.Empty;
         var serverCoords = SEntMan.GetCoordinates(coords ?? TargetCoords);
-        var pos = serverCoords.ToMap(SEntMan, Transform);
+        var pos = Transform.ToMapCoordinates(serverCoords);
         await Server.WaitPost(() =>
         {
-            if (MapMan.TryFindGridAt(pos, out _, out var grid))
-                tile = grid.GetTileRef(serverCoords).Tile;
+            if (MapMan.TryFindGridAt(pos, out var gridUid, out var grid))
+                tile = MapSystem.GetTileRef(gridUid, grid, serverCoords).Tile;
         });
 
         Assert.That(tile.TypeId, Is.EqualTo(targetTile.TypeId));
@@ -757,33 +757,41 @@ protected bool TryComp<T>([NotNullWhen(true)] out T? comp) where T : IComponent
     /// <summary>
     /// Set the tile at the target position to some prototype.
     /// </summary>
-    protected async Task SetTile(string? proto, NetCoordinates? coords = null, MapGridComponent? grid = null)
+    protected async Task SetTile(string? proto, NetCoordinates? coords = null, Entity<MapGridComponent>? grid = null)
     {
         var tile = proto == null
             ? Tile.Empty
             : new Tile(TileMan[proto].TileId);
 
-        var pos = SEntMan.GetCoordinates(coords ?? TargetCoords).ToMap(SEntMan, Transform);
+        var pos = Transform.ToMapCoordinates(SEntMan.GetCoordinates(coords ?? TargetCoords));
 
+        EntityUid gridUid;
+        MapGridComponent? gridComp;
         await Server.WaitPost(() =>
         {
-            if (grid != null || MapMan.TryFindGridAt(pos, out var gridUid, out grid))
+            if (grid is { } gridEnt)
             {
-                grid.SetTile(SEntMan.GetCoordinates(coords ?? TargetCoords), tile);
+                MapSystem.SetTile(gridEnt, SEntMan.GetCoordinates(coords ?? TargetCoords), tile);
+                return;
+            }
+            else if (MapMan.TryFindGridAt(pos, out var gUid, out var gComp))
+            {
+                MapSystem.SetTile(gUid, gComp, SEntMan.GetCoordinates(coords ?? TargetCoords), tile);
                 return;
             }
 
             if (proto == null)
                 return;
 
-            var gridEnt = MapMan.CreateGridEntity(MapData.MapId);
+            gridEnt = MapMan.CreateGridEntity(MapData.MapId);
             grid = gridEnt;
             gridUid = gridEnt;
+            gridComp = gridEnt.Comp;
             var gridXform = SEntMan.GetComponent<TransformComponent>(gridUid);
             Transform.SetWorldPosition(gridXform, pos.Position);
-            grid.SetTile(SEntMan.GetCoordinates(coords ?? TargetCoords), tile);
+            MapSystem.SetTile((gridUid, gridComp), SEntMan.GetCoordinates(coords ?? TargetCoords), tile);
 
-            if (!MapMan.TryFindGridAt(pos, out _, out grid))
+            if (!MapMan.TryFindGridAt(pos, out _, out _))
                 Assert.Fail("Failed to create grid?");
         });
         await AssertTile(proto, coords);
@@ -1199,11 +1207,12 @@ protected async Task SetKey(
         BoundKeyFunction key,
         BoundKeyState state,
         NetCoordinates? coordinates = null,
-        NetEntity? cursorEntity = null)
+        NetEntity? cursorEntity = null,
+        ScreenCoordinates? screenCoordinates = null)
     {
         var coords = coordinates ?? TargetCoords;
         var target = cursorEntity ?? Target ?? default;
-        ScreenCoordinates screen = default;
+        var screen = screenCoordinates ?? default;
 
         var funcId = InputManager.NetworkBindMap.KeyFunctionID(key);
         var message = new ClientFullInputCmdMessage(CTiming.CurTick, CTiming.TickFraction, funcId)
diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
index 37102481ed0..b3d684e01a0 100644
--- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
@@ -1,5 +1,4 @@
 #nullable enable
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Numerics;
 using Content.Client.Construction;
@@ -105,9 +104,10 @@ public abstract partial class InteractionTest
     protected Content.Server.Construction.ConstructionSystem SConstruction = default!;
     protected SharedDoAfterSystem DoAfterSys = default!;
     protected ToolSystem ToolSys = default!;
-    protected SharedItemToggleSystem ItemToggleSys = default!;
+    protected ItemToggleSystem ItemToggleSys = default!;
     protected InteractionTestSystem STestSystem = default!;
     protected SharedTransformSystem Transform = default!;
+    protected SharedMapSystem MapSystem = default!;
     protected ISawmill SLogger = default!;
     protected SharedUserInterfaceSystem SUiSys = default!;
 
@@ -153,7 +153,7 @@ public abstract partial class InteractionTest
     [SetUp]
     public virtual async Task Setup()
     {
-        Pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true, Dirty = true});
+        Pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true, Dirty = true });
 
         // server dependencies
         SEntMan = Server.ResolveDependency<IEntityManager>();
@@ -165,9 +165,10 @@ public virtual async Task Setup()
         HandSys = SEntMan.System<HandsSystem>();
         InteractSys = SEntMan.System<SharedInteractionSystem>();
         ToolSys = SEntMan.System<ToolSystem>();
-        ItemToggleSys = SEntMan.System<SharedItemToggleSystem>();
+        ItemToggleSys = SEntMan.System<ItemToggleSystem>();
         DoAfterSys = SEntMan.System<SharedDoAfterSystem>();
         Transform = SEntMan.System<SharedTransformSystem>();
+        MapSystem = SEntMan.System<SharedMapSystem>();
         SConstruction = SEntMan.System<Server.Construction.ConstructionSystem>();
         STestSystem = SEntMan.System<InteractionTestSystem>();
         Stack = SEntMan.System<StackSystem>();
@@ -188,9 +189,10 @@ public virtual async Task Setup()
 
         // Setup map.
         await Pair.CreateTestMap();
-        PlayerCoords = SEntMan.GetNetCoordinates(MapData.GridCoords.Offset(new Vector2(0.5f, 0.5f)).WithEntityId(MapData.MapUid, Transform, SEntMan));
-        TargetCoords = SEntMan.GetNetCoordinates(MapData.GridCoords.Offset(new Vector2(1.5f, 0.5f)).WithEntityId(MapData.MapUid, Transform, SEntMan));
-        await SetTile(Plating, grid: MapData.Grid.Comp);
+
+        PlayerCoords = SEntMan.GetNetCoordinates(Transform.WithEntityId(MapData.GridCoords.Offset(new Vector2(0.5f, 0.5f)), MapData.MapUid));
+        TargetCoords = SEntMan.GetNetCoordinates(Transform.WithEntityId(MapData.GridCoords.Offset(new Vector2(1.5f, 0.5f)), MapData.MapUid));
+        await SetTile(Plating, grid: MapData.Grid);
 
         // Get player data
         var sPlayerMan = Server.ResolveDependency<Robust.Server.Player.IPlayerManager>();
@@ -263,7 +265,8 @@ public async Task TearDownInternal()
         await TearDown();
     }
 
-    protected virtual async Task TearDown()
+    protected virtual Task TearDown()
     {
+        return Task.CompletedTask;
     }
 }
diff --git a/Content.IntegrationTests/Tests/Linter/StaticFieldValidationTest.cs b/Content.IntegrationTests/Tests/Linter/StaticFieldValidationTest.cs
index 30724b50a6d..0632fe1347c 100644
--- a/Content.IntegrationTests/Tests/Linter/StaticFieldValidationTest.cs
+++ b/Content.IntegrationTests/Tests/Linter/StaticFieldValidationTest.cs
@@ -26,26 +26,26 @@ public async Task TestStaticFieldValidation()
             protos.Add(kind, ids);
         }
 
-        Assert.That(protoMan.ValidateStaticFields(typeof(StringValid), protos).Count, Is.Zero);
-        Assert.That(protoMan.ValidateStaticFields(typeof(StringArrayValid), protos).Count, Is.Zero);
-        Assert.That(protoMan.ValidateStaticFields(typeof(EntProtoIdValid), protos).Count, Is.Zero);
-        Assert.That(protoMan.ValidateStaticFields(typeof(EntProtoIdArrayValid), protos).Count, Is.Zero);
-        Assert.That(protoMan.ValidateStaticFields(typeof(ProtoIdTestValid), protos).Count, Is.Zero);
-        Assert.That(protoMan.ValidateStaticFields(typeof(ProtoIdArrayValid), protos).Count, Is.Zero);
-        Assert.That(protoMan.ValidateStaticFields(typeof(ProtoIdListValid), protos).Count, Is.Zero);
-        Assert.That(protoMan.ValidateStaticFields(typeof(ProtoIdSetValid), protos).Count, Is.Zero);
-        Assert.That(protoMan.ValidateStaticFields(typeof(PrivateProtoIdArrayValid), protos).Count, Is.Zero);
-        
-        Assert.That(protoMan.ValidateStaticFields(typeof(StringInvalid), protos).Count, Is.EqualTo(1));
-        Assert.That(protoMan.ValidateStaticFields(typeof(StringArrayInvalid), protos).Count, Is.EqualTo(2));
-        Assert.That(protoMan.ValidateStaticFields(typeof(EntProtoIdInvalid), protos).Count, Is.EqualTo(1));
-        Assert.That(protoMan.ValidateStaticFields(typeof(EntProtoIdArrayInvalid), protos).Count, Is.EqualTo(2));
-        Assert.That(protoMan.ValidateStaticFields(typeof(ProtoIdTestInvalid), protos).Count, Is.EqualTo(1));
-        Assert.That(protoMan.ValidateStaticFields(typeof(ProtoIdArrayInvalid), protos).Count, Is.EqualTo(2));
-        Assert.That(protoMan.ValidateStaticFields(typeof(ProtoIdListInvalid), protos).Count, Is.EqualTo(2));
-        Assert.That(protoMan.ValidateStaticFields(typeof(ProtoIdSetInvalid), protos).Count, Is.EqualTo(2));
-        Assert.That(protoMan.ValidateStaticFields(typeof(PrivateProtoIdArrayInvalid), protos).Count, Is.EqualTo(2));
-        
+        Assert.That(protoMan.ValidateStaticFields(typeof(StringValid), protos), Is.Empty);
+        Assert.That(protoMan.ValidateStaticFields(typeof(StringArrayValid), protos), Is.Empty);
+        Assert.That(protoMan.ValidateStaticFields(typeof(EntProtoIdValid), protos), Is.Empty);
+        Assert.That(protoMan.ValidateStaticFields(typeof(EntProtoIdArrayValid), protos), Is.Empty);
+        Assert.That(protoMan.ValidateStaticFields(typeof(ProtoIdTestValid), protos), Is.Empty);
+        Assert.That(protoMan.ValidateStaticFields(typeof(ProtoIdArrayValid), protos), Is.Empty);
+        Assert.That(protoMan.ValidateStaticFields(typeof(ProtoIdListValid), protos), Is.Empty);
+        Assert.That(protoMan.ValidateStaticFields(typeof(ProtoIdSetValid), protos), Is.Empty);
+        Assert.That(protoMan.ValidateStaticFields(typeof(PrivateProtoIdArrayValid), protos), Is.Empty);
+
+        Assert.That(protoMan.ValidateStaticFields(typeof(StringInvalid), protos), Has.Count.EqualTo(1));
+        Assert.That(protoMan.ValidateStaticFields(typeof(StringArrayInvalid), protos), Has.Count.EqualTo(2));
+        Assert.That(protoMan.ValidateStaticFields(typeof(EntProtoIdInvalid), protos), Has.Count.EqualTo(1));
+        Assert.That(protoMan.ValidateStaticFields(typeof(EntProtoIdArrayInvalid), protos), Has.Count.EqualTo(2));
+        Assert.That(protoMan.ValidateStaticFields(typeof(ProtoIdTestInvalid), protos), Has.Count.EqualTo(1));
+        Assert.That(protoMan.ValidateStaticFields(typeof(ProtoIdArrayInvalid), protos), Has.Count.EqualTo(2));
+        Assert.That(protoMan.ValidateStaticFields(typeof(ProtoIdListInvalid), protos), Has.Count.EqualTo(2));
+        Assert.That(protoMan.ValidateStaticFields(typeof(ProtoIdSetInvalid), protos), Has.Count.EqualTo(2));
+        Assert.That(protoMan.ValidateStaticFields(typeof(PrivateProtoIdArrayInvalid), protos), Has.Count.EqualTo(2));
+
         await pair.CleanReturnAsync();
     }
 
@@ -58,93 +58,111 @@ public async Task TestStaticFieldValidation()
   id: StaticFieldTestTag
 ";
 
-    [Reflect(false)] private sealed class StringValid
+    [Reflect(false)]
+    private sealed class StringValid
     {
         [ValidatePrototypeId<TagPrototype>] public static string Tag = "StaticFieldTestTag";
     }
 
-    [Reflect(false)] private sealed class StringInvalid
+    [Reflect(false)]
+    private sealed class StringInvalid
     {
         [ValidatePrototypeId<TagPrototype>] public static string Tag = string.Empty;
     }
 
-    [Reflect(false)] private sealed class StringArrayValid
+    [Reflect(false)]
+    private sealed class StringArrayValid
     {
-        [ValidatePrototypeId<TagPrototype>] public static string[] Tag = {"StaticFieldTestTag", "StaticFieldTestTag"};
+        [ValidatePrototypeId<TagPrototype>] public static string[] Tag = ["StaticFieldTestTag", "StaticFieldTestTag"];
     }
 
-    [Reflect(false)] private sealed class StringArrayInvalid
+    [Reflect(false)]
+    private sealed class StringArrayInvalid
     {
-        [ValidatePrototypeId<TagPrototype>] public static string[] Tag = {string.Empty, "StaticFieldTestTag", string.Empty};
+        [ValidatePrototypeId<TagPrototype>] public static string[] Tag = [string.Empty, "StaticFieldTestTag", string.Empty];
     }
 
-    [Reflect(false)] private sealed class EntProtoIdValid
+    [Reflect(false)]
+    private sealed class EntProtoIdValid
     {
         public static EntProtoId Tag = "StaticFieldTestEnt";
     }
 
-    [Reflect(false)] private sealed class EntProtoIdInvalid
+    [Reflect(false)]
+    private sealed class EntProtoIdInvalid
     {
         public static EntProtoId Tag = string.Empty;
     }
 
-    [Reflect(false)] private sealed class EntProtoIdArrayValid
+    [Reflect(false)]
+    private sealed class EntProtoIdArrayValid
     {
-        public static EntProtoId[] Tag = {"StaticFieldTestEnt", "StaticFieldTestEnt"};
+        public static EntProtoId[] Tag = ["StaticFieldTestEnt", "StaticFieldTestEnt"];
     }
 
-    [Reflect(false)] private sealed class EntProtoIdArrayInvalid
+    [Reflect(false)]
+    private sealed class EntProtoIdArrayInvalid
     {
-        public static EntProtoId[] Tag = {string.Empty, "StaticFieldTestEnt", string.Empty};
+        public static EntProtoId[] Tag = [string.Empty, "StaticFieldTestEnt", string.Empty];
     }
 
-    [Reflect(false)] private sealed class ProtoIdTestValid
+    [Reflect(false)]
+    private sealed class ProtoIdTestValid
     {
         public static ProtoId<TagPrototype> Tag = "StaticFieldTestTag";
     }
 
-    [Reflect(false)] private sealed class ProtoIdTestInvalid
+    [Reflect(false)]
+    private sealed class ProtoIdTestInvalid
     {
         public static ProtoId<TagPrototype> Tag = string.Empty;
     }
 
-    [Reflect(false)] private sealed class ProtoIdArrayValid
+    [Reflect(false)]
+    private sealed class ProtoIdArrayValid
     {
-        public static ProtoId<TagPrototype>[] Tag = {"StaticFieldTestTag", "StaticFieldTestTag"};
+        public static ProtoId<TagPrototype>[] Tag = ["StaticFieldTestTag", "StaticFieldTestTag"];
     }
 
-    [Reflect(false)] private sealed class ProtoIdArrayInvalid
+    [Reflect(false)]
+    private sealed class ProtoIdArrayInvalid
     {
-        public static ProtoId<TagPrototype>[] Tag = {string.Empty, "StaticFieldTestTag", string.Empty};
+        public static ProtoId<TagPrototype>[] Tag = [string.Empty, "StaticFieldTestTag", string.Empty];
     }
 
-    [Reflect(false)] private sealed class ProtoIdListValid
+    [Reflect(false)]
+    private sealed class ProtoIdListValid
     {
-        public static List<ProtoId<TagPrototype>> Tag = new() {"StaticFieldTestTag", "StaticFieldTestTag"};
+        public static List<ProtoId<TagPrototype>> Tag = ["StaticFieldTestTag", "StaticFieldTestTag"];
     }
 
-    [Reflect(false)] private sealed class ProtoIdListInvalid
+    [Reflect(false)]
+    private sealed class ProtoIdListInvalid
     {
-        public static List<ProtoId<TagPrototype>> Tag = new() {string.Empty, "StaticFieldTestTag", string.Empty};
+        public static List<ProtoId<TagPrototype>> Tag = [string.Empty, "StaticFieldTestTag", string.Empty];
     }
 
-    [Reflect(false)] private sealed class ProtoIdSetValid
+    [Reflect(false)]
+    private sealed class ProtoIdSetValid
     {
-        public static HashSet<ProtoId<TagPrototype>> Tag = new() {"StaticFieldTestTag", "StaticFieldTestTag"};
+        public static HashSet<ProtoId<TagPrototype>> Tag = ["StaticFieldTestTag", "StaticFieldTestTag"];
     }
 
-    [Reflect(false)] private sealed class ProtoIdSetInvalid
+    [Reflect(false)]
+    private sealed class ProtoIdSetInvalid
     {
-        public static HashSet<ProtoId<TagPrototype>> Tag = new() {string.Empty, "StaticFieldTestTag", string.Empty, " "};
+        public static HashSet<ProtoId<TagPrototype>> Tag = [string.Empty, "StaticFieldTestTag", string.Empty, " "];
     }
 
-    [Reflect(false)] private sealed class PrivateProtoIdArrayValid
+    [Reflect(false)]
+    private sealed class PrivateProtoIdArrayValid
     {
-        private static ProtoId<TagPrototype>[] Tag = {"StaticFieldTestTag", "StaticFieldTestTag"};
+        private static readonly ProtoId<TagPrototype>[] Tag = ["StaticFieldTestTag", "StaticFieldTestTag"];
     }
 
-    [Reflect(false)] private sealed class PrivateProtoIdArrayInvalid
+    [Reflect(false)]
+    private sealed class PrivateProtoIdArrayInvalid
     {
-        private static ProtoId<TagPrototype>[] Tag = {string.Empty, "StaticFieldTestTag", string.Empty};
+        private static readonly ProtoId<TagPrototype>[] Tag = [string.Empty, "StaticFieldTestTag", string.Empty];
     }
 }
diff --git a/Content.IntegrationTests/Tests/MachineBoardTest.cs b/Content.IntegrationTests/Tests/MachineBoardTest.cs
index e741935be34..e1533bbb8d7 100644
--- a/Content.IntegrationTests/Tests/MachineBoardTest.cs
+++ b/Content.IntegrationTests/Tests/MachineBoardTest.cs
@@ -2,7 +2,6 @@
 using System.Linq;
 using Content.Server.Construction.Components;
 using Content.Shared.Construction.Components;
-using Content.Shared.Prototypes;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
 
@@ -37,6 +36,7 @@ public async Task TestMachineBoardHasValidMachine()
         var server = pair.Server;
 
         var protoMan = server.ResolveDependency<IPrototypeManager>();
+        var compFact = server.ResolveDependency<IComponentFactory>();
 
         await server.WaitAssertion(() =>
         {
@@ -45,7 +45,7 @@ await server.WaitAssertion(() =>
                          .Where(p => !pair.IsTestPrototype(p))
                          .Where(p => !_ignoredPrototypes.Contains(p.ID)))
             {
-                if (!p.TryGetComponent<MachineBoardComponent>(out var mbc))
+                if (!p.TryGetComponent<MachineBoardComponent>(out var mbc, compFact))
                     continue;
                 var mId = mbc.Prototype;
 
@@ -53,7 +53,7 @@ await server.WaitAssertion(() =>
                 {
                     Assert.That(protoMan.TryIndex<EntityPrototype>(mId, out var mProto),
                         $"Machine board {p.ID}'s corresponding machine has an invalid prototype.");
-                    Assert.That(mProto.TryGetComponent<MachineComponent>(out var mComp),
+                    Assert.That(mProto.TryGetComponent<MachineComponent>(out var mComp, compFact),
                         $"Machine board {p.ID}'s corresponding machine {mId} does not have MachineComponent");
                     Assert.That(mComp.Board, Is.EqualTo(p.ID),
                         $"Machine {mId}'s BoardPrototype is not equal to it's corresponding machine board, {p.ID}");
@@ -75,6 +75,7 @@ public async Task TestComputerBoardHasValidComputer()
         var server = pair.Server;
 
         var protoMan = server.ResolveDependency<IPrototypeManager>();
+        var compFact = server.ResolveDependency<IComponentFactory>();
 
         await server.WaitAssertion(() =>
         {
@@ -83,7 +84,7 @@ await server.WaitAssertion(() =>
                          .Where(p => !pair.IsTestPrototype(p))
                          .Where(p => !_ignoredPrototypes.Contains(p.ID)))
             {
-                if (!p.TryGetComponent<ComputerBoardComponent>(out var cbc))
+                if (!p.TryGetComponent<ComputerBoardComponent>(out var cbc, compFact))
                     continue;
                 var cId = cbc.Prototype;
 
@@ -92,7 +93,7 @@ await server.WaitAssertion(() =>
                     Assert.That(cId, Is.Not.Null, $"Computer board \"{p.ID}\" does not have a corresponding computer.");
                     Assert.That(protoMan.TryIndex<EntityPrototype>(cId, out var cProto),
                         $"Computer board \"{p.ID}\"'s corresponding computer has an invalid prototype.");
-                    Assert.That(cProto.TryGetComponent<ComputerComponent>(out var cComp),
+                    Assert.That(cProto.TryGetComponent<ComputerComponent>(out var cComp, compFact),
                         $"Computer board {p.ID}'s corresponding computer \"{cId}\" does not have ComputerComponent");
                     Assert.That(cComp.BoardPrototype, Is.EqualTo(p.ID),
                         $"Computer \"{cId}\"'s BoardPrototype is not equal to it's corresponding computer board, \"{p.ID}\"");
diff --git a/Content.IntegrationTests/Tests/Mapping/MappingTests.cs b/Content.IntegrationTests/Tests/Mapping/MappingTests.cs
index 287e30eb8b1..be8bad229b4 100644
--- a/Content.IntegrationTests/Tests/Mapping/MappingTests.cs
+++ b/Content.IntegrationTests/Tests/Mapping/MappingTests.cs
@@ -13,7 +13,7 @@ public sealed class MappingTests
     [Test]
     public async Task MappingTest()
     {
-        await using var pair = await PoolManager.GetServerClient(new PoolSettings {Dirty = true, Connected = true, DummyTicker = false});
+        await using var pair = await PoolManager.GetServerClient(new PoolSettings { Dirty = true, Connected = true, DummyTicker = false });
 
         var server = pair.Server;
         var entMan = server.EntMan;
diff --git a/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs b/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
index 19780591bdb..c48afd819be 100644
--- a/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
+++ b/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
@@ -38,15 +38,16 @@ public async Task NoMaterialArbitrage()
         await server.WaitIdleAsync();
 
         var entManager = server.ResolveDependency<IEntityManager>();
-        var sysManager = server.ResolveDependency<IEntitySystemManager>();
         var mapManager = server.ResolveDependency<IMapManager>();
-        Assert.That(mapManager.IsMapInitialized(testMap.MapId));
-
         var protoManager = server.ResolveDependency<IPrototypeManager>();
-        var pricing = sysManager.GetEntitySystem<PricingSystem>();
-        var stackSys = sysManager.GetEntitySystem<StackSystem>();
+
+        var pricing = entManager.System<PricingSystem>();
+        var stackSys = entManager.System<StackSystem>();
+        var mapSystem = server.System<SharedMapSystem>();
         var compFact = server.ResolveDependency<IComponentFactory>();
 
+        Assert.That(mapSystem.IsInitialized(testMap.MapId));
+
         var constructionName = compFact.GetComponentName(typeof(ConstructionComponent));
         var compositionName = compFact.GetComponentName(typeof(PhysicalCompositionComponent));
         var materialName = compFact.GetComponentName(typeof(MaterialComponent));
@@ -67,7 +68,7 @@ public async Task NoMaterialArbitrage()
         Dictionary<string, ConstructionComponent> constructionRecipes = new();
         foreach (var proto in protoManager.EnumeratePrototypes<EntityPrototype>())
         {
-            if (proto.NoSpawn || proto.Abstract || pair.IsTestPrototype(proto))
+            if (proto.HideSpawnMenu || proto.Abstract || pair.IsTestPrototype(proto))
                 continue;
 
             if (!proto.Components.TryGetValue(constructionName, out var destructible))
@@ -127,7 +128,7 @@ public async Task NoMaterialArbitrage()
         // Here we get the set of entities/materials spawned when destroying an entity.
         foreach (var proto in protoManager.EnumeratePrototypes<EntityPrototype>())
         {
-            if (proto.NoSpawn || proto.Abstract || pair.IsTestPrototype(proto))
+            if (proto.HideSpawnMenu || proto.Abstract || pair.IsTestPrototype(proto))
                 continue;
 
             if (!proto.Components.TryGetValue(destructibleName, out var destructible))
@@ -192,7 +193,7 @@ public async Task NoMaterialArbitrage()
                 {
                     foreach (var recipe in recipes)
                     {
-                        foreach (var (matId, amount) in recipe.RequiredMaterials)
+                        foreach (var (matId, amount) in recipe.Materials)
                         {
                             var actualAmount = SharedLatheSystem.AdjustMaterial(amount, recipe.ApplyMaterialDiscount, multiplier);
                             if (spawnedMats.TryGetValue(matId, out var numSpawned))
@@ -272,7 +273,7 @@ public async Task NoMaterialArbitrage()
                 {
                     foreach (var recipe in recipes)
                     {
-                        foreach (var (matId, amount) in recipe.RequiredMaterials)
+                        foreach (var (matId, amount) in recipe.Materials)
                         {
                             var actualAmount = SharedLatheSystem.AdjustMaterial(amount, recipe.ApplyMaterialDiscount, multiplier);
                             if (deconstructedMats.TryGetValue(matId, out var numSpawned))
@@ -298,7 +299,7 @@ public async Task NoMaterialArbitrage()
         Dictionary<string, PhysicalCompositionComponent> physicalCompositions = new();
         foreach (var proto in protoManager.EnumeratePrototypes<EntityPrototype>())
         {
-            if (proto.NoSpawn || proto.Abstract || pair.IsTestPrototype(proto))
+            if (proto.HideSpawnMenu || proto.Abstract || pair.IsTestPrototype(proto))
                 continue;
 
             if (!proto.Components.TryGetValue(compositionName, out var composition))
@@ -327,7 +328,7 @@ public async Task NoMaterialArbitrage()
                 {
                     foreach (var recipe in recipes)
                     {
-                        foreach (var (matId, amount) in recipe.RequiredMaterials)
+                        foreach (var (matId, amount) in recipe.Materials)
                         {
                             var actualAmount = SharedLatheSystem.AdjustMaterial(amount, recipe.ApplyMaterialDiscount, multiplier);
                             if (compositionComponent.MaterialComposition.TryGetValue(matId, out var numSpawned))
diff --git a/Content.IntegrationTests/Tests/Minds/GhostTests.cs b/Content.IntegrationTests/Tests/Minds/GhostTests.cs
index 7a156e71e41..3a860267e55 100644
--- a/Content.IntegrationTests/Tests/Minds/GhostTests.cs
+++ b/Content.IntegrationTests/Tests/Minds/GhostTests.cs
@@ -14,7 +14,7 @@ namespace Content.IntegrationTests.Tests.Minds;
 [TestFixture]
 public sealed class GhostTests
 {
-    struct GhostTestData
+    private struct GhostTestData
     {
         public IEntityManager SEntMan;
         public Robust.Server.Player.IPlayerManager SPlayerMan;
@@ -23,10 +23,10 @@ struct GhostTestData
 
         public TestPair Pair = default!;
 
-        public TestMapData MapData => Pair.TestMap!;
+        public readonly TestMapData MapData => Pair.TestMap!;
 
-        public RobustIntegrationTest.ServerIntegrationInstance Server => Pair.Server;
-        public RobustIntegrationTest.ClientIntegrationInstance Client => Pair.Client;
+        public readonly RobustIntegrationTest.ServerIntegrationInstance Server => Pair.Server;
+        public readonly RobustIntegrationTest.ClientIntegrationInstance Client => Pair.Client;
 
         /// <summary>
         /// Initial player coordinates. Note that this does not necessarily correspond to the position of the
@@ -47,15 +47,16 @@ public GhostTestData()
 
     private async Task<GhostTestData> SetupData()
     {
-        var data = new GhostTestData();
-
-        // Client is needed to create a session for the ghost system. Creating a dummy session was too difficult.
-        data.Pair = await PoolManager.GetServerClient(new PoolSettings
+        var data = new GhostTestData
         {
-            DummyTicker = false,
-            Connected = true,
-            Dirty = true
-        });
+            // Client is needed to create a session for the ghost system. Creating a dummy session was too difficult.
+            Pair = await PoolManager.GetServerClient(new PoolSettings
+            {
+                DummyTicker = false,
+                Connected = true,
+                Dirty = true
+            })
+        };
 
         data.SEntMan = data.Pair.Server.ResolveDependency<IServerEntityManager>();
         data.SPlayerMan = data.Pair.Server.ResolveDependency<Robust.Server.Player.IPlayerManager>();
@@ -64,7 +65,8 @@ private async Task<GhostTestData> SetupData()
 
         // Setup map.
         await data.Pair.CreateTestMap();
-        data.PlayerCoords = data.SEntMan.GetNetCoordinates(data.MapData.GridCoords.Offset(new Vector2(0.5f, 0.5f)).WithEntityId(data.MapData.MapUid, data.STransformSys, data.SEntMan));
+        var test = data.MapData.GridCoords.Offset(new Vector2(0.5f, 0.5f));
+        data.PlayerCoords = data.SEntMan.GetNetCoordinates(data.STransformSys.WithEntityId(data.MapData.GridCoords.Offset(new Vector2(0.5f, 0.5f)), data.MapData.MapUid));
 
         if (data.Client.Session == null)
             Assert.Fail("No player");
diff --git a/Content.IntegrationTests/Tests/Minds/MindTests.Helpers.cs b/Content.IntegrationTests/Tests/Minds/MindTests.Helpers.cs
index 428380631d7..b12c90e16e2 100644
--- a/Content.IntegrationTests/Tests/Minds/MindTests.Helpers.cs
+++ b/Content.IntegrationTests/Tests/Minds/MindTests.Helpers.cs
@@ -169,7 +169,7 @@ private static async Task Connect(Pair.TestPair pair, string username)
     {
         var netManager = pair.Client.ResolveDependency<IClientNetManager>();
         var playerMan = pair.Server.ResolveDependency<IPlayerManager>();
-        Assert.That(!playerMan.Sessions.Any());
+        Assert.That(playerMan.Sessions, Is.Empty);
 
         await Task.WhenAll(pair.Client.WaitIdleAsync(), pair.Client.WaitIdleAsync());
         pair.Client.SetConnectTarget(pair.Server);
diff --git a/Content.IntegrationTests/Tests/Movement/BuckleMovementTest.cs b/Content.IntegrationTests/Tests/Movement/BuckleMovementTest.cs
index 8d91855098f..3119ee55924 100644
--- a/Content.IntegrationTests/Tests/Movement/BuckleMovementTest.cs
+++ b/Content.IntegrationTests/Tests/Movement/BuckleMovementTest.cs
@@ -34,7 +34,7 @@ public async Task ChairTest()
         Assert.That(Delta(), Is.InRange(-0.01f, 0.01f));
         Assert.That(buckle.Buckled, Is.True);
         Assert.That(buckle.BuckledTo, Is.EqualTo(STarget));
-        Assert.That(strap.BuckledEntities, Is.EquivalentTo(new[]{SPlayer}));
+        Assert.That(strap.BuckledEntities, Is.EquivalentTo(new[] { SPlayer }));
         Assert.That(cAlert.IsShowingAlert(CPlayer, strap.BuckledAlertType), Is.True);
         Assert.That(sAlert.IsShowingAlert(SPlayer, strap.BuckledAlertType), Is.True);
 
@@ -43,7 +43,7 @@ public async Task ChairTest()
         Assert.That(Delta(), Is.InRange(-0.01f, 0.01f));
         Assert.That(buckle.Buckled, Is.True);
         Assert.That(buckle.BuckledTo, Is.EqualTo(STarget));
-        Assert.That(strap.BuckledEntities, Is.EquivalentTo(new[]{SPlayer}));
+        Assert.That(strap.BuckledEntities, Is.EquivalentTo(new[] { SPlayer }));
         Assert.That(cAlert.IsShowingAlert(CPlayer, strap.BuckledAlertType), Is.True);
         Assert.That(sAlert.IsShowingAlert(SPlayer, strap.BuckledAlertType), Is.True);
 
diff --git a/Content.IntegrationTests/Tests/Movement/MovementTest.cs b/Content.IntegrationTests/Tests/Movement/MovementTest.cs
index ad7b1d0459f..eba92530388 100644
--- a/Content.IntegrationTests/Tests/Movement/MovementTest.cs
+++ b/Content.IntegrationTests/Tests/Movement/MovementTest.cs
@@ -32,7 +32,7 @@ public override async Task Setup()
 
         for (var i = -Tiles; i <= Tiles; i++)
         {
-            await SetTile(Plating, SEntMan.GetNetCoordinates(pCoords.Offset(new Vector2(i, 0))), MapData.Grid.Comp);
+            await SetTile(Plating, SEntMan.GetNetCoordinates(pCoords.Offset(new Vector2(i, 0))), MapData.Grid);
         }
         AssertGridCount(1);
 
diff --git a/Content.IntegrationTests/Tests/NPC/NPCTest.cs b/Content.IntegrationTests/Tests/NPC/NPCTest.cs
index 83321fe6138..064fd6c5bf0 100644
--- a/Content.IntegrationTests/Tests/NPC/NPCTest.cs
+++ b/Content.IntegrationTests/Tests/NPC/NPCTest.cs
@@ -45,6 +45,10 @@ private static void Count(HTNCompoundPrototype compound, Dictionary<string, int>
                     var count = counts.GetOrNew(compound.ID);
                     count++;
 
+                    // Compound tasks marked with AllowRecursion are only evaluated once
+                    if (counts.ContainsKey(compound.ID) && compound.AllowRecursion)
+                        continue;
+
                     Assert.That(count, Is.LessThan(50));
                     counts[compound.ID] = count;
                     Count(protoManager.Index<HTNCompoundPrototype>(compoundTask.Task), counts, htnSystem, protoManager);
diff --git a/Content.IntegrationTests/Tests/Networking/PvsCommandTest.cs b/Content.IntegrationTests/Tests/Networking/PvsCommandTest.cs
index 4783d21a053..b3955698489 100644
--- a/Content.IntegrationTests/Tests/Networking/PvsCommandTest.cs
+++ b/Content.IntegrationTests/Tests/Networking/PvsCommandTest.cs
@@ -7,12 +7,12 @@ namespace Content.IntegrationTests.Tests.Networking;
 [TestFixture]
 public sealed class PvsCommandTest
 {
-    public static EntProtoId TestEnt = "MobHuman";
+    private static readonly EntProtoId TestEnt = "MobHuman";
 
     [Test]
     public async Task TestPvsCommands()
     {
-        await using var pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true, DummyTicker = false});
+        await using var pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true, DummyTicker = false });
         var (server, client) = pair;
         await pair.RunTicksSync(5);
 
diff --git a/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs b/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs
index 52d464fa41e..29f2573c2d9 100644
--- a/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs
+++ b/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs
@@ -51,11 +51,12 @@ public async Task Test()
             PredictionTestComponent clientComponent = default!;
             var serverSystem = sEntityManager.System<PredictionTestEntitySystem>();
             var clientSystem = cEntityManager.System<PredictionTestEntitySystem>();
+            var sMapSys = sEntityManager.System<SharedMapSystem>();
 
             await server.WaitPost(() =>
             {
                 // Spawn dummy component entity.
-                var map = sMapManager.CreateMap();
+                sMapSys.CreateMap(out var map);
                 serverEnt = sEntityManager.SpawnEntity(null, new MapCoordinates(new Vector2(0, 0), map));
                 serverComponent = sEntityManager.AddComponent<PredictionTestComponent>(serverEnt);
             });
@@ -67,7 +68,7 @@ await server.WaitPost(() =>
             Assert.That(sGameTiming.TickTimingAdjustment, Is.EqualTo(0));
 
             // Check client buffer is full
-            Assert.That(cGameStateManager.CurrentBufferSize, Is.EqualTo(cGameStateManager.TargetBufferSize));
+            Assert.That(cGameStateManager.GetApplicableStateCount(), Is.EqualTo(cGameStateManager.TargetBufferSize));
             Assert.That(cGameStateManager.TargetBufferSize, Is.EqualTo(2));
 
             // This isn't required anymore, but the test had this for the sake of "technical things", and I cbf shifting
@@ -99,7 +100,7 @@ await client.WaitPost(() =>
 
                 // Client last ran tick 15 meaning it's ahead of the last server tick it processed (12)
                 Assert.That(cGameTiming.CurTick, Is.EqualTo(expected));
-                Assert.That(cGameTiming.LastProcessedTick, Is.EqualTo(new GameTick((uint)(baseTick - cGameStateManager.TargetBufferSize))));
+                Assert.That(cGameTiming.LastProcessedTick, Is.EqualTo(new GameTick((uint) (baseTick - cGameStateManager.TargetBufferSize))));
             });
 
             // *** I am using block scopes to visually distinguish these sections of the test to make it more readable.
@@ -264,7 +265,7 @@ await client.WaitPost(() =>
                 // Assert timing is still correct.
                 Assert.That(sGameTiming.CurTick, Is.EqualTo(new GameTick(baseTick + 8)));
                 Assert.That(cGameTiming.CurTick, Is.EqualTo(new GameTick(baseTick + 8 + delta)));
-                Assert.That(cGameTiming.LastProcessedTick, Is.EqualTo(new GameTick((uint)(baseTick + 8 - cGameStateManager.TargetBufferSize))));
+                Assert.That(cGameTiming.LastProcessedTick, Is.EqualTo(new GameTick((uint) (baseTick + 8 - cGameStateManager.TargetBufferSize))));
             });
 
             {
diff --git a/Content.IntegrationTests/Tests/Physics/AnchorPrototypeTest.cs b/Content.IntegrationTests/Tests/Physics/AnchorPrototypeTest.cs
new file mode 100644
index 00000000000..a65e7d1fd67
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Physics/AnchorPrototypeTest.cs
@@ -0,0 +1,43 @@
+using Robust.Shared.GameObjects;
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.IntegrationTests.Tests.Physics;
+
+[TestFixture]
+public sealed class AnchorPrototypeTest
+{
+    /// <summary>
+    /// Asserts that entityprototypes marked as anchored are also static physics bodies.
+    /// </summary>
+    [Test]
+    public async Task TestStaticAnchorPrototypes()
+    {
+        await using var pair = await PoolManager.GetServerClient();
+
+        var protoManager = pair.Server.ResolveDependency<IPrototypeManager>();
+
+        await pair.Server.WaitAssertion(() =>
+        {
+            foreach (var ent in protoManager.EnumeratePrototypes<EntityPrototype>())
+            {
+                if (!ent.Components.TryGetComponent("Transform", out var xformComp) ||
+                   !ent.Components.TryGetComponent("Physics", out var physicsComp))
+                {
+                    continue;
+                }
+
+                var xform = (TransformComponent)xformComp;
+                var physics = (PhysicsComponent)physicsComp;
+
+                if (!xform.Anchored)
+                    continue;
+
+                Assert.That(physics.BodyType, Is.EqualTo(BodyType.Static), $"Found entity prototype {ent} marked as anchored but not static for physics.");
+            }
+        });
+
+        await pair.CleanReturnAsync();
+    }
+}
diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
index fc423e540ff..f529c0e5f5d 100644
--- a/Content.IntegrationTests/Tests/PostMapInitTest.cs
+++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -16,6 +16,7 @@
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Prototypes;
+using Content.Shared.Station.Components;
 using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;
 
@@ -30,8 +31,7 @@ public sealed class PostMapInitTest
         private static readonly string[] NoSpawnMaps =
         {
             "CentComm",
-            "Dart",
-            "NukieOutpost"
+            "Dart"
         };
 
         private static readonly string[] Grids =
@@ -48,7 +48,6 @@ public sealed class PostMapInitTest
             "TestTeg",
             "CentComm",
             "MeteorArena",
-            "NukieOutpost",
             "Pebble", //DeltaV
             "Edge", //DeltaV
             "Shoukou", //DeltaV
@@ -74,13 +73,14 @@ public async Task GridsLoadableTest(string mapFile)
 
             var entManager = server.ResolveDependency<IEntityManager>();
             var mapLoader = entManager.System<MapLoaderSystem>();
+            var mapSystem = entManager.System<SharedMapSystem>();
             var mapManager = server.ResolveDependency<IMapManager>();
             var cfg = server.ResolveDependency<IConfigurationManager>();
             Assert.That(cfg.GetCVar(CCVars.GridFill), Is.False);
 
             await server.WaitPost(() =>
             {
-                var mapId = mapManager.CreateMap();
+                mapSystem.CreateMap(out var mapId);
                 try
                 {
 #pragma warning disable NUnit2045
@@ -161,6 +161,7 @@ public async Task GameMapsLoadableTest(string mapProto)
             var mapManager = server.ResolveDependency<IMapManager>();
             var entManager = server.ResolveDependency<IEntityManager>();
             var mapLoader = entManager.System<MapLoaderSystem>();
+            var mapSystem = entManager.System<SharedMapSystem>();
             var protoManager = server.ResolveDependency<IPrototypeManager>();
             var ticker = entManager.EntitySysManager.GetEntitySystem<GameTicker>();
             var shuttleSystem = entManager.EntitySysManager.GetEntitySystem<ShuttleSystem>();
@@ -170,7 +171,7 @@ public async Task GameMapsLoadableTest(string mapProto)
 
             await server.WaitPost(() =>
             {
-                var mapId = mapManager.CreateMap();
+                mapSystem.CreateMap(out var mapId);
                 try
                 {
                     ticker.LoadGameMap(protoManager.Index<GameMapPrototype>(mapProto), mapId, null);
@@ -180,7 +181,7 @@ await server.WaitPost(() =>
                     throw new Exception($"Failed to load map {mapProto}", ex);
                 }
 
-                var shuttleMap = mapManager.CreateMap();
+                mapSystem.CreateMap(out var shuttleMap);
                 var largest = 0f;
                 EntityUid? targetGrid = null;
                 var memberQuery = entManager.GetEntityQuery<StationMemberComponent>();
@@ -249,7 +250,7 @@ await server.WaitPost(() =>
                         .Select(x => x.Job!.Value);
 
                     jobs.ExceptWith(spawnPoints);
-                    Assert.That(jobs, Is.Empty,$"There is no spawnpoints for {string.Join(", ", jobs)} on {mapProto}.");
+                    Assert.That(jobs, Is.Empty, $"There is no spawnpoints for {string.Join(", ", jobs)} on {mapProto}.");
                 }
 
                 try
@@ -322,6 +323,7 @@ public async Task NonGameMapsLoadableTest()
             var resourceManager = server.ResolveDependency<IResourceManager>();
             var protoManager = server.ResolveDependency<IPrototypeManager>();
             var cfg = server.ResolveDependency<IConfigurationManager>();
+            var mapSystem = server.System<SharedMapSystem>();
             Assert.That(cfg.GetCVar(CCVars.GridFill), Is.False);
 
             var gameMaps = protoManager.EnumeratePrototypes<GameMapPrototype>().Select(o => o.MapPath).ToHashSet();
@@ -352,7 +354,7 @@ await server.WaitPost(() =>
                 {
                     foreach (var mapName in mapNames)
                     {
-                        var mapId = mapManager.CreateMap();
+                        mapSystem.CreateMap(out var mapId);
                         try
                         {
                             Assert.That(mapLoader.TryLoad(mapId, mapName, out _));
diff --git a/Content.IntegrationTests/Tests/Power/PowerTest.cs b/Content.IntegrationTests/Tests/Power/PowerTest.cs
index a94e94489c0..55bb42f8ced 100644
--- a/Content.IntegrationTests/Tests/Power/PowerTest.cs
+++ b/Content.IntegrationTests/Tests/Power/PowerTest.cs
@@ -166,6 +166,7 @@ public async Task TestSimpleSurplus()
             var server = pair.Server;
             var mapManager = server.ResolveDependency<IMapManager>();
             var entityManager = server.ResolveDependency<IEntityManager>();
+            var mapSys = entityManager.System<SharedMapSystem>();
             const float loadPower = 200;
             PowerSupplierComponent supplier = default!;
             PowerConsumerComponent consumer1 = default!;
@@ -173,21 +174,19 @@ public async Task TestSimpleSurplus()
 
             await server.WaitAssertion(() =>
             {
-                var map = mapManager.CreateMap();
-                var grid = mapManager.CreateGrid(map);
-
-                var gridOwner = grid.Owner;
+                var map = mapSys.CreateMap(out var mapId);
+                var grid = mapManager.CreateGridEntity(mapId);
 
                 // Power only works when anchored
                 for (var i = 0; i < 3; i++)
                 {
-                    grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
+                    mapSys.SetTile(grid, new Vector2i(0, i), new Tile(1));
+                    entityManager.SpawnEntity("CableHV", grid.Owner.ToCoordinates(0, i));
                 }
 
-                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", gridOwner.ToCoordinates());
-                var consumerEnt1 = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 1));
-                var consumerEnt2 = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 2));
+                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", grid.Owner.ToCoordinates());
+                var consumerEnt1 = entityManager.SpawnEntity("ConsumerDummy", grid.Owner.ToCoordinates(0, 1));
+                var consumerEnt2 = entityManager.SpawnEntity("ConsumerDummy", grid.Owner.ToCoordinates(0, 2));
 
                 supplier = entityManager.GetComponent<PowerSupplierComponent>(generatorEnt);
                 consumer1 = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt1);
@@ -229,6 +228,7 @@ public async Task TestSimpleDeficit()
             var server = pair.Server;
             var mapManager = server.ResolveDependency<IMapManager>();
             var entityManager = server.ResolveDependency<IEntityManager>();
+            var mapSys = entityManager.System<SharedMapSystem>();
             const float loadPower = 200;
             PowerSupplierComponent supplier = default!;
             PowerConsumerComponent consumer1 = default!;
@@ -236,21 +236,19 @@ public async Task TestSimpleDeficit()
 
             await server.WaitAssertion(() =>
             {
-                var map = mapManager.CreateMap();
-                var grid = mapManager.CreateGrid(map);
-
-                var gridOwner = grid.Owner;
+                var map = mapSys.CreateMap(out var mapId);
+                var grid = mapManager.CreateGridEntity(mapId);
 
                 // Power only works when anchored
                 for (var i = 0; i < 3; i++)
                 {
-                    grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
+                    mapSys.SetTile(grid, new Vector2i(0, i), new Tile(1));
+                    entityManager.SpawnEntity("CableHV", grid.Owner.ToCoordinates(0, i));
                 }
 
-                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", gridOwner.ToCoordinates());
-                var consumerEnt1 = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 1));
-                var consumerEnt2 = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 2));
+                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", grid.Owner.ToCoordinates());
+                var consumerEnt1 = entityManager.SpawnEntity("ConsumerDummy", grid.Owner.ToCoordinates(0, 1));
+                var consumerEnt2 = entityManager.SpawnEntity("ConsumerDummy", grid.Owner.ToCoordinates(0, 2));
 
                 supplier = entityManager.GetComponent<PowerSupplierComponent>(generatorEnt);
                 consumer1 = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt1);
@@ -288,25 +286,25 @@ public async Task TestSupplyRamp()
             var server = pair.Server;
             var mapManager = server.ResolveDependency<IMapManager>();
             var entityManager = server.ResolveDependency<IEntityManager>();
+            var mapSys = entityManager.System<SharedMapSystem>();
             var gameTiming = server.ResolveDependency<IGameTiming>();
             PowerSupplierComponent supplier = default!;
             PowerConsumerComponent consumer = default!;
 
             await server.WaitAssertion(() =>
             {
-                var map = mapManager.CreateMap();
-                var grid = mapManager.CreateGrid(map);
-                var gridOwner = grid.Owner;
+                var map = mapSys.CreateMap(out var mapId);
+                var grid = mapManager.CreateGridEntity(mapId);
 
                 // Power only works when anchored
                 for (var i = 0; i < 3; i++)
                 {
-                    grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
+                    mapSys.SetTile(grid, new Vector2i(0, i), new Tile(1));
+                    entityManager.SpawnEntity("CableHV", grid.Owner.ToCoordinates(0, i));
                 }
 
-                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", gridOwner.ToCoordinates());
-                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 2));
+                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", grid.Owner.ToCoordinates());
+                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", grid.Owner.ToCoordinates(0, 2));
 
                 supplier = entityManager.GetComponent<PowerSupplierComponent>(generatorEnt);
                 consumer = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt);
@@ -378,6 +376,7 @@ public async Task TestBatteryRamp()
             var entityManager = server.ResolveDependency<IEntityManager>();
             var gameTiming = server.ResolveDependency<IGameTiming>();
             var batterySys = entityManager.System<BatterySystem>();
+            var mapSys = entityManager.System<SharedMapSystem>();
             const float startingCharge = 100_000;
 
             PowerNetworkBatteryComponent netBattery = default!;
@@ -386,19 +385,18 @@ public async Task TestBatteryRamp()
 
             await server.WaitAssertion(() =>
             {
-                var map = mapManager.CreateMap();
-                var grid = mapManager.CreateGrid(map);
-                var gridOwner = grid.Owner;
+                var map = mapSys.CreateMap(out var mapId);
+                var grid = mapManager.CreateGridEntity(mapId);
 
                 // Power only works when anchored
                 for (var i = 0; i < 3; i++)
                 {
-                    grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
+                    mapSys.SetTile(grid, new Vector2i(0, i), new Tile(1));
+                    entityManager.SpawnEntity("CableHV", grid.Owner.ToCoordinates(0, i));
                 }
 
-                var generatorEnt = entityManager.SpawnEntity("DischargingBatteryDummy", gridOwner.ToCoordinates());
-                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 2));
+                var generatorEnt = entityManager.SpawnEntity("DischargingBatteryDummy", grid.Owner.ToCoordinates());
+                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", grid.Owner.ToCoordinates(0, 2));
 
                 netBattery = entityManager.GetComponent<PowerNetworkBatteryComponent>(generatorEnt);
                 battery = entityManager.GetComponent<BatteryComponent>(generatorEnt);
@@ -479,6 +477,7 @@ public async Task TestNoDemandRampdown()
             var mapManager = server.ResolveDependency<IMapManager>();
             var entityManager = server.ResolveDependency<IEntityManager>();
             var batterySys = entityManager.System<BatterySystem>();
+            var mapSys = entityManager.System<SharedMapSystem>();
             PowerSupplierComponent supplier = default!;
             PowerNetworkBatteryComponent netBattery = default!;
             BatteryComponent battery = default!;
@@ -490,20 +489,19 @@ public async Task TestNoDemandRampdown()
 
             await server.WaitAssertion(() =>
             {
-                var map = mapManager.CreateMap();
-                var grid = mapManager.CreateGrid(map);
-                var gridOwner = grid.Owner;
+                var map = mapSys.CreateMap(out var mapId);
+                var grid = mapManager.CreateGridEntity(mapId);
 
                 // Power only works when anchored
                 for (var i = 0; i < 3; i++)
                 {
-                    grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
+                    mapSys.SetTile(grid, new Vector2i(0, i), new Tile(1));
+                    entityManager.SpawnEntity("CableHV", grid.Owner.ToCoordinates(0, i));
                 }
 
-                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", gridOwner.ToCoordinates());
-                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 1));
-                var batteryEnt = entityManager.SpawnEntity("DischargingBatteryDummy", gridOwner.ToCoordinates(0, 2));
+                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", grid.Owner.ToCoordinates());
+                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", grid.Owner.ToCoordinates(0, 1));
+                var batteryEnt = entityManager.SpawnEntity("DischargingBatteryDummy", grid.Owner.ToCoordinates(0, 2));
                 netBattery = entityManager.GetComponent<PowerNetworkBatteryComponent>(batteryEnt);
                 battery = entityManager.GetComponent<BatteryComponent>(batteryEnt);
                 supplier = entityManager.GetComponent<PowerSupplierComponent>(generatorEnt);
@@ -577,24 +575,24 @@ public async Task TestSimpleBatteryChargeDeficit()
             var gameTiming = server.ResolveDependency<IGameTiming>();
             var entityManager = server.ResolveDependency<IEntityManager>();
             var batterySys = entityManager.System<BatterySystem>();
+            var mapSys = entityManager.System<SharedMapSystem>();
             PowerSupplierComponent supplier = default!;
             BatteryComponent battery = default!;
 
             await server.WaitAssertion(() =>
             {
-                var map = mapManager.CreateMap();
-                var grid = mapManager.CreateGrid(map);
-                var gridOwner = grid.Owner;
+                var map = mapSys.CreateMap(out var mapId);
+                var grid = mapManager.CreateGridEntity(mapId);
 
                 // Power only works when anchored
                 for (var i = 0; i < 3; i++)
                 {
-                    grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
+                    mapSys.SetTile(grid, new Vector2i(0, i), new Tile(1));
+                    entityManager.SpawnEntity("CableHV", grid.Owner.ToCoordinates(0, i));
                 }
 
-                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", gridOwner.ToCoordinates());
-                var batteryEnt = entityManager.SpawnEntity("ChargingBatteryDummy", gridOwner.ToCoordinates(0, 2));
+                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", grid.Owner.ToCoordinates());
+                var batteryEnt = entityManager.SpawnEntity("ChargingBatteryDummy", grid.Owner.ToCoordinates(0, 2));
 
                 supplier = entityManager.GetComponent<PowerSupplierComponent>(generatorEnt);
                 var netBattery = entityManager.GetComponent<PowerNetworkBatteryComponent>(batteryEnt);
@@ -634,6 +632,7 @@ public async Task TestFullBattery()
             var entityManager = server.ResolveDependency<IEntityManager>();
             var gameTiming = server.ResolveDependency<IGameTiming>();
             var batterySys = entityManager.System<BatterySystem>();
+            var mapSys = entityManager.System<SharedMapSystem>();
             PowerConsumerComponent consumer = default!;
             PowerSupplierComponent supplier = default!;
             PowerNetworkBatteryComponent netBattery = default!;
@@ -641,23 +640,22 @@ public async Task TestFullBattery()
 
             await server.WaitAssertion(() =>
             {
-                var map = mapManager.CreateMap();
-                var grid = mapManager.CreateGrid(map);
-                var gridOwner = grid.Owner;
+                var map = mapSys.CreateMap(out var mapId);
+                var grid = mapManager.CreateGridEntity(mapId);
 
                 // Power only works when anchored
                 for (var i = 0; i < 4; i++)
                 {
-                    grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
+                    mapSys.SetTile(grid, new Vector2i(0, i), new Tile(1));
+                    entityManager.SpawnEntity("CableHV", grid.Owner.ToCoordinates(0, i));
                 }
 
-                var terminal = entityManager.SpawnEntity("CableTerminal", gridOwner.ToCoordinates(0, 1));
+                var terminal = entityManager.SpawnEntity("CableTerminal", grid.Owner.ToCoordinates(0, 1));
                 entityManager.GetComponent<TransformComponent>(terminal).LocalRotation = Angle.FromDegrees(180);
 
-                var batteryEnt = entityManager.SpawnEntity("FullBatteryDummy", gridOwner.ToCoordinates(0, 2));
-                var supplyEnt = entityManager.SpawnEntity("GeneratorDummy", gridOwner.ToCoordinates(0, 0));
-                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 3));
+                var batteryEnt = entityManager.SpawnEntity("FullBatteryDummy", grid.Owner.ToCoordinates(0, 2));
+                var supplyEnt = entityManager.SpawnEntity("GeneratorDummy", grid.Owner.ToCoordinates(0, 0));
+                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", grid.Owner.ToCoordinates(0, 3));
 
                 consumer = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt);
                 supplier = entityManager.GetComponent<PowerSupplierComponent>(supplyEnt);
@@ -712,6 +710,7 @@ public async Task TestFullBatteryEfficiencyPassThrough()
             var entityManager = server.ResolveDependency<IEntityManager>();
             var gameTiming = server.ResolveDependency<IGameTiming>();
             var batterySys = entityManager.System<BatterySystem>();
+            var mapSys = entityManager.System<SharedMapSystem>();
             PowerConsumerComponent consumer = default!;
             PowerSupplierComponent supplier = default!;
             PowerNetworkBatteryComponent netBattery = default!;
@@ -719,23 +718,22 @@ public async Task TestFullBatteryEfficiencyPassThrough()
 
             await server.WaitAssertion(() =>
             {
-                var map = mapManager.CreateMap();
-                var grid = mapManager.CreateGrid(map);
-                var gridOwner = grid.Owner;
+                var map = mapSys.CreateMap(out var mapId);
+                var grid = mapManager.CreateGridEntity(mapId);
 
                 // Power only works when anchored
                 for (var i = 0; i < 4; i++)
                 {
-                    grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
+                    mapSys.SetTile(grid, new Vector2i(0, i), new Tile(1));
+                    entityManager.SpawnEntity("CableHV", grid.Owner.ToCoordinates(0, i));
                 }
 
-                var terminal = entityManager.SpawnEntity("CableTerminal", gridOwner.ToCoordinates(0, 1));
+                var terminal = entityManager.SpawnEntity("CableTerminal", grid.Owner.ToCoordinates(0, 1));
                 entityManager.GetComponent<TransformComponent>(terminal).LocalRotation = Angle.FromDegrees(180);
 
-                var batteryEnt = entityManager.SpawnEntity("FullBatteryDummy", gridOwner.ToCoordinates(0, 2));
-                var supplyEnt = entityManager.SpawnEntity("GeneratorDummy", gridOwner.ToCoordinates(0, 0));
-                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 3));
+                var batteryEnt = entityManager.SpawnEntity("FullBatteryDummy", grid.Owner.ToCoordinates(0, 2));
+                var supplyEnt = entityManager.SpawnEntity("GeneratorDummy", grid.Owner.ToCoordinates(0, 0));
+                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", grid.Owner.ToCoordinates(0, 3));
 
                 consumer = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt);
                 supplier = entityManager.GetComponent<PowerSupplierComponent>(supplyEnt);
@@ -789,15 +787,15 @@ public async Task TestFullBatteryEfficiencyDemandPassThrough()
             var mapManager = server.ResolveDependency<IMapManager>();
             var entityManager = server.ResolveDependency<IEntityManager>();
             var batterySys = entityManager.System<BatterySystem>();
+            var mapSys = entityManager.System<SharedMapSystem>();
             PowerConsumerComponent consumer1 = default!;
             PowerConsumerComponent consumer2 = default!;
             PowerSupplierComponent supplier = default!;
 
             await server.WaitAssertion(() =>
             {
-                var map = mapManager.CreateMap();
-                var grid = mapManager.CreateGrid(map);
-                var gridOwner = grid.Owner;
+                var map = mapSys.CreateMap(out var mapId);
+                var grid = mapManager.CreateGridEntity(mapId);
 
                 // Map layout here is
                 // C - consumer
@@ -810,19 +808,19 @@ await server.WaitAssertion(() =>
                 // Power only works when anchored
                 for (var i = 0; i < 5; i++)
                 {
-                    grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
+                    mapSys.SetTile(grid, new Vector2i(0, i), new Tile(1));
+                    entityManager.SpawnEntity("CableHV", grid.Owner.ToCoordinates(0, i));
                 }
 
-                entityManager.SpawnEntity("CableTerminal", gridOwner.ToCoordinates(0, 2));
-                var terminal = entityManager.SpawnEntity("CableTerminal", gridOwner.ToCoordinates(0, 2));
+                entityManager.SpawnEntity("CableTerminal", grid.Owner.ToCoordinates(0, 2));
+                var terminal = entityManager.SpawnEntity("CableTerminal", grid.Owner.ToCoordinates(0, 2));
                 entityManager.GetComponent<TransformComponent>(terminal).LocalRotation = Angle.FromDegrees(180);
 
-                var batteryEnt1 = entityManager.SpawnEntity("FullBatteryDummy", gridOwner.ToCoordinates(0, 1));
-                var batteryEnt2 = entityManager.SpawnEntity("FullBatteryDummy", gridOwner.ToCoordinates(0, 3));
-                var supplyEnt = entityManager.SpawnEntity("GeneratorDummy", gridOwner.ToCoordinates(0, 2));
-                var consumerEnt1 = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 0));
-                var consumerEnt2 = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 4));
+                var batteryEnt1 = entityManager.SpawnEntity("FullBatteryDummy", grid.Owner.ToCoordinates(0, 1));
+                var batteryEnt2 = entityManager.SpawnEntity("FullBatteryDummy", grid.Owner.ToCoordinates(0, 3));
+                var supplyEnt = entityManager.SpawnEntity("GeneratorDummy", grid.Owner.ToCoordinates(0, 2));
+                var consumerEnt1 = entityManager.SpawnEntity("ConsumerDummy", grid.Owner.ToCoordinates(0, 0));
+                var consumerEnt2 = entityManager.SpawnEntity("ConsumerDummy", grid.Owner.ToCoordinates(0, 4));
 
                 consumer1 = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt1);
                 consumer2 = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt2);
@@ -887,6 +885,7 @@ public async Task TestSupplyPrioritized()
             var entityManager = server.ResolveDependency<IEntityManager>();
             var gameTiming = server.ResolveDependency<IGameTiming>();
             var batterySys = entityManager.System<BatterySystem>();
+            var mapSys = entityManager.System<SharedMapSystem>();
             PowerConsumerComponent consumer = default!;
             PowerSupplierComponent supplier1 = default!;
             PowerSupplierComponent supplier2 = default!;
@@ -897,9 +896,8 @@ public async Task TestSupplyPrioritized()
 
             await server.WaitAssertion(() =>
             {
-                var map = mapManager.CreateMap();
-                var grid = mapManager.CreateGrid(map);
-                var gridOwner = grid.Owner;
+                var map = mapSys.CreateMap(out var mapId);
+                var grid = mapManager.CreateGridEntity(mapId);
 
                 // Layout is two generators, two batteries, and one load. As to why two: because previously this test
                 // would fail ONLY if there were more than two batteries present, because each of them tries to supply
@@ -911,17 +909,17 @@ await server.WaitAssertion(() =>
                 // Place cables
                 for (var i = -2; i <= 2; i++)
                 {
-                    grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
+                    mapSys.SetTile(grid, new Vector2i(0, i), new Tile(1));
+                    entityManager.SpawnEntity("CableHV", grid.Owner.ToCoordinates(0, i));
                 }
 
-                var batteryEnt1 = entityManager.SpawnEntity("FullBatteryDummy", gridOwner.ToCoordinates(0, 2));
-                var batteryEnt2 = entityManager.SpawnEntity("FullBatteryDummy", gridOwner.ToCoordinates(0, -2));
+                var batteryEnt1 = entityManager.SpawnEntity("FullBatteryDummy", grid.Owner.ToCoordinates(0, 2));
+                var batteryEnt2 = entityManager.SpawnEntity("FullBatteryDummy", grid.Owner.ToCoordinates(0, -2));
 
-                var supplyEnt1 = entityManager.SpawnEntity("GeneratorDummy", gridOwner.ToCoordinates(0, 1));
-                var supplyEnt2 = entityManager.SpawnEntity("GeneratorDummy", gridOwner.ToCoordinates(0, -1));
+                var supplyEnt1 = entityManager.SpawnEntity("GeneratorDummy", grid.Owner.ToCoordinates(0, 1));
+                var supplyEnt2 = entityManager.SpawnEntity("GeneratorDummy", grid.Owner.ToCoordinates(0, -1));
 
-                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 0));
+                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", grid.Owner.ToCoordinates(0, 0));
 
                 consumer = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt);
                 supplier1 = entityManager.GetComponent<PowerSupplierComponent>(supplyEnt1);
@@ -985,15 +983,15 @@ public async Task TestBatteriesProportional()
             var mapManager = server.ResolveDependency<IMapManager>();
             var entityManager = server.ResolveDependency<IEntityManager>();
             var batterySys = entityManager.System<BatterySystem>();
+            var mapSys = entityManager.System<SharedMapSystem>();
             PowerConsumerComponent consumer1 = default!;
             PowerConsumerComponent consumer2 = default!;
             PowerSupplierComponent supplier = default!;
 
             await server.WaitAssertion(() =>
             {
-                var map = mapManager.CreateMap();
-                var grid = mapManager.CreateGrid(map);
-                var gridOwner = grid.Owner;
+                var map = mapSys.CreateMap(out var mapId);
+                var grid = mapManager.CreateGridEntity(mapId);
 
                 // Map layout here is
                 // C - consumer
@@ -1006,19 +1004,19 @@ await server.WaitAssertion(() =>
                 // Power only works when anchored
                 for (var i = 0; i < 5; i++)
                 {
-                    grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
+                    mapSys.SetTile(grid, new Vector2i(0, i), new Tile(1));
+                    entityManager.SpawnEntity("CableHV", grid.Owner.ToCoordinates(0, i));
                 }
 
-                entityManager.SpawnEntity("CableTerminal", gridOwner.ToCoordinates(0, 2));
-                var terminal = entityManager.SpawnEntity("CableTerminal", gridOwner.ToCoordinates(0, 2));
+                entityManager.SpawnEntity("CableTerminal", grid.Owner.ToCoordinates(0, 2));
+                var terminal = entityManager.SpawnEntity("CableTerminal", grid.Owner.ToCoordinates(0, 2));
                 entityManager.GetComponent<TransformComponent>(terminal).LocalRotation = Angle.FromDegrees(180);
 
-                var batteryEnt1 = entityManager.SpawnEntity("FullBatteryDummy", gridOwner.ToCoordinates(0, 1));
-                var batteryEnt2 = entityManager.SpawnEntity("FullBatteryDummy", gridOwner.ToCoordinates(0, 3));
-                var supplyEnt = entityManager.SpawnEntity("GeneratorDummy", gridOwner.ToCoordinates(0, 2));
-                var consumerEnt1 = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 0));
-                var consumerEnt2 = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 4));
+                var batteryEnt1 = entityManager.SpawnEntity("FullBatteryDummy", grid.Owner.ToCoordinates(0, 1));
+                var batteryEnt2 = entityManager.SpawnEntity("FullBatteryDummy", grid.Owner.ToCoordinates(0, 3));
+                var supplyEnt = entityManager.SpawnEntity("GeneratorDummy", grid.Owner.ToCoordinates(0, 2));
+                var consumerEnt1 = entityManager.SpawnEntity("ConsumerDummy", grid.Owner.ToCoordinates(0, 0));
+                var consumerEnt2 = entityManager.SpawnEntity("ConsumerDummy", grid.Owner.ToCoordinates(0, 4));
 
                 consumer1 = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt1);
                 consumer2 = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt2);
@@ -1073,29 +1071,29 @@ public async Task TestBatteryEngineCut()
             var mapManager = server.ResolveDependency<IMapManager>();
             var entityManager = server.ResolveDependency<IEntityManager>();
             var batterySys = entityManager.System<BatterySystem>();
+            var mapSys = entityManager.System<SharedMapSystem>();
             PowerConsumerComponent consumer = default!;
             PowerSupplierComponent supplier = default!;
             PowerNetworkBatteryComponent netBattery = default!;
 
             await server.WaitPost(() =>
             {
-                var map = mapManager.CreateMap();
-                var grid = mapManager.CreateGrid(map);
-                var gridOwner = grid.Owner;
+                var map = mapSys.CreateMap(out var mapId);
+                var grid = mapManager.CreateGridEntity(mapId);
 
                 // Power only works when anchored
                 for (var i = 0; i < 4; i++)
                 {
-                    grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
+                    mapSys.SetTile(grid, new Vector2i(0, i), new Tile(1));
+                    entityManager.SpawnEntity("CableHV", grid.Owner.ToCoordinates(0, i));
                 }
 
-                var terminal = entityManager.SpawnEntity("CableTerminal", gridOwner.ToCoordinates(0, 1));
+                var terminal = entityManager.SpawnEntity("CableTerminal", grid.Owner.ToCoordinates(0, 1));
                 entityManager.GetComponent<TransformComponent>(terminal).LocalRotation = Angle.FromDegrees(180);
 
-                var batteryEnt = entityManager.SpawnEntity("FullBatteryDummy", gridOwner.ToCoordinates(0, 2));
-                var supplyEnt = entityManager.SpawnEntity("GeneratorDummy", gridOwner.ToCoordinates(0, 0));
-                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 3));
+                var batteryEnt = entityManager.SpawnEntity("FullBatteryDummy", grid.Owner.ToCoordinates(0, 2));
+                var supplyEnt = entityManager.SpawnEntity("GeneratorDummy", grid.Owner.ToCoordinates(0, 0));
+                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", grid.Owner.ToCoordinates(0, 3));
 
                 consumer = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt);
                 supplier = entityManager.GetComponent<PowerSupplierComponent>(supplyEnt);
@@ -1158,6 +1156,7 @@ public async Task TestTerminalNodeGroups()
             var mapManager = server.ResolveDependency<IMapManager>();
             var entityManager = server.ResolveDependency<IEntityManager>();
             var nodeContainer = entityManager.System<NodeContainerSystem>();
+            var mapSys = entityManager.System<SharedMapSystem>();
             CableNode leftNode = default!;
             CableNode rightNode = default!;
             Node batteryInput = default!;
@@ -1165,25 +1164,24 @@ public async Task TestTerminalNodeGroups()
 
             await server.WaitAssertion(() =>
             {
-                var map = mapManager.CreateMap();
-                var grid = mapManager.CreateGrid(map);
-                var gridOwner = grid.Owner;
+                var map = mapSys.CreateMap(out var mapId);
+                var grid = mapManager.CreateGridEntity(mapId);
 
                 // Power only works when anchored
                 for (var i = 0; i < 4; i++)
                 {
-                    grid.SetTile(new Vector2i(0, i), new Tile(1));
+                    mapSys.SetTile(grid, new Vector2i(0, i), new Tile(1));
                 }
 
-                var leftEnt = entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, 0));
-                entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, 1));
-                entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, 2));
-                var rightEnt = entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, 3));
+                var leftEnt = entityManager.SpawnEntity("CableHV", grid.Owner.ToCoordinates(0, 0));
+                entityManager.SpawnEntity("CableHV", grid.Owner.ToCoordinates(0, 1));
+                entityManager.SpawnEntity("CableHV", grid.Owner.ToCoordinates(0, 2));
+                var rightEnt = entityManager.SpawnEntity("CableHV", grid.Owner.ToCoordinates(0, 3));
 
-                var terminal = entityManager.SpawnEntity("CableTerminal", gridOwner.ToCoordinates(0, 1));
+                var terminal = entityManager.SpawnEntity("CableTerminal", grid.Owner.ToCoordinates(0, 1));
                 entityManager.GetComponent<TransformComponent>(terminal).LocalRotation = Angle.FromDegrees(180);
 
-                var battery = entityManager.SpawnEntity("FullBatteryDummy", gridOwner.ToCoordinates(0, 2));
+                var battery = entityManager.SpawnEntity("FullBatteryDummy", grid.Owner.ToCoordinates(0, 2));
                 var batteryNodeContainer = entityManager.GetComponent<NodeContainerComponent>(battery);
 
                 if (nodeContainer.TryGetNode<CableNode>(entityManager.GetComponent<NodeContainerComponent>(leftEnt),
@@ -1224,29 +1222,29 @@ public async Task ApcChargingTest()
             var mapManager = server.ResolveDependency<IMapManager>();
             var entityManager = server.ResolveDependency<IEntityManager>();
             var batterySys = entityManager.System<BatterySystem>();
+            var mapSys = entityManager.System<SharedMapSystem>();
             PowerNetworkBatteryComponent substationNetBattery = default!;
             BatteryComponent apcBattery = default!;
 
             await server.WaitAssertion(() =>
             {
-                var map = mapManager.CreateMap();
-                var grid = mapManager.CreateGrid(map);
-                var gridOwner = grid.Owner;
+                var map = mapSys.CreateMap(out var mapId);
+                var grid = mapManager.CreateGridEntity(mapId);
 
                 // Power only works when anchored
                 for (var i = 0; i < 3; i++)
                 {
-                    grid.SetTile(new Vector2i(0, i), new Tile(1));
+                    mapSys.SetTile(grid, new Vector2i(0, i), new Tile(1));
                 }
 
-                entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, 0));
-                entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, 1));
-                entityManager.SpawnEntity("CableMV", gridOwner.ToCoordinates(0, 1));
-                entityManager.SpawnEntity("CableMV", gridOwner.ToCoordinates(0, 2));
+                entityManager.SpawnEntity("CableHV", grid.Owner.ToCoordinates(0, 0));
+                entityManager.SpawnEntity("CableHV", grid.Owner.ToCoordinates(0, 1));
+                entityManager.SpawnEntity("CableMV", grid.Owner.ToCoordinates(0, 1));
+                entityManager.SpawnEntity("CableMV", grid.Owner.ToCoordinates(0, 2));
 
-                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", gridOwner.ToCoordinates(0, 0));
-                var substationEnt = entityManager.SpawnEntity("SubstationDummy", gridOwner.ToCoordinates(0, 1));
-                var apcEnt = entityManager.SpawnEntity("ApcDummy", gridOwner.ToCoordinates(0, 2));
+                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", grid.Owner.ToCoordinates(0, 0));
+                var substationEnt = entityManager.SpawnEntity("SubstationDummy", grid.Owner.ToCoordinates(0, 1));
+                var apcEnt = entityManager.SpawnEntity("ApcDummy", grid.Owner.ToCoordinates(0, 2));
 
                 var generatorSupplier = entityManager.GetComponent<PowerSupplierComponent>(generatorEnt);
                 substationNetBattery = entityManager.GetComponent<PowerNetworkBatteryComponent>(substationEnt);
@@ -1281,33 +1279,33 @@ public async Task ApcNetTest()
             var entityManager = server.ResolveDependency<IEntityManager>();
             var batterySys = entityManager.System<BatterySystem>();
             var extensionCableSystem = entityManager.System<ExtensionCableSystem>();
+            var mapSys = entityManager.System<SharedMapSystem>();
             PowerNetworkBatteryComponent apcNetBattery = default!;
             ApcPowerReceiverComponent receiver = default!;
             ApcPowerReceiverComponent unpoweredReceiver = default!;
 
             await server.WaitAssertion(() =>
             {
-                var map = mapManager.CreateMap();
-                var grid = mapManager.CreateGrid(map);
-                var gridOwner = grid.Owner;
+                var map = mapSys.CreateMap(out var mapId);
+                var grid = mapManager.CreateGridEntity(mapId);
 
                 const int range = 5;
 
                 // Power only works when anchored
                 for (var i = 0; i < range; i++)
                 {
-                    grid.SetTile(new Vector2i(0, i), new Tile(1));
+                    mapSys.SetTile(grid, new Vector2i(0, i), new Tile(1));
                 }
 
-                var apcEnt = entityManager.SpawnEntity("ApcDummy", gridOwner.ToCoordinates(0, 0));
-                var apcExtensionEnt = entityManager.SpawnEntity("CableApcExtension", gridOwner.ToCoordinates(0, 0));
+                var apcEnt = entityManager.SpawnEntity("ApcDummy", grid.Owner.ToCoordinates(0, 0));
+                var apcExtensionEnt = entityManager.SpawnEntity("CableApcExtension", grid.Owner.ToCoordinates(0, 0));
 
                 // Create a powered receiver in range (range is 0 indexed)
-                var powerReceiverEnt = entityManager.SpawnEntity("ApcPowerReceiverDummy", gridOwner.ToCoordinates(0, range - 1));
+                var powerReceiverEnt = entityManager.SpawnEntity("ApcPowerReceiverDummy", grid.Owner.ToCoordinates(0, range - 1));
                 receiver = entityManager.GetComponent<ApcPowerReceiverComponent>(powerReceiverEnt);
 
                 // Create an unpowered receiver outside range
-                var unpoweredReceiverEnt = entityManager.SpawnEntity("ApcPowerReceiverDummy", gridOwner.ToCoordinates(0, range));
+                var unpoweredReceiverEnt = entityManager.SpawnEntity("ApcPowerReceiverDummy", grid.Owner.ToCoordinates(0, range));
                 unpoweredReceiver = entityManager.GetComponent<ApcPowerReceiverComponent>(unpoweredReceiverEnt);
 
                 var battery = entityManager.GetComponent<BatteryComponent>(apcEnt);
diff --git a/Content.IntegrationTests/Tests/Preferences/LoadoutTests.cs b/Content.IntegrationTests/Tests/Preferences/LoadoutTests.cs
index a66cecc90f9..6746d6d5a94 100644
--- a/Content.IntegrationTests/Tests/Preferences/LoadoutTests.cs
+++ b/Content.IntegrationTests/Tests/Preferences/LoadoutTests.cs
@@ -18,10 +18,6 @@ public sealed class LoadoutTests
   id: PlayTimeLoadoutTester
 
 - type: loadout
-  id: TestJumpsuit
-  equipment: TestJumpsuit
-
-- type: startingGear
   id: TestJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorGrey
diff --git a/Content.IntegrationTests/Tests/PrototypeSaveTest.cs b/Content.IntegrationTests/Tests/PrototypeSaveTest.cs
index 9e26fa5eaa2..1ef34365ea3 100644
--- a/Content.IntegrationTests/Tests/PrototypeSaveTest.cs
+++ b/Content.IntegrationTests/Tests/PrototypeSaveTest.cs
@@ -40,6 +40,7 @@ public async Task UninitializedSaveTest()
         var prototypeMan = server.ResolveDependency<IPrototypeManager>();
         var seriMan = server.ResolveDependency<ISerializationManager>();
         var compFact = server.ResolveDependency<IComponentFactory>();
+        var mapSystem = server.System<SharedMapSystem>();
 
         var prototypes = new List<EntityPrototype>();
         EntityUid uid;
@@ -77,7 +78,7 @@ public async Task UninitializedSaveTest()
 
         await server.WaitAssertion(() =>
         {
-            Assert.That(!mapManager.IsMapInitialized(mapId));
+            Assert.That(!mapSystem.IsInitialized(mapId));
             var testLocation = grid.Owner.ToCoordinates();
 
             Assert.Multiple(() =>
@@ -184,7 +185,7 @@ public DataNode Write(ISerializationManager serializationManager, EntityUid valu
             IDependencyCollection dependencies, bool alwaysWrite = false,
             ISerializationContext? context = null)
         {
-            if (WritingComponent != "Transform" && (Prototype?.NoSpawn == false))
+            if (WritingComponent != "Transform" && Prototype?.HideSpawnMenu == false)
             {
                 // Maybe this will be necessary in the future, but at the moment it just indicates that there is some
                 // issue, like a non-nullable entityUid data-field. If a component MUST have an entity uid to work with,
diff --git a/Content.IntegrationTests/Tests/Puller/PullerTest.cs b/Content.IntegrationTests/Tests/Puller/PullerTest.cs
index 87d174f7272..a4fde86dbfb 100644
--- a/Content.IntegrationTests/Tests/Puller/PullerTest.cs
+++ b/Content.IntegrationTests/Tests/Puller/PullerTest.cs
@@ -29,7 +29,7 @@ await server.WaitAssertion(() =>
             {
                 foreach (var proto in protoManager.EnumeratePrototypes<EntityPrototype>())
                 {
-                    if (!proto.TryGetComponent(out PullerComponent? puller))
+                    if (!proto.TryGetComponent(out PullerComponent? puller, compFactory))
                         continue;
 
                     if (!puller.NeedsHands)
diff --git a/Content.IntegrationTests/Tests/ResearchTest.cs b/Content.IntegrationTests/Tests/ResearchTest.cs
index ee319daa436..7ae29a79ffd 100644
--- a/Content.IntegrationTests/Tests/ResearchTest.cs
+++ b/Content.IntegrationTests/Tests/ResearchTest.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using Content.Shared.Lathe;
 using Content.Shared.Research.Prototypes;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
 
 namespace Content.IntegrationTests.Tests;
@@ -52,6 +53,7 @@ public async Task AllTechPrintableTest()
         var server = pair.Server;
 
         var protoManager = server.ResolveDependency<IPrototypeManager>();
+        var compFact = server.ResolveDependency<IComponentFactory>();
 
         await server.WaitAssertion(() =>
         {
@@ -65,7 +67,7 @@ await server.WaitAssertion(() =>
                 if (pair.IsTestPrototype(proto))
                     continue;
 
-                if (!proto.TryGetComponent<LatheComponent>(out var lathe))
+                if (!proto.TryGetComponent<LatheComponent>(out var lathe, compFact))
                     continue;
                 allLathes.Add(lathe);
             }
diff --git a/Content.IntegrationTests/Tests/Roles/StartingGearStorageTests.cs b/Content.IntegrationTests/Tests/Roles/StartingGearStorageTests.cs
new file mode 100644
index 00000000000..f8060edb2b4
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Roles/StartingGearStorageTests.cs
@@ -0,0 +1,72 @@
+using System.Linq;
+using Content.Shared.Roles;
+using Content.Server.Storage.EntitySystems;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Map;
+using Robust.Shared.Collections;
+
+namespace Content.IntegrationTests.Tests.Roles;
+
+[TestFixture]
+public sealed class StartingGearPrototypeStorageTest
+{
+    /// <summary>
+    /// Checks that a storage fill on a StartingGearPrototype will properly fill
+    /// </summary>
+    [Test]
+    public async Task TestStartingGearStorage()
+    {
+        var settings = new PoolSettings { Connected = true, Dirty = true };
+        await using var pair = await PoolManager.GetServerClient(settings);
+        var server = pair.Server;
+        var mapManager = server.ResolveDependency<IMapManager>();
+        var storageSystem = server.System<StorageSystem>();
+
+        var protos = server.ProtoMan
+            .EnumeratePrototypes<StartingGearPrototype>()
+            .Where(p => !p.Abstract)
+            .ToList()
+            .OrderBy(p => p.ID);
+
+        var testMap = await pair.CreateTestMap();
+        var coords = testMap.GridCoords;
+
+        await server.WaitAssertion(() =>
+        {
+            foreach (var gearProto in protos)
+            {
+                var backpackProto = ((IEquipmentLoadout) gearProto).GetGear("back");
+                if (backpackProto == string.Empty)
+                    continue;
+
+                var bag = server.EntMan.SpawnEntity(backpackProto, coords);
+                var ents = new ValueList<EntityUid>();
+
+                foreach (var (slot, entProtos) in gearProto.Storage)
+                {
+                    if (entProtos.Count == 0)
+                        continue;
+
+                    foreach (var ent in entProtos)
+                    {
+                        ents.Add(server.EntMan.SpawnEntity(ent, coords));
+                    }
+
+                    foreach (var ent in ents)
+                    {
+                        if (!storageSystem.CanInsert(bag, ent, out _))
+                            Assert.Fail($"StartingGearPrototype {gearProto.ID} could not successfully put items into storage {bag.Id}");
+
+                        server.EntMan.DeleteEntity(ent);
+                    }
+                }
+
+                server.EntMan.DeleteEntity(bag);
+            }
+
+            mapManager.DeleteMap(testMap.MapId);
+        });
+
+        await pair.CleanReturnAsync();
+    }
+}
diff --git a/Content.IntegrationTests/Tests/Round/JobTest.cs b/Content.IntegrationTests/Tests/Round/JobTest.cs
index 716e3cf4c21..215890791da 100644
--- a/Content.IntegrationTests/Tests/Round/JobTest.cs
+++ b/Content.IntegrationTests/Tests/Round/JobTest.cs
@@ -18,14 +18,14 @@ namespace Content.IntegrationTests.Tests.Round;
 [TestFixture]
 public sealed class JobTest
 {
-    private static ProtoId<JobPrototype> _passenger = "Passenger";
-    private static ProtoId<JobPrototype> _engineer = "StationEngineer";
-    private static ProtoId<JobPrototype> _captain = "Captain";
+    private static readonly ProtoId<JobPrototype> Passenger = "Passenger";
+    private static readonly ProtoId<JobPrototype> Engineer = "StationEngineer";
+    private static readonly ProtoId<JobPrototype> Captain = "Captain";
 
     private static string _map = "JobTestMap";
 
     [TestPrototypes]
-    public static string JobTestMap = @$"
+    private static readonly string JobTestMap = @$"
 - type: gameMap
   id: {_map}
   mapName: {_map}
@@ -39,12 +39,12 @@ public sealed class JobTest
           mapNameTemplate: ""Empty""
         - type: StationJobs
           availableJobs:
-            {_passenger}: [ -1, -1 ]
-            {_engineer}: [ -1, -1 ]
-            {_captain}: [ 1, 1 ]
+            {Passenger}: [ -1, -1 ]
+            {Engineer}: [ -1, -1 ]
+            {Captain}: [ 1, 1 ]
 ";
 
-    public void AssertJob(TestPair pair, ProtoId<JobPrototype> job, NetUserId? user = null, bool isAntag = false)
+    private void AssertJob(TestPair pair, ProtoId<JobPrototype> job, NetUserId? user = null, bool isAntag = false)
     {
         var jobSys = pair.Server.System<SharedJobSystem>();
         var mindSys = pair.Server.System<MindSystem>();
@@ -92,7 +92,7 @@ public async Task StartRoundTest()
         await pair.Server.WaitPost(() => ticker.StartRound());
         await pair.RunTicksSync(10);
 
-        AssertJob(pair, _passenger);
+        AssertJob(pair, Passenger);
 
         await pair.Server.WaitPost(() => ticker.RestartRound());
         await pair.CleanReturnAsync();
@@ -116,21 +116,21 @@ public async Task JobPreferenceTest()
         Assert.That(ticker.RunLevel, Is.EqualTo(GameRunLevel.PreRoundLobby));
         Assert.That(pair.Client.AttachedEntity, Is.Null);
 
-        await pair.SetJobPriorities((_passenger, JobPriority.Medium), (_engineer, JobPriority.High));
+        await pair.SetJobPriorities((Passenger, JobPriority.Medium), (Engineer, JobPriority.High));
         ticker.ToggleReadyAll(true);
         await pair.Server.WaitPost(() => ticker.StartRound());
         await pair.RunTicksSync(10);
 
-        AssertJob(pair, _engineer);
+        AssertJob(pair, Engineer);
 
         await pair.Server.WaitPost(() => ticker.RestartRound());
         Assert.That(ticker.RunLevel, Is.EqualTo(GameRunLevel.PreRoundLobby));
-        await pair.SetJobPriorities((_passenger, JobPriority.High), (_engineer, JobPriority.Medium));
+        await pair.SetJobPriorities((Passenger, JobPriority.High), (Engineer, JobPriority.Medium));
         ticker.ToggleReadyAll(true);
         await pair.Server.WaitPost(() => ticker.StartRound());
         await pair.RunTicksSync(10);
 
-        AssertJob(pair, _passenger);
+        AssertJob(pair, Passenger);
 
         await pair.Server.WaitPost(() => ticker.RestartRound());
         await pair.CleanReturnAsync();
@@ -155,18 +155,18 @@ public async Task JobWeightTest()
         Assert.That(ticker.RunLevel, Is.EqualTo(GameRunLevel.PreRoundLobby));
         Assert.That(pair.Client.AttachedEntity, Is.Null);
 
-        var captain = pair.Server.ProtoMan.Index(_captain);
-        var engineer = pair.Server.ProtoMan.Index(_engineer);
-        var passenger = pair.Server.ProtoMan.Index(_passenger);
+        var captain = pair.Server.ProtoMan.Index(Captain);
+        var engineer = pair.Server.ProtoMan.Index(Engineer);
+        var passenger = pair.Server.ProtoMan.Index(Passenger);
         Assert.That(captain.Weight, Is.GreaterThan(engineer.Weight));
         Assert.That(engineer.Weight, Is.EqualTo(passenger.Weight));
 
-        await pair.SetJobPriorities((_passenger, JobPriority.Medium), (_engineer, JobPriority.High), (_captain, JobPriority.Low));
+        await pair.SetJobPriorities((Passenger, JobPriority.Medium), (Engineer, JobPriority.High), (Captain, JobPriority.Low));
         ticker.ToggleReadyAll(true);
         await pair.Server.WaitPost(() => ticker.StartRound());
         await pair.RunTicksSync(10);
 
-        AssertJob(pair, _captain);
+        AssertJob(pair, Captain);
 
         await pair.Server.WaitPost(() => ticker.RestartRound());
         await pair.CleanReturnAsync();
@@ -197,22 +197,22 @@ public async Task JobPriorityTest()
         var captain = engineers[3];
         engineers.RemoveAt(3);
 
-        await pair.SetJobPriorities(captain, (_captain, JobPriority.High), (_engineer, JobPriority.Medium));
+        await pair.SetJobPriorities(captain, (Captain, JobPriority.High), (Engineer, JobPriority.Medium));
         foreach (var engi in engineers)
         {
-            await pair.SetJobPriorities(engi, (_captain, JobPriority.Medium), (_engineer, JobPriority.High));
+            await pair.SetJobPriorities(engi, (Captain, JobPriority.Medium), (Engineer, JobPriority.High));
         }
 
         ticker.ToggleReadyAll(true);
         await pair.Server.WaitPost(() => ticker.StartRound());
         await pair.RunTicksSync(10);
 
-        AssertJob(pair, _captain, captain);
+        AssertJob(pair, Captain, captain);
         Assert.Multiple(() =>
         {
             foreach (var engi in engineers)
             {
-                AssertJob(pair, _engineer, engi);
+                AssertJob(pair, Engineer, engi);
             }
         });
 
diff --git a/Content.IntegrationTests/Tests/SalvageTest.cs b/Content.IntegrationTests/Tests/SalvageTest.cs
index 9d75428beb7..5dfba82308f 100644
--- a/Content.IntegrationTests/Tests/SalvageTest.cs
+++ b/Content.IntegrationTests/Tests/SalvageTest.cs
@@ -1,5 +1,4 @@
 using System.Linq;
-using Content.Server.Salvage;
 using Content.Shared.CCVar;
 using Content.Shared.Salvage;
 using Robust.Server.GameObjects;
@@ -28,6 +27,7 @@ public async Task AllSalvageMapsLoadableTest()
         var mapManager = server.ResolveDependency<IMapManager>();
         var prototypeManager = server.ResolveDependency<IPrototypeManager>();
         var cfg = server.ResolveDependency<IConfigurationManager>();
+        var mapSystem = entManager.System<SharedMapSystem>();
         Assert.That(cfg.GetCVar(CCVars.GridFill), Is.False);
 
         await server.WaitPost(() =>
@@ -36,7 +36,7 @@ await server.WaitPost(() =>
             {
                 var mapFile = salvage.MapPath;
 
-                var mapId = mapManager.CreateMap();
+                mapSystem.CreateMap(out var mapId);
                 try
                 {
                     Assert.That(mapLoader.TryLoad(mapId, mapFile.ToString(), out var roots));
diff --git a/Content.IntegrationTests/Tests/SaveLoadMapTest.cs b/Content.IntegrationTests/Tests/SaveLoadMapTest.cs
index db2109ca599..213da5d7862 100644
--- a/Content.IntegrationTests/Tests/SaveLoadMapTest.cs
+++ b/Content.IntegrationTests/Tests/SaveLoadMapTest.cs
@@ -23,6 +23,7 @@ public async Task SaveLoadMultiGridMap()
             var mapManager = server.ResolveDependency<IMapManager>();
             var sEntities = server.ResolveDependency<IEntityManager>();
             var mapLoader = sEntities.System<MapLoaderSystem>();
+            var mapSystem = sEntities.System<SharedMapSystem>();
             var xformSystem = sEntities.EntitySysManager.GetEntitySystem<SharedTransformSystem>();
             var resManager = server.ResolveDependency<IResourceManager>();
             var cfg = server.ResolveDependency<IConfigurationManager>();
@@ -33,19 +34,17 @@ await server.WaitAssertion(() =>
                 var dir = new ResPath(mapPath).Directory;
                 resManager.UserData.CreateDir(dir);
 
-                var mapId = mapManager.CreateMap();
+                mapSystem.CreateMap(out var mapId);
 
                 {
-                    var mapGrid = mapManager.CreateGrid(mapId);
-                    var mapGridEnt = mapGrid.Owner;
-                    xformSystem.SetWorldPosition(mapGridEnt, new Vector2(10, 10));
-                    mapGrid.SetTile(new Vector2i(0, 0), new Tile(1, (TileRenderFlag) 1, 255));
+                    var mapGrid = mapManager.CreateGridEntity(mapId);
+                    xformSystem.SetWorldPosition(mapGrid, new Vector2(10, 10));
+                    mapSystem.SetTile(mapGrid, new Vector2i(0, 0), new Tile(1, (TileRenderFlag) 1, 255));
                 }
                 {
-                    var mapGrid = mapManager.CreateGrid(mapId);
-                    var mapGridEnt = mapGrid.Owner;
-                    xformSystem.SetWorldPosition(mapGridEnt, new Vector2(-8, -8));
-                    mapGrid.SetTile(new Vector2i(0, 0), new Tile(2, (TileRenderFlag) 1, 254));
+                    var mapGrid = mapManager.CreateGridEntity(mapId);
+                    xformSystem.SetWorldPosition(mapGrid, new Vector2(-8, -8));
+                    mapSystem.SetTile(mapGrid, new Vector2i(0, 0), new Tile(2, (TileRenderFlag) 1, 254));
                 }
 
                 Assert.Multiple(() => mapLoader.SaveMap(mapId, mapPath));
@@ -74,7 +73,7 @@ await server.WaitAssertion(() =>
                     Assert.Multiple(() =>
                     {
                         Assert.That(xformSystem.GetWorldPosition(gridXform), Is.EqualTo(new Vector2(10, 10)));
-                        Assert.That(mapGrid.GetTileRef(new Vector2i(0, 0)).Tile, Is.EqualTo(new Tile(1, (TileRenderFlag) 1, 255)));
+                        Assert.That(mapSystem.GetTileRef(gridUid, mapGrid, new Vector2i(0, 0)).Tile, Is.EqualTo(new Tile(1, (TileRenderFlag) 1, 255)));
                     });
                 }
                 {
@@ -88,7 +87,7 @@ await server.WaitAssertion(() =>
                     Assert.Multiple(() =>
                     {
                         Assert.That(xformSystem.GetWorldPosition(gridXform), Is.EqualTo(new Vector2(-8, -8)));
-                        Assert.That(mapGrid.GetTileRef(new Vector2i(0, 0)).Tile, Is.EqualTo(new Tile(2, (TileRenderFlag) 1, 254)));
+                        Assert.That(mapSystem.GetTileRef(gridUid, mapGrid, new Vector2i(0, 0)).Tile, Is.EqualTo(new Tile(2, (TileRenderFlag) 1, 254)));
                     });
                 }
             });
diff --git a/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs b/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs
index 01c03aace71..af60db55322 100644
--- a/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs
+++ b/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs
@@ -25,17 +25,18 @@ public async Task SaveLoadSave()
             var server = pair.Server;
             var entManager = server.ResolveDependency<IEntityManager>();
             var mapLoader = entManager.System<MapLoaderSystem>();
+            var mapSystem = entManager.System<SharedMapSystem>();
             var mapManager = server.ResolveDependency<IMapManager>();
             var cfg = server.ResolveDependency<IConfigurationManager>();
             Assert.That(cfg.GetCVar(CCVars.GridFill), Is.False);
 
             await server.WaitPost(() =>
             {
-                var mapId0 = mapManager.CreateMap();
+                mapSystem.CreateMap(out var mapId0);
                 // TODO: Properly find the "main" station grid.
-                var grid0 = mapManager.CreateGrid(mapId0);
+                var grid0 = mapManager.CreateGridEntity(mapId0);
                 mapLoader.Save(grid0.Owner, "save load save 1.yml");
-                var mapId1 = mapManager.CreateMap();
+                mapSystem.CreateMap(out var mapId1);
                 EntityUid grid1 = default!;
 #pragma warning disable NUnit2045
                 Assert.That(mapLoader.TryLoad(mapId1, "save load save 1.yml", out var roots, new MapLoadOptions() { LoadMap = false }), $"Failed to load test map {TestMap}");
@@ -101,6 +102,7 @@ public async Task LoadSaveTicksSavePebble()
             var server = pair.Server;
             var mapLoader = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<MapLoaderSystem>();
             var mapManager = server.ResolveDependency<IMapManager>();
+            var mapSystem = server.System<SharedMapSystem>();
 
             MapId mapId = default;
             var cfg = server.ResolveDependency<IConfigurationManager>();
@@ -109,8 +111,7 @@ public async Task LoadSaveTicksSavePebble()
             // Load pebble.yml as uninitialized map, and save it to ensure it's up to date.
             server.Post(() =>
             {
-                mapId = mapManager.CreateMap();
-                mapManager.AddUninitializedMap(mapId);
+                mapSystem.CreateMap(out mapId, runMapInit: false);
                 mapManager.SetMapPaused(mapId, true);
                 Assert.That(mapLoader.TryLoad(mapId, TestMap, out _), $"Failed to load test map {TestMap}");
                 mapLoader.SaveMap(mapId, "load save ticks save 1.yml");
@@ -182,7 +183,8 @@ public async Task LoadTickLoadPebble()
             await using var pair = await PoolManager.GetServerClient();
             var server = pair.Server;
 
-            var mapLoader = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<MapLoaderSystem>();
+            var mapLoader = server.System<MapLoaderSystem>();
+            var mapSystem = server.System<SharedMapSystem>();
             var mapManager = server.ResolveDependency<IMapManager>();
             var userData = server.ResolveDependency<IResourceManager>().UserData;
             var cfg = server.ResolveDependency<IConfigurationManager>();
@@ -197,8 +199,7 @@ public async Task LoadTickLoadPebble()
             // Load & save the first map
             server.Post(() =>
             {
-                mapId = mapManager.CreateMap();
-                mapManager.AddUninitializedMap(mapId);
+                mapSystem.CreateMap(out mapId, runMapInit: false);
                 mapManager.SetMapPaused(mapId, true);
                 Assert.That(mapLoader.TryLoad(mapId, TestMap, out _), $"Failed to load test map {TestMap}");
                 mapLoader.SaveMap(mapId, fileA);
@@ -217,8 +218,7 @@ public async Task LoadTickLoadPebble()
             server.Post(() =>
             {
                 mapManager.DeleteMap(mapId);
-                mapManager.CreateMap(mapId);
-                mapManager.AddUninitializedMap(mapId);
+                mapSystem.CreateMap(out mapId, runMapInit: false);
                 mapManager.SetMapPaused(mapId, true);
                 Assert.That(mapLoader.TryLoad(mapId, TestMap, out _), $"Failed to load test map {TestMap}");
                 mapLoader.SaveMap(mapId, fileB);
diff --git a/Content.IntegrationTests/Tests/Serialization/SerializationTest.cs b/Content.IntegrationTests/Tests/Serialization/SerializationTest.cs
index 052ea997c0d..339420362c1 100644
--- a/Content.IntegrationTests/Tests/Serialization/SerializationTest.cs
+++ b/Content.IntegrationTests/Tests/Serialization/SerializationTest.cs
@@ -24,7 +24,7 @@ public async Task SerializeGenericEnums()
 
         Enum value = TestEnum.Bb;
 
-        var node = seriMan.WriteValue(value, notNullableOverride:true);
+        var node = seriMan.WriteValue(value, notNullableOverride: true);
         var valueNode = node as ValueDataNode;
         Assert.That(valueNode, Is.Not.Null);
 
@@ -34,22 +34,22 @@ public async Task SerializeGenericEnums()
         var errors = seriMan.ValidateNode<Enum>(valueNode).GetErrors();
         Assert.That(errors.Any(), Is.False);
 
-        var deserialized = seriMan.Read<Enum>(node, notNullableOverride:true);
+        var deserialized = seriMan.Read<Enum>(node, notNullableOverride: true);
         Assert.That(deserialized, Is.EqualTo(value));
 
         // Repeat test with enums in a data definitions.
         var data = new TestData
         {
             Value = TestEnum.Cc,
-            Sequence = new() {TestEnum.Dd, TestEnum.Aa}
+            Sequence = [TestEnum.Dd, TestEnum.Aa]
         };
 
-        node = seriMan.WriteValue(data, notNullableOverride:true);
+        node = seriMan.WriteValue(data, notNullableOverride: true);
 
         errors = seriMan.ValidateNode<TestData>(node).GetErrors();
         Assert.That(errors.Any(), Is.False);
 
-        var deserializedData = seriMan.Read<TestData>(node, notNullableOverride:false);
+        var deserializedData = seriMan.Read<TestData>(node, notNullableOverride: false);
 
         Assert.That(deserializedData.Value, Is.EqualTo(data.Value));
         Assert.That(deserializedData.Sequence.Count, Is.EqualTo(data.Sequence.Count));
@@ -60,7 +60,7 @@ public async Task SerializeGenericEnums()
         Enum genericValue = TestEnum.Bb;
         TestEnum typedValue = TestEnum.Bb;
 
-        var genericNode = seriMan.WriteValue(genericValue, notNullableOverride:true);
+        var genericNode = seriMan.WriteValue(genericValue, notNullableOverride: true);
         var typedNode = seriMan.WriteValue(typedValue);
 
         Assert.That(seriMan.ValidateNode<Enum>(genericNode).GetErrors().Any(), Is.False);
@@ -76,7 +76,7 @@ private enum TestEnum : byte { Aa, Bb, Cc, Dd }
     [DataDefinition]
     private sealed partial class TestData
     {
-        [DataField("value")] public Enum Value = default!;
-        [DataField("sequence")] public List<Enum> Sequence = default!;
+        [DataField] public Enum Value = default!;
+        [DataField] public List<Enum> Sequence = default!;
     }
 }
diff --git a/Content.IntegrationTests/Tests/ShuttleTest.cs b/Content.IntegrationTests/Tests/ShuttleTest.cs
index fb786373a5a..da5b82d91e7 100644
--- a/Content.IntegrationTests/Tests/ShuttleTest.cs
+++ b/Content.IntegrationTests/Tests/ShuttleTest.cs
@@ -2,7 +2,6 @@
 using Content.Server.Shuttles.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
-using Robust.Shared.Maths;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Systems;
@@ -23,33 +22,33 @@ public async Task Test()
             var entManager = server.ResolveDependency<IEntityManager>();
             var physicsSystem = entManager.System<SharedPhysicsSystem>();
 
-            EntityUid gridEnt = default;
             PhysicsComponent gridPhys = null;
 
+            var map = await pair.CreateTestMap();
+
             await server.WaitAssertion(() =>
             {
-                var mapId = mapMan.CreateMap();
-                var grid = mapMan.CreateGridEntity(mapId);
-                gridEnt = grid.Owner;
+                var mapId = map.MapId;
+                var grid = map.Grid;
 
                 Assert.Multiple(() =>
                 {
-                    Assert.That(entManager.HasComponent<ShuttleComponent>(gridEnt));
-                    Assert.That(entManager.TryGetComponent(gridEnt, out gridPhys));
+                    Assert.That(entManager.HasComponent<ShuttleComponent>(grid));
+                    Assert.That(entManager.TryGetComponent(grid, out gridPhys));
                 });
                 Assert.Multiple(() =>
                 {
                     Assert.That(gridPhys.BodyType, Is.EqualTo(BodyType.Dynamic));
-                    Assert.That(entManager.GetComponent<TransformComponent>(gridEnt).LocalPosition, Is.EqualTo(Vector2.Zero));
+                    Assert.That(entManager.GetComponent<TransformComponent>(grid).LocalPosition, Is.EqualTo(Vector2.Zero));
                 });
-                physicsSystem.ApplyLinearImpulse(gridEnt, Vector2.One, body: gridPhys);
+                physicsSystem.ApplyLinearImpulse(grid, Vector2.One, body: gridPhys);
             });
 
             await server.WaitRunTicks(1);
 
             await server.WaitAssertion(() =>
             {
-                Assert.That(entManager.GetComponent<TransformComponent>(gridEnt).LocalPosition, Is.Not.EqualTo(Vector2.Zero));
+                Assert.That(entManager.GetComponent<TransformComponent>(map.Grid).LocalPosition, Is.Not.EqualTo(Vector2.Zero));
             });
             await pair.CleanReturnAsync();
         }
diff --git a/Content.IntegrationTests/Tests/Sprite/ItemSpriteTest.cs b/Content.IntegrationTests/Tests/Sprite/ItemSpriteTest.cs
index 1762c4213c4..bf75188f029 100644
--- a/Content.IntegrationTests/Tests/Sprite/ItemSpriteTest.cs
+++ b/Content.IntegrationTests/Tests/Sprite/ItemSpriteTest.cs
@@ -19,12 +19,12 @@ namespace Content.IntegrationTests.Tests.Sprite;
 /// - Shouldn't have an item component
 /// - Is missing the required sprite information.
 /// If none of the abveo are true, it might need to be added to the list of ignored components, see
-/// <see cref="_ignored"/>
+/// <see cref="Ignored"/>
 /// </remarks>
 [TestFixture]
 public sealed class PrototypeSaveTest
 {
-    private static HashSet<string> _ignored = new()
+    private static readonly HashSet<string> Ignored = new()
     {
         // The only prototypes that should get ignored are those that REQUIRE setup to get a sprite. At that point it is
         // the responsibility of the spawner to ensure that a valid sprite is set.
@@ -34,13 +34,13 @@ public sealed class PrototypeSaveTest
     [Test]
     public async Task AllItemsHaveSpritesTest()
     {
-        var settings = new PoolSettings() {Connected = true}; // client needs to be in-game
+        var settings = new PoolSettings() { Connected = true }; // client needs to be in-game
         await using var pair = await PoolManager.GetServerClient(settings);
-        List<EntityPrototype> badPrototypes = new();
+        List<EntityPrototype> badPrototypes = [];
 
         await pair.Client.WaitPost(() =>
         {
-            foreach (var proto in pair.GetPrototypesWithComponent<ItemComponent>(_ignored))
+            foreach (var proto in pair.GetPrototypesWithComponent<ItemComponent>(Ignored))
             {
                 var dummy = pair.Client.EntMan.Spawn(proto.ID);
                 pair.Client.EntMan.RunMapInit(dummy, pair.Client.MetaData(dummy));
diff --git a/Content.IntegrationTests/Tests/Minds/JobTests.cs b/Content.IntegrationTests/Tests/Station/JobTests.cs
similarity index 100%
rename from Content.IntegrationTests/Tests/Minds/JobTests.cs
rename to Content.IntegrationTests/Tests/Station/JobTests.cs
diff --git a/Content.IntegrationTests/Tests/Strip/StrippableTest.cs b/Content.IntegrationTests/Tests/Strip/StrippableTest.cs
new file mode 100644
index 00000000000..f65bab1f810
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Strip/StrippableTest.cs
@@ -0,0 +1,46 @@
+using Content.Client.Interaction;
+using Content.IntegrationTests.Tests.Interaction;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Input;
+using Robust.Shared.Map;
+
+namespace Content.IntegrationTests.Tests.Strip;
+
+public sealed class StrippableTest : InteractionTest
+{
+    protected override string PlayerPrototype => "MobHuman";
+
+    [Test]
+    public async Task DragDropOpensStrip()
+    {
+        // Spawn one tile away
+        TargetCoords = SEntMan.GetNetCoordinates(new EntityCoordinates(MapData.MapUid, 1, 0));
+        await SpawnTarget("MobHuman");
+
+        var userInterface = Comp<UserInterfaceComponent>(Target);
+        Assert.That(userInterface.Actors.Count == 0);
+
+        // screenCoordinates diff needs to be larger than DragDropSystem._deadzone
+        var screenX = CEntMan.System<DragDropSystem>().Deadzone + 1f;
+
+        // Start drag
+        await SetKey(EngineKeyFunctions.Use,
+            BoundKeyState.Down,
+            TargetCoords,
+            Target,
+            screenCoordinates: new ScreenCoordinates(screenX, 0f, WindowId.Main));
+
+        await RunTicks(5);
+
+        // End drag
+        await SetKey(EngineKeyFunctions.Use,
+            BoundKeyState.Up,
+            PlayerCoords,
+            Player,
+            screenCoordinates: new ScreenCoordinates(0f, 0f, WindowId.Main));
+
+        await RunTicks(5);
+
+        Assert.That(userInterface.Actors.Count > 0);
+    }
+}
diff --git a/Content.IntegrationTests/Tests/Toolshed/ToolshedTest.cs b/Content.IntegrationTests/Tests/Toolshed/ToolshedTest.cs
index dd68ff1ccf1..7de81fb3dc2 100644
--- a/Content.IntegrationTests/Tests/Toolshed/ToolshedTest.cs
+++ b/Content.IntegrationTests/Tests/Toolshed/ToolshedTest.cs
@@ -36,16 +36,18 @@ public async Task TearDownInternal()
         await TearDown();
     }
 
-    protected virtual async Task TearDown()
+    protected virtual Task TearDown()
     {
         Assert.That(_expectedErrors, Is.Empty);
         ClearErrors();
+
+        return Task.CompletedTask;
     }
 
     [SetUp]
     public virtual async Task Setup()
     {
-        Pair = await PoolManager.GetServerClient(new PoolSettings {Connected = Connected});
+        Pair = await PoolManager.GetServerClient(new PoolSettings { Connected = Connected });
         Server = Pair.Server;
 
         if (Connected)
@@ -142,7 +144,7 @@ public void ReportError(IConError err)
                 );
         }
 
-        done:
+    done:
         _errors.Add(err);
     }
 
diff --git a/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs b/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs
index 3cceaefbdc9..e067a27854f 100644
--- a/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs
+++ b/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs
@@ -111,6 +111,7 @@ public async Task TestAllRestocksAreAvailableToBuy()
             await server.WaitIdleAsync();
 
             var prototypeManager = server.ResolveDependency<IPrototypeManager>();
+            var compFact = server.ResolveDependency<IComponentFactory>();
 
             await server.WaitAssertion(() =>
             {
@@ -133,7 +134,7 @@ await server.WaitAssertion(() =>
                 // Collect all the prototypes with StorageFills referencing those entities.
                 foreach (var proto in prototypeManager.EnumeratePrototypes<EntityPrototype>())
                 {
-                    if (!proto.TryGetComponent<StorageFillComponent>(out var storage))
+                    if (!proto.TryGetComponent<StorageFillComponent>(out var storage, compFact))
                         continue;
 
                     List<string> restockStore = new();
diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs
index dea8f9558ab..d195201c29c 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -903,6 +903,9 @@ public enum ConnectionDenyReason : byte
         Panic = 3,
         /*
          * TODO: Remove baby jail code once a more mature gateway process is established. This code is only being issued as a stopgap to help with potential tiding in the immediate future.
+         * 
+         * If baby jail is removed, please reserve this value for as long as can reasonably be done to prevent causing ambiguity in connection denial reasons.
+         * Reservation by commenting out the value is likely sufficient for this purpose, but may impact projects which depend on SS14 like SS14.Admin.
          */
         BabyJail = 4,
     }
diff --git a/Content.Server/Abilities/Mime/MimePowersSystem.cs b/Content.Server/Abilities/Mime/MimePowersSystem.cs
index 2c3e59175d0..2839952e165 100644
--- a/Content.Server/Abilities/Mime/MimePowersSystem.cs
+++ b/Content.Server/Abilities/Mime/MimePowersSystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.Popups;
+using Content.Shared.Abilities.Mime;
 using Content.Shared.Actions;
 using Content.Shared.Actions.Events;
 using Content.Shared.Alert;
@@ -31,6 +32,9 @@ public override void Initialize()
             base.Initialize();
             SubscribeLocalEvent<MimePowersComponent, ComponentInit>(OnComponentInit);
             SubscribeLocalEvent<MimePowersComponent, InvisibleWallActionEvent>(OnInvisibleWall);
+
+            SubscribeLocalEvent<MimePowersComponent, BreakVowAlertEvent>(OnBreakVowAlert);
+            SubscribeLocalEvent<MimePowersComponent, RetakeVowAlertEvent>(OnRetakeVowAlert);
         }
 
         public override void Update(float frameTime)
@@ -107,6 +111,22 @@ private void OnInvisibleWall(EntityUid uid, MimePowersComponent component, Invis
             args.Handled = true;
         }
 
+        private void OnBreakVowAlert(Entity<MimePowersComponent> ent, ref BreakVowAlertEvent args)
+        {
+            if (args.Handled)
+                return;
+            BreakVow(ent, ent);
+            args.Handled = true;
+        }
+
+        private void OnRetakeVowAlert(Entity<MimePowersComponent> ent, ref RetakeVowAlertEvent args)
+        {
+            if (args.Handled)
+                return;
+            RetakeVow(ent, ent);
+            args.Handled = true;
+        }
+
         /// <summary>
         /// Break this mime's vow to not speak.
         /// </summary>
diff --git a/Content.Server/Access/Components/AgentIDCardComponent.cs b/Content.Server/Access/Components/AgentIDCardComponent.cs
index 7a97c5f5653..ab1a045ea9d 100644
--- a/Content.Server/Access/Components/AgentIDCardComponent.cs
+++ b/Content.Server/Access/Components/AgentIDCardComponent.cs
@@ -1,15 +1,7 @@
-using Content.Shared.StatusIcon;
-using Robust.Shared.Prototypes;
+namespace Content.Server.Access.Components;
 
-namespace Content.Server.Access.Components
-{
-    [RegisterComponent]
-    public sealed partial class AgentIDCardComponent : Component
-    {
-        /// <summary>
-        /// Set of job icons that the agent ID card can show.
-        /// </summary>
-        [DataField]
-        public HashSet<ProtoId<StatusIconPrototype>> Icons;
-    }
-}
+/// <summary>
+///     Allows an ID card to copy accesses from other IDs and to change the name, job title and job icon via an interface.
+/// </summary>
+[RegisterComponent]
+public sealed partial class AgentIDCardComponent : Component { }
diff --git a/Content.Server/Access/Components/PresetIdCardComponent.cs b/Content.Server/Access/Components/PresetIdCardComponent.cs
index 7f2201da5c3..94aef2e6ca0 100644
--- a/Content.Server/Access/Components/PresetIdCardComponent.cs
+++ b/Content.Server/Access/Components/PresetIdCardComponent.cs
@@ -6,23 +6,9 @@ namespace Content.Server.Access.Components;
 [RegisterComponent]
 public sealed partial class PresetIdCardComponent : Component
 {
-    [DataField]
+    [DataField("job")]
     public ProtoId<JobPrototype>? JobName;
 
-    [DataField]
+    [DataField("name")]
     public string? IdName;
-
-    /// <summary>
-    /// DeltaV: Allow changing the job title, even if it'd be otherwise set by the JobPrototype
-    /// </summary>
-    [DataField]
-    public string? VirtualJobName;
-
-    [ViewVariables(VVAccess.ReadOnly)]
-    public string? VirtualJobLocalizedName => (VirtualJobName != null) ? Loc.GetString(VirtualJobName) : null;
-    /// <summary>
-    /// DeltaV: Allow changing the job icon, even if it'd be otherwise set by the JobPrototype
-    /// </summary>
-    [DataField]
-    public string? VirtualJobIcon;
 }
diff --git a/Content.Server/Access/LogWireAction.cs b/Content.Server/Access/LogWireAction.cs
index 1e97d5c9d67..837cf420d5e 100644
--- a/Content.Server/Access/LogWireAction.cs
+++ b/Content.Server/Access/LogWireAction.cs
@@ -25,7 +25,7 @@ public sealed partial class LogWireAction : ComponentWireAction<AccessReaderComp
         return comp.LoggingDisabled ? StatusLightState.Off : StatusLightState.On;
     }
 
-    public override object StatusKey => AccessWireActionKey.Status;
+    public override object StatusKey => LogWireActionKey.Status;
 
     public override void Initialize()
     {
diff --git a/Content.Server/Access/Systems/AgentIDCardSystem.cs b/Content.Server/Access/Systems/AgentIDCardSystem.cs
index f0ce3acbdb8..8f1d0d4f820 100644
--- a/Content.Server/Access/Systems/AgentIDCardSystem.cs
+++ b/Content.Server/Access/Systems/AgentIDCardSystem.cs
@@ -67,7 +67,7 @@ private void AfterUIOpen(EntityUid uid, AgentIDCardComponent component, AfterAct
             if (!TryComp<IdCardComponent>(uid, out var idCard))
                 return;
 
-            var state = new AgentIDCardBoundUserInterfaceState(idCard.FullName ?? "", idCard.JobTitle ?? "", idCard.JobIcon ?? "", component.Icons);
+            var state = new AgentIDCardBoundUserInterfaceState(idCard.FullName ?? "", idCard.JobTitle ?? "", idCard.JobIcon);
             _uiSystem.SetUiState(uid, AgentIDCardUiKey.Key, state);
         }
 
@@ -101,7 +101,7 @@ private void OnJobIconChanged(EntityUid uid, AgentIDCardComponent comp, AgentIDC
                 _cardSystem.TryChangeJobDepartment(uid, job, idCard);
         }
 
-        private bool TryFindJobProtoFromIcon(StatusIconPrototype jobIcon, [NotNullWhen(true)] out JobPrototype? job)
+        private bool TryFindJobProtoFromIcon(JobIconPrototype jobIcon, [NotNullWhen(true)] out JobPrototype? job)
         {
             foreach (var jobPrototype in _prototypeManager.EnumeratePrototypes<JobPrototype>())
             {
diff --git a/Content.Server/Access/Systems/PresetIdCardSystem.cs b/Content.Server/Access/Systems/PresetIdCardSystem.cs
index bfbbbbd257a..a48de987adc 100644
--- a/Content.Server/Access/Systems/PresetIdCardSystem.cs
+++ b/Content.Server/Access/Systems/PresetIdCardSystem.cs
@@ -2,6 +2,7 @@
 using Content.Server.GameTicking;
 using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
+using Content.Shared.Access.Components; // DeltaV
 using Content.Shared.Access.Systems;
 using Content.Shared.Roles;
 using Content.Shared.StatusIcon;
@@ -78,14 +79,15 @@ private void SetupIdAccess(EntityUid uid, PresetIdCardComponent id, bool extende
 
         _accessSystem.SetAccessToJob(uid, job, extended);
 
+        var card = Comp<IdCardComponent>(uid); // DeltaV
+
         //flag
-        _cardSystem.TryChangeJobTitle(uid, !string.IsNullOrEmpty(id.VirtualJobLocalizedName) ? id.VirtualJobLocalizedName : job.LocalizedName); // DeltaV #1425 - Attempt to use virtual job information before using job information
+        if (card.JobTitle == null) // DeltaV: only set job title if id card doesnt have one already
+            _cardSystem.TryChangeJobTitle(uid, job.LocalizedName);
         _cardSystem.TryChangeJobDepartment(uid, job);
 
-        // DeltaV #1425 - Attempt to use virtual job information before using job information
-        _prototypeManager.TryIndex<StatusIconPrototype>(id.VirtualJobIcon ?? string.Empty, out var virtualJobIcon);
-        if (_prototypeManager.TryIndex(job.Icon, out var jobIcon))
-            _cardSystem.TryChangeJobIcon(uid, virtualJobIcon ?? jobIcon);
-        // End of DeltaV code
+        // DeltaV: only set to the job's icon if the id doesn't specify one
+        if (card.JobIcon == "JobIconUnknown" && _prototypeManager.TryIndex(job.Icon, out var jobIcon))
+            _cardSystem.TryChangeJobIcon(uid, jobIcon);
     }
 }
diff --git a/Content.Server/Actions/ActionOnInteractSystem.cs b/Content.Server/Actions/ActionOnInteractSystem.cs
index 28685858592..36e5920b325 100644
--- a/Content.Server/Actions/ActionOnInteractSystem.cs
+++ b/Content.Server/Actions/ActionOnInteractSystem.cs
@@ -105,6 +105,31 @@ private void OnAfterInteract(EntityUid uid, ActionOnInteractComponent component,
             }
         }
 
+        // Then EntityWorld target actions
+        var entWorldOptions = GetValidActions<EntityWorldTargetActionComponent>(actionEnts, args.CanReach);
+        for (var i = entWorldOptions.Count - 1; i >= 0; i--)
+        {
+            var action = entWorldOptions[i];
+            if (!_actions.ValidateEntityWorldTarget(args.User, args.Target, args.ClickLocation, action))
+                entWorldOptions.RemoveAt(i);
+        }
+
+        if (entWorldOptions.Count > 0)
+        {
+            var (entActId, entAct) = _random.Pick(entWorldOptions);
+            if (entAct.Event != null)
+            {
+                entAct.Event.Performer = args.User;
+                entAct.Event.Action = entActId;
+                entAct.Event.Entity = args.Target;
+                entAct.Event.Coords = args.ClickLocation;
+            }
+
+            _actions.PerformAction(args.User, null, entActId, entAct, entAct.Event, _timing.CurTime, false);
+            args.Handled = true;
+            return;
+        }
+
         // else: try world target actions
         var options = GetValidActions<WorldTargetActionComponent>(component.ActionEntities, args.CanReach);
         for (var i = options.Count - 1; i >= 0; i--)
diff --git a/Content.Server/Administration/Commands/AGhost.cs b/Content.Server/Administration/Commands/AGhostCommand.cs
similarity index 97%
rename from Content.Server/Administration/Commands/AGhost.cs
rename to Content.Server/Administration/Commands/AGhostCommand.cs
index 935114e7a68..b24dbbc018c 100644
--- a/Content.Server/Administration/Commands/AGhost.cs
+++ b/Content.Server/Administration/Commands/AGhostCommand.cs
@@ -12,13 +12,12 @@
 namespace Content.Server.Administration.Commands;
 
 [AdminCommand(AdminFlags.Admin)]
-public sealed class AGhost : LocalizedCommands
+public sealed class AGhostCommand : LocalizedCommands
 {
     [Dependency] private readonly IEntityManager _entities = default!;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
 
     public override string Command => "aghost";
-    public override string Description => LocalizationManager.GetString("aghost-description");
     public override string Help => "aghost";
 
     public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
diff --git a/Content.Server/Administration/Commands/ExplosionCommand.cs b/Content.Server/Administration/Commands/ExplosionCommand.cs
index 81daca59c48..c916a7cb5f3 100644
--- a/Content.Server/Administration/Commands/ExplosionCommand.cs
+++ b/Content.Server/Administration/Commands/ExplosionCommand.cs
@@ -132,6 +132,6 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
         }
 
         var sysMan = IoCManager.Resolve<IEntitySystemManager>();
-        sysMan.GetEntitySystem<ExplosionSystem>().QueueExplosion(coords, type.ID, intensity, slope, maxIntensity);
+        sysMan.GetEntitySystem<ExplosionSystem>().QueueExplosion(coords, type.ID, intensity, slope, maxIntensity, null);
     }
 }
diff --git a/Content.Server/Administration/Commands/JobWhitelistCommands.cs b/Content.Server/Administration/Commands/JobWhitelistCommands.cs
index a84a11ef848..e604417f920 100644
--- a/Content.Server/Administration/Commands/JobWhitelistCommands.cs
+++ b/Content.Server/Administration/Commands/JobWhitelistCommands.cs
@@ -47,7 +47,7 @@ public override async void Execute(IConsoleShell shell, string argStr, string[]
             var isWhitelisted = await _db.IsJobWhitelisted(guid, job);
             if (isWhitelisted)
             {
-                shell.WriteLine(Loc.GetString("cmd-jobwhitelist-already-whitelisted",
+                shell.WriteLine(Loc.GetString("cmd-jobwhitelistadd-already-whitelisted",
                     ("player", player),
                     ("jobId", job.Id),
                     ("jobName", jobPrototype.LocalizedName)));
diff --git a/Content.Server/Administration/Commands/PlayerPanelCommand.cs b/Content.Server/Administration/Commands/PlayerPanelCommand.cs
new file mode 100644
index 00000000000..4a065bd58a0
--- /dev/null
+++ b/Content.Server/Administration/Commands/PlayerPanelCommand.cs
@@ -0,0 +1,56 @@
+using System.Linq;
+using Content.Server.EUI;
+using Content.Shared.Administration;
+using Robust.Server.Player;
+using Robust.Shared.Console;
+
+namespace Content.Server.Administration.Commands;
+
+[AdminCommand(AdminFlags.Admin)]
+public sealed class PlayerPanelCommand : LocalizedCommands
+{
+    [Dependency] private readonly IPlayerLocator _locator = default!;
+    [Dependency] private readonly EuiManager _euis = default!;
+    [Dependency] private readonly IPlayerManager _players = default!;
+
+    public override string Command => "playerpanel";
+
+    public override async void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (shell.Player is not { } admin)
+        {
+            shell.WriteError(Loc.GetString("cmd-playerpanel-server"));
+            return;
+        }
+
+        if (args.Length != 1)
+        {
+            shell.WriteError(Loc.GetString("cmd-playerpanel-invalid-arguments"));
+            return;
+        }
+
+        var queriedPlayer = await _locator.LookupIdByNameOrIdAsync(args[0]);
+
+        if (queriedPlayer == null)
+        {
+            shell.WriteError(Loc.GetString("cmd-playerpanel-invalid-player"));
+            return;
+        }
+
+        var ui = new PlayerPanelEui(queriedPlayer);
+        _euis.OpenEui(ui, admin);
+        ui.SetPlayerState();
+    }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        if (args.Length == 1)
+        {
+            var options = _players.Sessions.OrderBy(c => c.Name).Select(c => c.Name).ToArray();
+
+            return CompletionResult.FromHintOptions(options, LocalizationManager.GetString("cmd-playerpanel-completion"));
+        }
+
+        return CompletionResult.Empty;
+    }
+}
diff --git a/Content.Server/Administration/Commands/SetOutfitCommand.cs b/Content.Server/Administration/Commands/SetOutfitCommand.cs
index 15d8d4afb7b..ff4d34705a6 100644
--- a/Content.Server/Administration/Commands/SetOutfitCommand.cs
+++ b/Content.Server/Administration/Commands/SetOutfitCommand.cs
@@ -97,11 +97,12 @@ public static bool SetOutfit(EntityUid target, string gear, IEntityManager entit
                 foreach (var slot in slots)
                 {
                     invSystem.TryUnequip(target, slot.Name, true, true, false, inventoryComponent);
-                    var gearStr = startingGear.GetGear(slot.Name);
+                    var gearStr = ((IEquipmentLoadout) startingGear).GetGear(slot.Name);
                     if (gearStr == string.Empty)
                     {
                         continue;
                     }
+
                     var equipmentEntity = entityManager.SpawnEntity(gearStr, entityManager.GetComponent<TransformComponent>(target).Coordinates);
                     if (slot.Name == "id" &&
                         entityManager.TryGetComponent(equipmentEntity, out PdaComponent? pdaComponent) &&
diff --git a/Content.Server/Administration/Logs/AdminLogManager.Cache.cs b/Content.Server/Administration/Logs/AdminLogManager.Cache.cs
index c194527d826..250d0f7aa34 100644
--- a/Content.Server/Administration/Logs/AdminLogManager.Cache.cs
+++ b/Content.Server/Administration/Logs/AdminLogManager.Cache.cs
@@ -16,6 +16,7 @@ public sealed partial class AdminLogManager
 
     // TODO ADMIN LOGS make this thread safe or remove thread safety from the main partial class
     private readonly Dictionary<int, List<SharedAdminLog>> _roundsLogCache = new(MaxRoundsCached);
+    private readonly Queue<int> _roundsLogCacheQueue = new();
 
     private static readonly Gauge CacheRoundCount = Metrics.CreateGauge(
         "admin_logs_cache_round_count",
@@ -28,19 +29,21 @@ public sealed partial class AdminLogManager
     // TODO ADMIN LOGS cache previous {MaxRoundsCached} rounds on startup
     public void CacheNewRound()
     {
-        List<SharedAdminLog> list;
-        var oldestRound = _currentRoundId - MaxRoundsCached;
+        List<SharedAdminLog>? list = null;
 
-        if (_roundsLogCache.Remove(oldestRound, out var oldestList))
+        _roundsLogCacheQueue.Enqueue(_currentRoundId);
+        if (_roundsLogCacheQueue.Count > MaxRoundsCached)
         {
-            list = oldestList;
-            list.Clear();
-        }
-        else
-        {
-            list = new List<SharedAdminLog>(LogListInitialSize);
+            var oldestRound = _roundsLogCacheQueue.Dequeue();
+            if (_roundsLogCache.Remove(oldestRound, out var oldestList))
+            {
+                list = oldestList;
+                list.Clear();
+            }
         }
 
+        list ??= new List<SharedAdminLog>(LogListInitialSize);
+
         _roundsLogCache.Add(_currentRoundId, list);
         CacheRoundCount.Set(_roundsLogCache.Count);
     }
diff --git a/Content.Server/Administration/Logs/Converters/EntityCoordinatesConverter.cs b/Content.Server/Administration/Logs/Converters/EntityCoordinatesConverter.cs
index 0384e069561..3de5d98a81a 100644
--- a/Content.Server/Administration/Logs/Converters/EntityCoordinatesConverter.cs
+++ b/Content.Server/Administration/Logs/Converters/EntityCoordinatesConverter.cs
@@ -1,5 +1,5 @@
 using System.Text.Json;
-using Content.Server.Station.Components;
+using Content.Shared.Station.Components;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 
diff --git a/Content.Server/Administration/Logs/Converters/EntityStringRepresentationConverter.cs b/Content.Server/Administration/Logs/Converters/EntityStringRepresentationConverter.cs
index 32551e5a7d6..39d34e5f183 100644
--- a/Content.Server/Administration/Logs/Converters/EntityStringRepresentationConverter.cs
+++ b/Content.Server/Administration/Logs/Converters/EntityStringRepresentationConverter.cs
@@ -1,10 +1,14 @@
 using System.Text.Json;
+using Content.Server.Administration.Managers;
+using Robust.Server.Player;
 
 namespace Content.Server.Administration.Logs.Converters;
 
 [AdminLogConverter]
 public sealed class EntityStringRepresentationConverter : AdminLogConverter<EntityStringRepresentation>
 {
+    [Dependency] private readonly IAdminManager _adminManager = default!;
+
     public override void Write(Utf8JsonWriter writer, EntityStringRepresentation value, JsonSerializerOptions options)
     {
         writer.WriteStartObject();
@@ -19,6 +23,21 @@ public override void Write(Utf8JsonWriter writer, EntityStringRepresentation val
         if (value.Session != null)
         {
             writer.WriteString("player", value.Session.UserId.UserId);
+
+            if (_adminManager.IsAdmin(value.Uid))
+            {
+                writer.WriteBoolean("admin", true);
+            }
+        }
+
+        if (value.Prototype != null)
+        {
+            writer.WriteString("prototype", value.Prototype);
+        }
+
+        if (value.Deleted)
+        {
+            writer.WriteBoolean("deleted", true);
         }
 
         writer.WriteEndObject();
diff --git a/Content.Server/Administration/Managers/AdminManager.cs b/Content.Server/Administration/Managers/AdminManager.cs
index af950e9fc20..36cea4c156e 100644
--- a/Content.Server/Administration/Managers/AdminManager.cs
+++ b/Content.Server/Administration/Managers/AdminManager.cs
@@ -458,7 +458,7 @@ private async void LoginAdminMaybe(ICommonSession session)
                     Flags = flags
                 };
 
-                if (dbData.Title != null)
+                if (dbData.Title != null  && _cfg.GetCVar(CCVars.AdminUseCustomNamesAdminRank))
                 {
                     data.Title = dbData.Title;
                 }
diff --git a/Content.Server/Administration/PlayerPanelEui.cs b/Content.Server/Administration/PlayerPanelEui.cs
new file mode 100644
index 00000000000..4c0df806012
--- /dev/null
+++ b/Content.Server/Administration/PlayerPanelEui.cs
@@ -0,0 +1,210 @@
+using System.Linq;
+using Content.Server.Administration.Logs;
+using Content.Server.Administration.Managers;
+using Content.Server.Administration.Notes;
+using Content.Server.Administration.Systems;
+using Content.Server.Database;
+using Content.Server.EUI;
+using Content.Shared.Administration;
+using Content.Shared.Database;
+using Content.Shared.Eui;
+using Robust.Server.Player;
+using Robust.Shared.Player;
+
+namespace Content.Server.Administration;
+
+public sealed class PlayerPanelEui : BaseEui
+{
+    [Dependency] private readonly IAdminManager _admins = default!;
+    [Dependency] private readonly IServerDbManager _db = default!;
+    [Dependency] private readonly IAdminNotesManager _notesMan = default!;
+    [Dependency] private readonly IEntityManager _entity = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly EuiManager _eui = default!;
+    [Dependency] private readonly IAdminLogManager _adminLog = default!;
+
+    private readonly LocatedPlayerData _targetPlayer;
+    private int? _notes;
+    private int? _bans;
+    private int? _roleBans;
+    private int _sharedConnections;
+    private bool? _whitelisted;
+    private TimeSpan _playtime;
+    private bool _frozen;
+    private bool _canFreeze;
+    private bool _canAhelp;
+
+    public PlayerPanelEui(LocatedPlayerData player)
+    {
+        IoCManager.InjectDependencies(this);
+        _targetPlayer = player;
+    }
+
+    public override void Opened()
+    {
+        base.Opened();
+        _admins.OnPermsChanged += OnPermsChanged;
+    }
+
+    public override void Closed()
+    {
+        base.Closed();
+        _admins.OnPermsChanged -= OnPermsChanged;
+    }
+
+    public override EuiStateBase GetNewState()
+    {
+        return new PlayerPanelEuiState(_targetPlayer.UserId,
+            _targetPlayer.Username,
+            _playtime,
+            _notes,
+            _bans,
+            _roleBans,
+            _sharedConnections,
+            _whitelisted,
+            _canFreeze,
+            _frozen,
+            _canAhelp);
+    }
+
+    private void OnPermsChanged(AdminPermsChangedEventArgs args)
+    {
+        if (args.Player != Player)
+            return;
+
+        SetPlayerState();
+    }
+
+    public override void HandleMessage(EuiMessageBase msg)
+    {
+        base.HandleMessage(msg);
+
+        ICommonSession? session;
+
+        switch (msg)
+        {
+            case PlayerPanelFreezeMessage freezeMsg:
+                if (!_admins.IsAdmin(Player) ||
+                    !_entity.TrySystem<AdminFrozenSystem>(out var frozenSystem) ||
+                    !_player.TryGetSessionById(_targetPlayer.UserId, out session) ||
+                    session.AttachedEntity == null)
+                    return;
+
+                if (_entity.HasComponent<AdminFrozenComponent>(session.AttachedEntity))
+                {
+                    _adminLog.Add(LogType.Action,$"{Player:actor} unfroze {_entity.ToPrettyString(session.AttachedEntity):subject}");
+                    _entity.RemoveComponent<AdminFrozenComponent>(session.AttachedEntity.Value);
+                    SetPlayerState();
+                    return;
+                }
+
+                if (freezeMsg.Mute)
+                {
+                    _adminLog.Add(LogType.Action,$"{Player:actor} froze and muted {_entity.ToPrettyString(session.AttachedEntity):subject}");
+                    frozenSystem.FreezeAndMute(session.AttachedEntity.Value);
+                }
+                else
+                {
+                    _adminLog.Add(LogType.Action,$"{Player:actor} froze {_entity.ToPrettyString(session.AttachedEntity):subject}");
+                    _entity.EnsureComponent<AdminFrozenComponent>(session.AttachedEntity.Value);
+                }
+                SetPlayerState();
+                break;
+
+            case PlayerPanelLogsMessage:
+                if (!_admins.HasAdminFlag(Player, AdminFlags.Logs))
+                    return;
+
+                _adminLog.Add(LogType.Action, $"{Player:actor} opened logs on {_targetPlayer.Username:subject}");
+                var ui = new AdminLogsEui();
+                _eui.OpenEui(ui, Player);
+                ui.SetLogFilter(search: _targetPlayer.Username);
+                break;
+            case PlayerPanelDeleteMessage:
+            case PlayerPanelRejuvenationMessage:
+                if (!_admins.HasAdminFlag(Player, AdminFlags.Debug) ||
+                    !_player.TryGetSessionById(_targetPlayer.UserId, out session) ||
+                    session.AttachedEntity == null)
+                    return;
+
+                if (msg is PlayerPanelRejuvenationMessage)
+                {
+                    _adminLog.Add(LogType.Action,$"{Player:actor} rejuvenated {_entity.ToPrettyString(session.AttachedEntity):subject}");
+                    if (!_entity.TrySystem<RejuvenateSystem>(out var rejuvenate))
+                        return;
+
+                    rejuvenate.PerformRejuvenate(session.AttachedEntity.Value);
+                }
+                else
+                {
+                    _adminLog.Add(LogType.Action,$"{Player:actor} deleted {_entity.ToPrettyString(session.AttachedEntity):subject}");
+                    _entity.DeleteEntity(session.AttachedEntity);
+                }
+                break;
+        }
+    }
+
+    public async void SetPlayerState()
+    {
+        if (!_admins.IsAdmin(Player))
+        {
+            Close();
+            return;
+        }
+
+        _playtime = (await _db.GetPlayTimes(_targetPlayer.UserId))
+            .Where(p => p.Tracker == "Overall")
+            .Select(p => p.TimeSpent)
+            .FirstOrDefault();
+
+        if (_notesMan.CanView(Player))
+        {
+            _notes = (await _notesMan.GetAllAdminRemarks(_targetPlayer.UserId)).Count;
+        }
+        else
+        {
+            _notes = null;
+        }
+
+        _sharedConnections = _player.Sessions.Count(s => s.Channel.RemoteEndPoint.Address.Equals(_targetPlayer.LastAddress) && s.UserId != _targetPlayer.UserId);
+
+    // Apparently the Bans flag is also used for whitelists
+    if (_admins.HasAdminFlag(Player, AdminFlags.Ban))
+        {
+            _whitelisted = await _db.GetWhitelistStatusAsync(_targetPlayer.UserId);
+            // This won't get associated ip or hwid bans but they were not placed on this account anyways
+            _bans = (await _db.GetServerBansAsync(null, _targetPlayer.UserId, null)).Count;
+            // Unfortunately role bans for departments and stuff are issued individually. This means that a single role ban can have many individual role bans internally
+            // The only way to distinguish whether a role ban is the same is to compare the ban time.
+            // This is horrible and I would love to just erase the database and start from scratch instead but that's what I can do for now.
+            _roleBans = (await _db.GetServerRoleBansAsync(null, _targetPlayer.UserId, null)).DistinctBy(rb => rb.BanTime).Count();
+        }
+        else
+        {
+            _whitelisted = null;
+            _bans = null;
+            _roleBans = null;
+        }
+
+        if (_player.TryGetSessionById(_targetPlayer.UserId, out var session))
+        {
+            _canFreeze = session.AttachedEntity != null;
+            _frozen = _entity.HasComponent<AdminFrozenComponent>(session.AttachedEntity);
+        }
+        else
+        {
+            _canFreeze = false;
+        }
+
+        if (_admins.HasAdminFlag(Player, AdminFlags.Adminhelp))
+        {
+            _canAhelp = true;
+        }
+        else
+        {
+            _canAhelp = false;
+        }
+
+        StateDirty();
+    }
+}
diff --git a/Content.Server/Administration/ServerApi.cs b/Content.Server/Administration/ServerApi.cs
index c09aa0c95cc..f1f09d4b503 100644
--- a/Content.Server/Administration/ServerApi.cs
+++ b/Content.Server/Administration/ServerApi.cs
@@ -8,13 +8,13 @@
 using System.Threading.Tasks;
 using Content.Server.Administration.Systems;
 using Content.Server.GameTicking;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Presets;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Maps;
 using Content.Server.RoundEnd;
 using Content.Shared.Administration.Managers;
 using Content.Shared.CCVar;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Prototypes;
 using Robust.Server.ServerStatus;
 using Robust.Shared.Asynchronous;
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
index 8ff26fd72b6..d108c29975a 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
@@ -108,7 +108,7 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
                 var coords = _transformSystem.GetMapCoordinates(args.Target);
                 Timer.Spawn(_gameTiming.TickPeriod,
                     () => _explosionSystem.QueueExplosion(coords, ExplosionSystem.DefaultExplosionPrototypeId,
-                        4, 1, 2, maxTileBreak: 0), // it gibs, damage doesn't need to be high.
+                        4, 1, 2, args.Target, maxTileBreak: 0), // it gibs, damage doesn't need to be high.
                     CancellationToken.None);
 
                 _bodySystem.GibBody(args.Target);
@@ -288,18 +288,18 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
             {
                 Text = "admin-smite-remove-hands-name",
                 Category = VerbCategory.Smite,
-                Icon = new SpriteSpecifier.Rsi(new ("/Textures/Fluids/vomit_toxin.rsi"), "vomit_toxin-1"),
+                Icon = new SpriteSpecifier.Rsi(new("/Textures/Fluids/vomit_toxin.rsi"), "vomit_toxin-1"),
                 Act = () =>
                 {
                     _vomitSystem.Vomit(args.Target, -1000, -1000); // You feel hollow!
-                    var organs = _bodySystem.GetBodyOrganComponents<TransformComponent>(args.Target, body);
+                    var organs = _bodySystem.GetBodyOrganEntityComps<TransformComponent>((args.Target, body));
                     var baseXform = Transform(args.Target);
-                    foreach (var (xform, organ) in organs)
+                    foreach (var organ in organs)
                     {
-                        if (HasComp<BrainComponent>(xform.Owner) || HasComp<EyeComponent>(xform.Owner))
+                        if (HasComp<BrainComponent>(organ.Owner) || HasComp<EyeComponent>(organ.Owner))
                             continue;
 
-                        _transformSystem.AttachToGridOrMap(organ.Owner);
+                        _transformSystem.PlaceNextTo((organ.Owner, organ.Comp1), (args.Target, baseXform));
                     }
 
                     _popupSystem.PopupEntity(Loc.GetString("admin-smite-vomit-organs-self"), args.Target,
@@ -364,9 +364,9 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
                 Icon = new SpriteSpecifier.Rsi(new ("/Textures/Mobs/Species/Human/organs.rsi"), "stomach"),
                 Act = () =>
                 {
-                    foreach (var (component, _) in _bodySystem.GetBodyOrganComponents<StomachComponent>(args.Target, body))
+                    foreach (var entity in _bodySystem.GetBodyOrganEntityComps<StomachComponent>((args.Target, body)))
                     {
-                        QueueDel(component.Owner);
+                        QueueDel(entity.Owner);
                     }
 
                     _popupSystem.PopupEntity(Loc.GetString("admin-smite-stomach-removal-self"), args.Target,
@@ -384,9 +384,9 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
                 Icon = new SpriteSpecifier.Rsi(new ("/Textures/Mobs/Species/Human/organs.rsi"), "lung-r"),
                 Act = () =>
                 {
-                    foreach (var (component, _) in _bodySystem.GetBodyOrganComponents<LungComponent>(args.Target, body))
+                    foreach (var entity in _bodySystem.GetBodyOrganEntityComps<LungComponent>((args.Target, body)))
                     {
-                        QueueDel(component.Owner);
+                        QueueDel(entity.Owner);
                     }
 
                     _popupSystem.PopupEntity(Loc.GetString("admin-smite-lung-removal-self"), args.Target,
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
index 328fa744846..a00424a7412 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
@@ -724,15 +724,7 @@ private void AddTricksVerbs(GetVerbsEvent<Verb> args)
                         if (!int.TryParse(amount, out var result))
                             return;
 
-                        if (result > 0)
-                        {
-                            ballisticAmmo.UnspawnedCount = result;
-                        }
-                        else
-                        {
-                            ballisticAmmo.UnspawnedCount = 0;
-                        }
-
+                        _gun.SetBallisticUnspawned((args.Target, ballisticAmmo), result);
                         _gun.UpdateBallisticAppearance(args.Target, ballisticAmmo);
                     });
                 },
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.cs b/Content.Server/Administration/Systems/AdminVerbSystem.cs
index d7888b491c3..6123bba8dee 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.cs
@@ -35,6 +35,9 @@
 using Robust.Shared.Utility;
 using System.Linq;
 using System.Numerics;
+using Content.Server.Silicons.Laws;
+using Content.Shared.Silicons.Laws.Components;
+using Robust.Server.Player;
 using Robust.Shared.Physics.Components;
 using static Content.Shared.Configurable.ConfigurationComponent;
 
@@ -68,6 +71,8 @@ public sealed partial class AdminVerbSystem : EntitySystem
         [Dependency] private readonly StationSpawningSystem _spawning = default!;
         [Dependency] private readonly ExamineSystemShared _examine = default!;
         [Dependency] private readonly AdminFrozenSystem _freeze = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] private readonly SiliconLawSystem _siliconLawSystem = default!;
 
         private readonly Dictionary<ICommonSession, List<EditSolutionsEui>> _openSolutionUis = new();
 
@@ -180,7 +185,7 @@ private void AddAdminVerbs(GetVerbsEvent<Verb> args)
 
                             if (targetMind != null)
                             {
-                                _mindSystem.TransferTo(targetMind.Value, mobUid);
+                                _mindSystem.TransferTo(targetMind.Value, mobUid, true);
                             }
                         },
                         ConfirmationPopup = true,
@@ -208,6 +213,15 @@ private void AddAdminVerbs(GetVerbsEvent<Verb> args)
                         ConfirmationPopup = true,
                         Impact = LogImpact.High,
                     });
+
+                    // PlayerPanel
+                    args.Verbs.Add(new Verb
+                    {
+                        Text = Loc.GetString("admin-player-actions-player-panel"),
+                        Category = VerbCategory.Admin,
+                        Act = () => _console.ExecuteCommand(player, $"playerpanel \"{targetActor.PlayerSession.UserId}\""),
+                        Impact = LogImpact.Low
+                    });
                 }
 
                 // Freeze
@@ -329,6 +343,25 @@ private void AddAdminVerbs(GetVerbsEvent<Verb> args)
                     Impact = LogImpact.Low
                 });
 
+                if (TryComp<SiliconLawBoundComponent>(args.Target, out var lawBoundComponent))
+                {
+                    args.Verbs.Add(new Verb()
+                    {
+                        Text = Loc.GetString("silicon-law-ui-verb"),
+                        Category = VerbCategory.Admin,
+                        Act = () =>
+                        {
+                            var ui = new SiliconLawEui(_siliconLawSystem, EntityManager, _adminManager);
+                            if (!_playerManager.TryGetSessionByEntity(args.User, out var session))
+                            {
+                                return;
+                            }
+                            _euiManager.OpenEui(ui, session);
+                            ui.UpdateLaws(lawBoundComponent, args.Target);
+                        },
+                        Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Interface/Actions/actions_borg.rsi"), "state-laws"),
+                    });
+                }
             }
         }
 
diff --git a/Content.Server/Administration/Systems/BwoinkSystem.cs b/Content.Server/Administration/Systems/BwoinkSystem.cs
index 0a797aa02a8..893de4aba5b 100644
--- a/Content.Server/Administration/Systems/BwoinkSystem.cs
+++ b/Content.Server/Administration/Systems/BwoinkSystem.cs
@@ -7,11 +7,13 @@
 using System.Threading.Tasks;
 using Content.Server.Administration.Managers;
 using Content.Server.Afk;
+using Content.Server.Database;
 using Content.Server.Discord;
 using Content.Server.GameTicking;
 using Content.Server.Players.RateLimiting;
 using Content.Shared.Administration;
 using Content.Shared.CCVar;
+using Content.Shared.GameTicking;
 using Content.Shared.Mind;
 using JetBrains.Annotations;
 using Robust.Server.Player;
@@ -38,6 +40,7 @@ public sealed partial class BwoinkSystem : SharedBwoinkSystem
         [Dependency] private readonly GameTicker _gameTicker = default!;
         [Dependency] private readonly SharedMindSystem _minds = default!;
         [Dependency] private readonly IAfkManager _afkManager = default!;
+        [Dependency] private readonly IServerDbManager _dbManager = default!;
         [Dependency] private readonly PlayerRateLimitManager _rateLimit = default!;
 
         [GeneratedRegex(@"^https://discord\.com/api/webhooks/(\d+)/((?!.*/).*)$")]
@@ -50,7 +53,11 @@ public sealed partial class BwoinkSystem : SharedBwoinkSystem
         private string _footerIconUrl = string.Empty;
         private string _avatarUrl = string.Empty;
         private string _serverName = string.Empty;
-        private readonly Dictionary<NetUserId, (string? id, string username, string description, string? characterName, GameRunLevel lastRunLevel)> _relayMessages = new();
+
+        private readonly
+            Dictionary<NetUserId, (string? id, string username, string description, string? characterName, GameRunLevel
+                lastRunLevel)> _relayMessages = new();
+
         private Dictionary<NetUserId, string> _oldMessageIds = new();
         private readonly Dictionary<NetUserId, Queue<string>> _messageQueues = new();
         private readonly HashSet<NetUserId> _processingChannels = new();
@@ -69,6 +76,7 @@ public sealed partial class BwoinkSystem : SharedBwoinkSystem
         private const string TooLongText = "... **(too long)**";
 
         private int _maxAdditionalChars;
+        private readonly Dictionary<NetUserId, DateTime> _activeConversations = new();
 
         public override void Initialize()
         {
@@ -79,13 +87,22 @@ public override void Initialize()
             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, playedSound: false).Length;
+            var defaultParams = new AHelpMessageParams(
+                string.Empty,
+                string.Empty,
+                true,
+                _gameTicker.RoundDuration().ToString("hh\\:mm\\:ss"),
+                _gameTicker.RunLevel,
+                playedSound: false
+            );
+            _maxAdditionalChars = GenerateAHelpMessage(defaultParams).Length;
             _playerManager.PlayerStatusChanged += OnPlayerStatusChanged;
 
             SubscribeLocalEvent<GameRunLevelChangedEvent>(OnGameRunLevelChanged);
             SubscribeNetworkEvent<BwoinkClientTypingUpdated>(OnClientTypingUpdated);
+            SubscribeLocalEvent<RoundRestartCleanupEvent>(_ => _activeConversations.Clear());
 
-            _rateLimit.Register(
+        	_rateLimit.Register(
                 RateLimitKey,
                 new RateLimitRegistration
                 {
@@ -107,14 +124,129 @@ private void OnOverrideChanged(string obj)
             _overrideClientName = obj;
         }
 
-        private void OnPlayerStatusChanged(object? sender, SessionStatusEventArgs e)
+        private async void OnPlayerStatusChanged(object? sender, SessionStatusEventArgs e)
         {
+            if (e.NewStatus == SessionStatus.Disconnected)
+            {
+                if (_activeConversations.TryGetValue(e.Session.UserId, out var lastMessageTime))
+                {
+                    var timeSinceLastMessage = DateTime.Now - lastMessageTime;
+                    if (timeSinceLastMessage > TimeSpan.FromMinutes(5))
+                    {
+                        _activeConversations.Remove(e.Session.UserId);
+                        return; // Do not send disconnect message if timeout exceeded
+                    }
+                }
+
+                // Check if the user has been banned
+                var ban = await _dbManager.GetServerBanAsync(null, e.Session.UserId, null);
+                if (ban != null)
+                {
+                    var banMessage = Loc.GetString("bwoink-system-player-banned", ("banReason", ban.Reason));
+                    NotifyAdmins(e.Session, banMessage, PlayerStatusType.Banned);
+                    _activeConversations.Remove(e.Session.UserId);
+                    return;
+                }
+            }
+
+            // Notify all admins if a player disconnects or reconnects
+            var message = e.NewStatus switch
+            {
+                SessionStatus.Connected => Loc.GetString("bwoink-system-player-reconnecting"),
+                SessionStatus.Disconnected => Loc.GetString("bwoink-system-player-disconnecting"),
+                _ => null
+            };
+
+            if (message != null)
+            {
+                var statusType = e.NewStatus == SessionStatus.Connected
+                    ? PlayerStatusType.Connected
+                    : PlayerStatusType.Disconnected;
+                NotifyAdmins(e.Session, message, statusType);
+            }
+
             if (e.NewStatus != SessionStatus.InGame)
                 return;
 
             RaiseNetworkEvent(new BwoinkDiscordRelayUpdated(!string.IsNullOrWhiteSpace(_webhookUrl)), e.Session);
         }
 
+        private void NotifyAdmins(ICommonSession session, string message, PlayerStatusType statusType)
+        {
+            if (!_activeConversations.ContainsKey(session.UserId))
+            {
+                // If the user is not part of an active conversation, do not notify admins.
+                return;
+            }
+
+            // Get the current timestamp
+            var timestamp = DateTime.Now.ToString("HH:mm:ss");
+            var roundTime = _gameTicker.RoundDuration().ToString("hh\\:mm\\:ss");
+
+            // Determine the icon based on the status type
+            string icon = statusType switch
+            {
+                PlayerStatusType.Connected => ":green_circle:",
+                PlayerStatusType.Disconnected => ":red_circle:",
+                PlayerStatusType.Banned => ":no_entry:",
+                _ => ":question:"
+            };
+
+            // Create the message parameters for Discord
+            var messageParams = new AHelpMessageParams(
+                session.Name,
+                message,
+                true,
+                roundTime,
+                _gameTicker.RunLevel,
+                playedSound: true,
+                icon: icon
+            );
+
+            // Create the message for in-game with username
+            var color = statusType switch
+            {
+                PlayerStatusType.Connected => Color.Green.ToHex(),
+                PlayerStatusType.Disconnected => Color.Yellow.ToHex(),
+                PlayerStatusType.Banned => Color.Orange.ToHex(),
+                _ => Color.Gray.ToHex(),
+            };
+            var inGameMessage = $"[color={color}]{session.Name} {message}[/color]";
+
+            var bwoinkMessage = new BwoinkTextMessage(
+                userId: session.UserId,
+                trueSender: SystemUserId,
+                text: inGameMessage,
+                sentAt: DateTime.Now,
+                playSound: false
+            );
+
+            var admins = GetTargetAdmins();
+            foreach (var admin in admins)
+            {
+                RaiseNetworkEvent(bwoinkMessage, admin);
+            }
+
+            // Enqueue the message for Discord relay
+            if (_webhookUrl != string.Empty)
+            {
+                // if (!_messageQueues.ContainsKey(session.UserId))
+                //     _messageQueues[session.UserId] = new Queue<string>();
+                //
+                // var escapedText = FormattedMessage.EscapeText(message);
+                // messageParams.Message = escapedText;
+                //
+                // var discordMessage = GenerateAHelpMessage(messageParams);
+                // _messageQueues[session.UserId].Enqueue(discordMessage);
+
+                var queue = _messageQueues.GetOrNew(session.UserId);
+                var escapedText = FormattedMessage.EscapeText(message);
+                messageParams.Message = escapedText;
+                var discordMessage = GenerateAHelpMessage(messageParams);
+                queue.Enqueue(discordMessage);
+            }
+        }
+
         private void OnGameRunLevelChanged(GameRunLevelChangedEvent args)
         {
             // Don't make a new embed if we
@@ -209,7 +341,8 @@ private async Task SetWebhookData(string id, string token)
             var content = await response.Content.ReadAsStringAsync();
             if (!response.IsSuccessStatusCode)
             {
-                _sawmill.Log(LogLevel.Error, $"Discord returned bad status code when trying to get webhook data (perhaps the webhook URL is invalid?): {response.StatusCode}\nResponse: {content}");
+                _sawmill.Log(LogLevel.Error,
+                    $"Discord returned bad status code when trying to get webhook data (perhaps the webhook URL is invalid?): {response.StatusCode}\nResponse: {content}");
                 return;
             }
 
@@ -233,7 +366,7 @@ private async void ProcessQueue(NetUserId userId, Queue<string> messages)
 
             // Whether the message will become too long after adding these new messages
             var tooLong = exists && messages.Sum(msg => Math.Min(msg.Length, MessageLengthCap) + "\n".Length)
-                    + existingEmbed.description.Length > DescriptionMax;
+                + existingEmbed.description.Length > DescriptionMax;
 
             // If there is no existing embed, or it is getting too long, we create a new embed
             if (!exists || tooLong)
@@ -242,7 +375,8 @@ private async void ProcessQueue(NetUserId userId, Queue<string> messages)
 
                 if (lookup == null)
                 {
-                    _sawmill.Log(LogLevel.Error, $"Unable to find player for NetUserId {userId} when sending discord webhook.");
+                    _sawmill.Log(LogLevel.Error,
+                        $"Unable to find player for NetUserId {userId} when sending discord webhook.");
                     _relayMessages.Remove(userId);
                     return;
                 }
@@ -254,11 +388,13 @@ private async void ProcessQueue(NetUserId userId, Queue<string> messages)
                 {
                     if (tooLong && existingEmbed.id != null)
                     {
-                        linkToPrevious = $"**[Go to previous embed of this round](https://discord.com/channels/{guildId}/{channelId}/{existingEmbed.id})**\n";
+                        linkToPrevious =
+                            $"**[Go to previous embed of this round](https://discord.com/channels/{guildId}/{channelId}/{existingEmbed.id})**\n";
                     }
                     else if (_oldMessageIds.TryGetValue(userId, out var id) && !string.IsNullOrEmpty(id))
                     {
-                        linkToPrevious = $"**[Go to last round's conversation with this player](https://discord.com/channels/{guildId}/{channelId}/{id})**\n";
+                        linkToPrevious =
+                            $"**[Go to last round's conversation with this player](https://discord.com/channels/{guildId}/{channelId}/{id})**\n";
                     }
                 }
 
@@ -274,7 +410,8 @@ private async void ProcessQueue(NetUserId userId, Queue<string> messages)
                     GameRunLevel.PreRoundLobby => "\n\n:arrow_forward: _**Pre-round lobby started**_\n",
                     GameRunLevel.InRound => "\n\n:arrow_forward: _**Round started**_\n",
                     GameRunLevel.PostRound => "\n\n:stop_button: _**Post-round started**_\n",
-                    _ => throw new ArgumentOutOfRangeException(nameof(_gameTicker.RunLevel), $"{_gameTicker.RunLevel} was not matched."),
+                    _ => throw new ArgumentOutOfRangeException(nameof(_gameTicker.RunLevel),
+                        $"{_gameTicker.RunLevel} was not matched."),
                 };
 
                 existingEmbed.lastRunLevel = _gameTicker.RunLevel;
@@ -290,7 +427,9 @@ private async void ProcessQueue(NetUserId userId, Queue<string> messages)
                 existingEmbed.description += $"\n{message}";
             }
 
-            var payload = GeneratePayload(existingEmbed.description, existingEmbed.username, existingEmbed.characterName);
+            var payload = GeneratePayload(existingEmbed.description,
+                existingEmbed.username,
+                existingEmbed.characterName);
 
             // If there is no existing embed, create a new one
             // Otherwise patch (edit) it
@@ -302,7 +441,8 @@ private async void ProcessQueue(NetUserId userId, Queue<string> messages)
                 var content = await request.Content.ReadAsStringAsync();
                 if (!request.IsSuccessStatusCode)
                 {
-                    _sawmill.Log(LogLevel.Error, $"Discord returned bad status code when posting message (perhaps the message is too long?): {request.StatusCode}\nResponse: {content}");
+                    _sawmill.Log(LogLevel.Error,
+                        $"Discord returned bad status code when posting message (perhaps the message is too long?): {request.StatusCode}\nResponse: {content}");
                     _relayMessages.Remove(userId);
                     return;
                 }
@@ -310,7 +450,8 @@ private async void ProcessQueue(NetUserId userId, Queue<string> messages)
                 var id = JsonNode.Parse(content)?["id"];
                 if (id == null)
                 {
-                    _sawmill.Log(LogLevel.Error, $"Could not find id in json-content returned from discord webhook: {content}");
+                    _sawmill.Log(LogLevel.Error,
+                        $"Could not find id in json-content returned from discord webhook: {content}");
                     _relayMessages.Remove(userId);
                     return;
                 }
@@ -325,7 +466,8 @@ private async void ProcessQueue(NetUserId userId, Queue<string> messages)
                 if (!request.IsSuccessStatusCode)
                 {
                     var content = await request.Content.ReadAsStringAsync();
-                    _sawmill.Log(LogLevel.Error, $"Discord returned bad status code when patching message (perhaps the message is too long?): {request.StatusCode}\nResponse: {content}");
+                    _sawmill.Log(LogLevel.Error,
+                        $"Discord returned bad status code when patching message (perhaps the message is too long?): {request.StatusCode}\nResponse: {content}");
                     _relayMessages.Remove(userId);
                     return;
                 }
@@ -355,7 +497,8 @@ private WebhookPayload GeneratePayload(string messages, string username, string?
                     : $"pre-round lobby for round {_gameTicker.RoundId + 1}",
                 GameRunLevel.InRound => $"round {_gameTicker.RoundId}",
                 GameRunLevel.PostRound => $"post-round {_gameTicker.RoundId}",
-                _ => throw new ArgumentOutOfRangeException(nameof(_gameTicker.RunLevel), $"{_gameTicker.RunLevel} was not matched."),
+                _ => throw new ArgumentOutOfRangeException(nameof(_gameTicker.RunLevel),
+                    $"{_gameTicker.RunLevel} was not matched."),
             };
 
             return new WebhookPayload
@@ -401,6 +544,7 @@ public override void Update(float frameTime)
         protected override void OnBwoinkTextMessage(BwoinkTextMessage message, EntitySessionEventArgs eventArgs)
         {
             base.OnBwoinkTextMessage(message, eventArgs);
+            _activeConversations[message.UserId] = DateTime.Now;
             var senderSession = eventArgs.SenderSession;
 
             // TODO: Sanitize text?
@@ -421,14 +565,23 @@ protected override void OnBwoinkTextMessage(BwoinkTextMessage message, EntitySes
             var escapedText = FormattedMessage.EscapeText(message.Text);
 
             string bwoinkText;
+            string adminPrefix = "";
 
-            if (senderAdmin is not null && senderAdmin.Flags == AdminFlags.Adminhelp) // Mentor. Not full admin. That's why it's colored differently.
+            //Getting an administrator position
+            if (_config.GetCVar(CCVars.AhelpAdminPrefix) && senderAdmin is not null && senderAdmin.Title is not null)
             {
-                bwoinkText = $"[color=purple]{senderSession.Name}[/color]";
+                adminPrefix = $"[bold]\\[{senderAdmin.Title}\\][/bold] ";
+            }
+
+            if (senderAdmin is not null &&
+                senderAdmin.Flags ==
+                AdminFlags.Adminhelp) // Mentor. Not full admin. That's why it's colored differently.
+            {
+                bwoinkText = $"[color=purple]{adminPrefix}{senderSession.Name}[/color]";
             }
             else if (senderAdmin is not null && senderAdmin.HasFlag(AdminFlags.Adminhelp))
             {
-                bwoinkText = $"[color=red]{senderSession.Name}[/color]";
+                bwoinkText = $"[color=red]{adminPrefix}{senderSession.Name}[/color]";
             }
             else
             {
@@ -451,6 +604,13 @@ protected override void OnBwoinkTextMessage(BwoinkTextMessage message, EntitySes
                 RaiseNetworkEvent(msg, channel);
             }
 
+            string adminPrefixWebhook = "";
+
+            if (_config.GetCVar(CCVars.AhelpAdminPrefixWebhook) && senderAdmin is not null && senderAdmin.Title is not null)
+            {
+                adminPrefixWebhook = $"[bold]\\[{senderAdmin.Title}\\][/bold] ";
+            }
+
             // Notify player
             if (_playerManager.TryGetSessionById(message.UserId, out var session))
             {
@@ -461,13 +621,15 @@ protected override void OnBwoinkTextMessage(BwoinkTextMessage message, EntitySes
                     {
                         string overrideMsgText;
                         // 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.
+                        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]";
+                            overrideMsgText = $"[color=purple]{adminPrefixWebhook}{_overrideClientName}[/color]";
                         }
                         else if (senderAdmin is not null && senderAdmin.HasFlag(AdminFlags.Adminhelp))
                         {
-                            overrideMsgText = $"[color=red]{_overrideClientName}[/color]";
+                            overrideMsgText = $"[color=red]{adminPrefixWebhook}{_overrideClientName}[/color]";
                         }
                         else
                         {
@@ -476,7 +638,11 @@ protected override void OnBwoinkTextMessage(BwoinkTextMessage message, EntitySes
 
                         overrideMsgText = $"{(message.PlaySound ? "" : "(S) ")}{overrideMsgText}: {escapedText}";
 
-                        RaiseNetworkEvent(new BwoinkTextMessage(message.UserId, senderSession.UserId, overrideMsgText, playSound: playSound), session.Channel);
+                        RaiseNetworkEvent(new BwoinkTextMessage(message.UserId,
+                                senderSession.UserId,
+                                overrideMsgText,
+                                playSound: playSound),
+                            session.Channel);
                     }
                     else
                         RaiseNetworkEvent(msg, session.Channel);
@@ -496,8 +662,18 @@ 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, playedSound: playSound, noReceivers: nonAfkAdmins.Count == 0));
+                var messageParams = new AHelpMessageParams(
+                    senderSession.Name,
+                    str,
+                    !personalChannel,
+                    _gameTicker.RoundDuration().ToString("hh\\:mm\\:ss"),
+                    _gameTicker.RunLevel,
+                    playedSound: playSound,
+                    noReceivers: nonAfkAdmins.Count == 0
+                );
+                _messageQueues[msg.UserId].Enqueue(GenerateAHelpMessage(messageParams));
             }
 
             if (admins.Count != 0 || sendsWebhook)
@@ -512,7 +688,8 @@ protected override void OnBwoinkTextMessage(BwoinkTextMessage message, EntitySes
         private IList<INetChannel> GetNonAfkAdmins()
         {
             return _adminManager.ActiveAdmins
-                .Where(p => (_adminManager.GetAdminData(p)?.HasFlag(AdminFlags.Adminhelp) ?? false) && !_afkManager.IsAfk(p))
+                .Where(p => (_adminManager.GetAdminData(p)?.HasFlag(AdminFlags.Adminhelp) ?? false) &&
+                            !_afkManager.IsAfk(p))
                 .Select(p => p.Channel)
                 .ToList();
         }
@@ -525,25 +702,69 @@ private IList<INetChannel> GetTargetAdmins()
                 .ToList();
         }
 
-        private static string GenerateAHelpMessage(string username, string message, bool admin, string roundTime, GameRunLevel roundState, bool playedSound, bool noReceivers = false)
+        private static string GenerateAHelpMessage(AHelpMessageParams parameters)
         {
             var stringbuilder = new StringBuilder();
 
-            if (admin)
+            if (parameters.Icon != null)
+                stringbuilder.Append(parameters.Icon);
+            else if (parameters.IsAdmin)
                 stringbuilder.Append(":outbox_tray:");
-            else if (noReceivers)
+            else if (parameters.NoReceivers)
                 stringbuilder.Append(":sos:");
             else
                 stringbuilder.Append(":inbox_tray:");
 
-            if(roundTime != string.Empty && roundState == GameRunLevel.InRound)
-                stringbuilder.Append($" **{roundTime}**");
-            if (!playedSound)
+            if (parameters.RoundTime != string.Empty && parameters.RoundState == GameRunLevel.InRound)
+                stringbuilder.Append($" **{parameters.RoundTime}**");
+            if (!parameters.PlayedSound)
                 stringbuilder.Append(" **(S)**");
-            stringbuilder.Append($" **{username}:** ");
-            stringbuilder.Append(message);
+
+            if (parameters.Icon == null)
+                stringbuilder.Append($" **{parameters.Username}:** ");
+            else
+                stringbuilder.Append($" **{parameters.Username}** ");
+            stringbuilder.Append(parameters.Message);
             return stringbuilder.ToString();
         }
     }
-}
 
+    public sealed class AHelpMessageParams
+    {
+        public string Username { get; set; }
+        public string Message { get; set; }
+        public bool IsAdmin { get; set; }
+        public string RoundTime { get; set; }
+        public GameRunLevel RoundState { get; set; }
+        public bool PlayedSound { get; set; }
+        public bool NoReceivers { get; set; }
+        public string? Icon { get; set; }
+
+        public AHelpMessageParams(
+            string username,
+            string message,
+            bool isAdmin,
+            string roundTime,
+            GameRunLevel roundState,
+            bool playedSound,
+            bool noReceivers = false,
+            string? icon = null)
+        {
+            Username = username;
+            Message = message;
+            IsAdmin = isAdmin;
+            RoundTime = roundTime;
+            RoundState = roundState;
+            PlayedSound = playedSound;
+            NoReceivers = noReceivers;
+            Icon = icon;
+        }
+    }
+
+    public enum PlayerStatusType
+    {
+        Connected,
+        Disconnected,
+        Banned,
+    }
+}
diff --git a/Content.Server/Alert/Click/BreakVow.cs b/Content.Server/Alert/Click/BreakVow.cs
deleted file mode 100644
index 400dabbb01d..00000000000
--- a/Content.Server/Alert/Click/BreakVow.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Content.Shared.Alert;
-using Content.Server.Abilities.Mime;
-
-namespace Content.Server.Alert.Click
-{
-    ///<summary>
-    /// Break your mime vows
-    ///</summary>
-    [DataDefinition]
-    public sealed partial class BreakVow : IAlertClick
-    {
-        public void AlertClicked(EntityUid player)
-        {
-            var entManager = IoCManager.Resolve<IEntityManager>();
-
-           if (entManager.TryGetComponent(player, out MimePowersComponent? mimePowers))
-           {
-                entManager.System<MimePowersSystem>().BreakVow(player, mimePowers);
-           }
-        }
-    }
-}
diff --git a/Content.Server/Alert/Click/RemoveCuffs.cs b/Content.Server/Alert/Click/RemoveCuffs.cs
deleted file mode 100644
index b55484283a5..00000000000
--- a/Content.Server/Alert/Click/RemoveCuffs.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Content.Server.Cuffs;
-using Content.Shared.Alert;
-using JetBrains.Annotations;
-
-namespace Content.Server.Alert.Click
-{
-    /// <summary>
-    ///     Try to remove handcuffs from yourself
-    /// </summary>
-    [UsedImplicitly]
-    [DataDefinition]
-    public sealed partial class RemoveCuffs : IAlertClick
-    {
-        public void AlertClicked(EntityUid player)
-        {
-            var entityManager = IoCManager.Resolve<IEntityManager>();
-            var cuffableSys = entityManager.System<CuffableSystem>();
-            cuffableSys.TryUncuff(player, player);
-        }
-    }
-}
diff --git a/Content.Server/Alert/Click/RemoveEnsnare.cs b/Content.Server/Alert/Click/RemoveEnsnare.cs
deleted file mode 100644
index c33f4ae3417..00000000000
--- a/Content.Server/Alert/Click/RemoveEnsnare.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Content.Server.Ensnaring;
-using Content.Shared.Alert;
-using Content.Shared.Ensnaring.Components;
-using JetBrains.Annotations;
-
-namespace Content.Server.Alert.Click;
-[UsedImplicitly]
-[DataDefinition]
-public sealed partial class RemoveEnsnare : IAlertClick
-{
-    public void AlertClicked(EntityUid player)
-    {
-        var entManager = IoCManager.Resolve<IEntityManager>();
-        if (entManager.TryGetComponent(player, out EnsnareableComponent? ensnareableComponent))
-        {
-            foreach (var ensnare in ensnareableComponent.Container.ContainedEntities)
-            {
-                if (!entManager.TryGetComponent(ensnare, out EnsnaringComponent? ensnaringComponent))
-                    return;
-
-                entManager.EntitySysManager.GetEntitySystem<EnsnareableSystem>().TryFree(player, player, ensnare, ensnaringComponent);
-
-                // Only one snare at a time.
-                break;
-            }
-        }
-    }
-}
diff --git a/Content.Server/Alert/Click/ResistFire.cs b/Content.Server/Alert/Click/ResistFire.cs
deleted file mode 100644
index 9ae49c3f456..00000000000
--- a/Content.Server/Alert/Click/ResistFire.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Content.Server.Atmos.Components;
-using Content.Server.Atmos.EntitySystems;
-using Content.Shared.Alert;
-using JetBrains.Annotations;
-
-namespace Content.Server.Alert.Click
-{
-    /// <summary>
-    /// Resist fire
-    /// </summary>
-    [UsedImplicitly]
-    [DataDefinition]
-    public sealed partial class ResistFire : IAlertClick
-    {
-        public void AlertClicked(EntityUid player)
-        {
-            var entManager = IoCManager.Resolve<IEntityManager>();
-
-            if (entManager.TryGetComponent(player, out FlammableComponent? flammable))
-            {
-                entManager.System<FlammableSystem>().Resist(player, flammable);
-            }
-        }
-    }
-}
diff --git a/Content.Server/Alert/Click/RetakeVow.cs b/Content.Server/Alert/Click/RetakeVow.cs
deleted file mode 100644
index 1b7a15ea747..00000000000
--- a/Content.Server/Alert/Click/RetakeVow.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Content.Shared.Alert;
-using Content.Server.Abilities.Mime;
-
-namespace Content.Server.Alert.Click
-{
-    ///<summary>
-    /// Retake your mime vows
-    ///</summary>
-    [DataDefinition]
-    public sealed partial class RetakeVow : IAlertClick
-    {
-        public void AlertClicked(EntityUid player)
-        {
-            var entManager = IoCManager.Resolve<IEntityManager>();
-
-           if (entManager.TryGetComponent(player, out MimePowersComponent? mimePowers))
-           {
-                entManager.System<MimePowersSystem>().RetakeVow(player, mimePowers);
-           }
-        }
-    }
-}
diff --git a/Content.Server/Alert/Click/StopBeingPulled.cs b/Content.Server/Alert/Click/StopBeingPulled.cs
deleted file mode 100644
index b02da38ecfa..00000000000
--- a/Content.Server/Alert/Click/StopBeingPulled.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Content.Shared.ActionBlocker;
-using Content.Shared.Alert;
-using Content.Shared.Movement.Pulling.Components;
-using Content.Shared.Movement.Pulling.Systems;
-using JetBrains.Annotations;
-
-namespace Content.Server.Alert.Click
-{
-    /// <summary>
-    /// Stop pulling something
-    /// </summary>
-    [UsedImplicitly]
-    [DataDefinition]
-    public sealed partial class StopBeingPulled : IAlertClick
-    {
-        public void AlertClicked(EntityUid player)
-        {
-            var entityManager = IoCManager.Resolve<IEntityManager>();
-
-            if (!entityManager.System<ActionBlockerSystem>().CanInteract(player, null))
-                return;
-
-            if (entityManager.TryGetComponent(player, out PullableComponent? playerPullable))
-            {
-                entityManager.System<PullingSystem>().TryStopPull(player, playerPullable, user: player);
-            }
-        }
-    }
-}
diff --git a/Content.Server/Alert/Click/StopPiloting.cs b/Content.Server/Alert/Click/StopPiloting.cs
deleted file mode 100644
index cd4e333c0a8..00000000000
--- a/Content.Server/Alert/Click/StopPiloting.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Content.Server.Shuttles.Systems;
-using Content.Shared.Alert;
-using Content.Shared.Shuttles.Components;
-using JetBrains.Annotations;
-
-namespace Content.Server.Alert.Click
-{
-    /// <summary>
-    /// Stop piloting shuttle
-    /// </summary>
-    [UsedImplicitly]
-    [DataDefinition]
-    public sealed partial class StopPiloting : IAlertClick
-    {
-        public void AlertClicked(EntityUid player)
-        {
-            var entManager = IoCManager.Resolve<IEntityManager>();
-
-            if (entManager.TryGetComponent(player, out PilotComponent? pilotComponent)
-            && pilotComponent.Console != null)
-            {
-                entManager.System<ShuttleConsoleSystem>().RemovePilot(player, pilotComponent);
-            }
-        }
-    }
-}
diff --git a/Content.Server/Alert/Click/StopPulling.cs b/Content.Server/Alert/Click/StopPulling.cs
deleted file mode 100644
index 76f9569429f..00000000000
--- a/Content.Server/Alert/Click/StopPulling.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Content.Shared.Alert;
-using Content.Shared.Movement.Pulling.Components;
-using Content.Shared.Movement.Pulling.Systems;
-using JetBrains.Annotations;
-
-namespace Content.Server.Alert.Click
-{
-    /// <summary>
-    /// Stop pulling something
-    /// </summary>
-    [UsedImplicitly]
-    [DataDefinition]
-    public sealed partial class StopPulling : IAlertClick
-    {
-        public void AlertClicked(EntityUid player)
-        {
-            var entManager = IoCManager.Resolve<IEntityManager>();
-            var ps = entManager.System<PullingSystem>();
-
-            if (entManager.TryGetComponent(player, out PullerComponent? puller) &&
-                entManager.TryGetComponent(puller.Pulling, out PullableComponent? pullableComp))
-            {
-                ps.TryStopPull(puller.Pulling.Value, pullableComp, user: player);
-            }
-        }
-    }
-}
diff --git a/Content.Server/Alert/Click/ToggleInternals.cs b/Content.Server/Alert/Click/ToggleInternals.cs
deleted file mode 100644
index 523db04df30..00000000000
--- a/Content.Server/Alert/Click/ToggleInternals.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Content.Server.Body.Systems;
-using Content.Shared.Alert;
-using JetBrains.Annotations;
-
-namespace Content.Server.Alert.Click;
-
-/// <summary>
-/// Attempts to toggle the internals for a particular entity
-/// </summary>
-[UsedImplicitly]
-[DataDefinition]
-public sealed partial class ToggleInternals : IAlertClick
-{
-    public void AlertClicked(EntityUid player)
-    {
-        var internalsSystem = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<InternalsSystem>();
-        internalsSystem.ToggleInternals(player, player, false);
-    }
-}
diff --git a/Content.Server/Alert/Click/Unbuckle.cs b/Content.Server/Alert/Click/Unbuckle.cs
deleted file mode 100644
index 3e53955d8c5..00000000000
--- a/Content.Server/Alert/Click/Unbuckle.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Content.Shared.Alert;
-using Content.Shared.Buckle;
-using JetBrains.Annotations;
-
-namespace Content.Server.Alert.Click
-{
-    /// <summary>
-    /// Unbuckles if player is currently buckled.
-    /// </summary>
-	[UsedImplicitly]
-    [DataDefinition]
-    public sealed partial class Unbuckle : IAlertClick
-    {
-        public void AlertClicked(EntityUid player)
-        {
-            IoCManager.Resolve<IEntityManager>().System<SharedBuckleSystem>().TryUnbuckle(player, player);
-        }
-    }
-}
diff --git a/Content.Server/Ame/AmeNodeGroup.cs b/Content.Server/Ame/AmeNodeGroup.cs
index 9acc1034ddf..bb482f7726b 100644
--- a/Content.Server/Ame/AmeNodeGroup.cs
+++ b/Content.Server/Ame/AmeNodeGroup.cs
@@ -134,22 +134,11 @@ public float InjectFuel(int fuel, out bool overloading)
         // The AME is being overloaded.
         // Note about these maths: I would assume the general idea here is to make larger engines less safe to overload.
         // In other words, yes, those are supposed to be CoreCount, not safeFuelLimit.
-        var instability = 0;
         var overloadVsSizeResult = fuel - CoreCount;
 
-        // fuel > safeFuelLimit: Slow damage. Can safely run at this level for burst periods if the engine is small and someone is keeping an eye on it.
-        if (_random.Prob(0.5f))
-            instability = 1;
-        // overloadVsSizeResult > 5:
-        if (overloadVsSizeResult > 5)
-            instability = 3;
-        // overloadVsSizeResult > 10: This will explode in at most 20 injections.
-        if (overloadVsSizeResult > 10)
-            instability = 5;
-
-        // Apply calculated instability
-        if (instability == 0)
-            return powerOutput;
+        var instability = overloadVsSizeResult / CoreCount;
+        var fuzz = _random.Next(-1, 2); // -1 to 1
+        instability += fuzz; // fuzz the values a tiny bit.
 
         overloading = true;
         var integrityCheck = 100;
@@ -179,10 +168,12 @@ public float InjectFuel(int fuel, out bool overloading)
     /// </summary>
     public float CalculatePower(int fuel, int cores)
     {
-        // Fuel is squared so more fuel vastly increases power and efficiency
-        // We divide by the number of cores so a larger AME is less efficient at the same fuel settings
-        // this results in all AMEs having the same efficiency at the same fuel-per-core setting
-        return 20000f * fuel * fuel / cores; // Delt V - Revert upstream buff for normal AME operation
+        // Balanced around a single core AME with injection level 2 producing 120KW.
+        // Overclocking yields diminishing returns until it evens out at around 360KW.
+
+        // The adjustment for cores make it so that a 1 core AME at 2 injections is better than a 2 core AME at 2 injections.
+        // However, for the relative amounts for each (1 core at 2 and 2 core at 4), more cores has more output.
+        return 200000f * MathF.Log10(fuel * fuel) * MathF.Pow(0.75f, cores - 1);
     }
 
     public int GetTotalStability()
diff --git a/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs b/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs
index e6abe98b95c..bac2648307c 100644
--- a/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs
+++ b/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs
@@ -22,8 +22,6 @@ namespace Content.Server.Ame.EntitySystems;
 public sealed class AmeControllerSystem : EntitySystem
 {
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly IAdminManager _adminManager = default!;
-    [Dependency] private readonly IChatManager _chatManager = default!;
     [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly AppearanceSystem _appearanceSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
@@ -274,9 +272,9 @@ public void SetInjectionAmount(EntityUid uid, int value, EntityUid? user = null,
         At the time of editing, players regularly "overclock" the AME and those cases require no admin attention.
 
         // Admin alert
-        var safeLimit = 0;
+        var safeLimit = int.MaxValue;
         if (TryGetAMENodeGroup(uid, out var group))
-            safeLimit = group.CoreCount * 2;
+            safeLimit = group.CoreCount * 4;
 
         if (oldValue <= safeLimit && value > safeLimit)
         {
@@ -291,10 +289,20 @@ public void SetInjectionAmount(EntityUid uid, int value, EntityUid? user = null,
         */
     }
 
-    public void AdjustInjectionAmount(EntityUid uid, int delta, int min = 0, int max = int.MaxValue, EntityUid? user = null, AmeControllerComponent? controller = null)
+    public void AdjustInjectionAmount(EntityUid uid, int delta, EntityUid? user = null, AmeControllerComponent? controller = null)
     {
-        if (Resolve(uid, ref controller))
-            SetInjectionAmount(uid, MathHelper.Clamp(controller.InjectionAmount + delta, min, max), user, controller);
+        if (!Resolve(uid, ref controller))
+            return;
+
+        var max = GetMaxInjectionAmount((uid, controller));
+        SetInjectionAmount(uid, MathHelper.Clamp(controller.InjectionAmount + delta, 0, max), user, controller);
+    }
+
+    public int GetMaxInjectionAmount(Entity<AmeControllerComponent> ent)
+    {
+        if (!TryGetAMENodeGroup(ent, out var group))
+            return 0;
+        return  group.CoreCount * 8;
     }
 
     private void UpdateDisplay(EntityUid uid, int stability, AmeControllerComponent? controller = null, AppearanceComponent? appearance = null)
diff --git a/Content.Server/Anomaly/AnomalySynchronizerSystem.cs b/Content.Server/Anomaly/AnomalySynchronizerSystem.cs
index 434a3fef66b..9f18a412925 100644
--- a/Content.Server/Anomaly/AnomalySynchronizerSystem.cs
+++ b/Content.Server/Anomaly/AnomalySynchronizerSystem.cs
@@ -122,7 +122,7 @@ private void ConnectToAnomaly(Entity<AnomalySynchronizerComponent> ent, Entity<A
         _audio.PlayPvs(ent.Comp.ConnectedSound, ent);
     }
 
-    //TO DO: disconnection from the anomaly should also be triggered if the anomaly is far away from the synchronizer.
+    //TODO: disconnection from the anomaly should also be triggered if the anomaly is far away from the synchronizer.
     //Currently only bluespace anomaly can do this, but for some reason it is the only one that cannot be connected to the synchronizer.
     private void DisconneсtFromAnomaly(Entity<AnomalySynchronizerComponent> ent, AnomalyComponent anomaly)
     {
diff --git a/Content.Server/Anomaly/AnomalySystem.Scanner.cs b/Content.Server/Anomaly/AnomalySystem.Scanner.cs
index 39c0d08b55e..65d79de60c6 100644
--- a/Content.Server/Anomaly/AnomalySystem.Scanner.cs
+++ b/Content.Server/Anomaly/AnomalySystem.Scanner.cs
@@ -141,7 +141,7 @@ public FormattedMessage GetScannerMessage(AnomalyScannerComponent component)
         var msg = new FormattedMessage();
         if (component.ScannedAnomaly is not { } anomaly || !TryComp<AnomalyComponent>(anomaly, out var anomalyComp))
         {
-            msg.AddMarkup(Loc.GetString("anomaly-scanner-no-anomaly"));
+            msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-no-anomaly"));
             return msg;
         }
 
@@ -149,14 +149,14 @@ public FormattedMessage GetScannerMessage(AnomalyScannerComponent component)
 
         //Severity
         if (secret != null && secret.Secret.Contains(AnomalySecretData.Severity))
-            msg.AddMarkup(Loc.GetString("anomaly-scanner-severity-percentage-unknown"));
+            msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-severity-percentage-unknown"));
         else
-            msg.AddMarkup(Loc.GetString("anomaly-scanner-severity-percentage", ("percent", anomalyComp.Severity.ToString("P"))));
+            msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-severity-percentage", ("percent", anomalyComp.Severity.ToString("P"))));
         msg.PushNewline();
 
         //Stability
         if (secret != null && secret.Secret.Contains(AnomalySecretData.Stability))
-            msg.AddMarkup(Loc.GetString("anomaly-scanner-stability-unknown"));
+            msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-stability-unknown"));
         else
         {
             string stateLoc;
@@ -166,54 +166,54 @@ public FormattedMessage GetScannerMessage(AnomalyScannerComponent component)
                 stateLoc = Loc.GetString("anomaly-scanner-stability-high");
             else
                 stateLoc = Loc.GetString("anomaly-scanner-stability-medium");
-            msg.AddMarkup(stateLoc);
+            msg.AddMarkupOrThrow(stateLoc);
         }
         msg.PushNewline();
 
         //Point output
         if (secret != null && secret.Secret.Contains(AnomalySecretData.OutputPoint))
-            msg.AddMarkup(Loc.GetString("anomaly-scanner-point-output-unknown"));
+            msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-point-output-unknown"));
         else
-            msg.AddMarkup(Loc.GetString("anomaly-scanner-point-output", ("point", GetAnomalyPointValue(anomaly, anomalyComp))));
+            msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-point-output", ("point", GetAnomalyPointValue(anomaly, anomalyComp))));
         msg.PushNewline();
         msg.PushNewline();
 
         //Particles title
-        msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-readout"));
+        msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-particle-readout"));
         msg.PushNewline();
 
         //Danger
         if (secret != null && secret.Secret.Contains(AnomalySecretData.ParticleDanger))
-            msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-danger-unknown"));
+            msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-particle-danger-unknown"));
         else
-            msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-danger", ("type", GetParticleLocale(anomalyComp.SeverityParticleType))));
+            msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-particle-danger", ("type", GetParticleLocale(anomalyComp.SeverityParticleType))));
         msg.PushNewline();
 
         //Unstable
         if (secret != null && secret.Secret.Contains(AnomalySecretData.ParticleUnstable))
-            msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-unstable-unknown"));
+            msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-particle-unstable-unknown"));
         else
-            msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-unstable", ("type", GetParticleLocale(anomalyComp.DestabilizingParticleType))));
+            msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-particle-unstable", ("type", GetParticleLocale(anomalyComp.DestabilizingParticleType))));
         msg.PushNewline();
 
         //Containment
         if (secret != null && secret.Secret.Contains(AnomalySecretData.ParticleContainment))
-            msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-containment-unknown"));
+            msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-particle-containment-unknown"));
         else
-            msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-containment", ("type", GetParticleLocale(anomalyComp.WeakeningParticleType))));
+            msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-particle-containment", ("type", GetParticleLocale(anomalyComp.WeakeningParticleType))));
         msg.PushNewline();
 
         //Transformation
         if (secret != null && secret.Secret.Contains(AnomalySecretData.ParticleTransformation))
-            msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-transformation-unknown"));
+            msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-particle-transformation-unknown"));
         else
-            msg.AddMarkup(Loc.GetString("anomaly-scanner-particle-transformation", ("type", GetParticleLocale(anomalyComp.TransformationParticleType))));
+            msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-particle-transformation", ("type", GetParticleLocale(anomalyComp.TransformationParticleType))));
 
 
         //Behavior
         msg.PushNewline();
         msg.PushNewline();
-        msg.AddMarkup(Loc.GetString("anomaly-behavior-title"));
+        msg.AddMarkupOrThrow(Loc.GetString("anomaly-behavior-title"));
         msg.PushNewline();
 
         if (secret != null && secret.Secret.Contains(AnomalySecretData.Behavior))
@@ -224,14 +224,14 @@ public FormattedMessage GetScannerMessage(AnomalyScannerComponent component)
             {
                 var behavior = _prototype.Index(anomalyComp.CurrentBehavior.Value);
 
-                msg.AddMarkup("- " + Loc.GetString(behavior.Description));
+                msg.AddMarkupOrThrow("- " + Loc.GetString(behavior.Description));
                 msg.PushNewline();
                 var mod = Math.Floor((behavior.EarnPointModifier) * 100);
-                msg.AddMarkup("- " + Loc.GetString("anomaly-behavior-point", ("mod", mod)));
+                msg.AddMarkupOrThrow("- " + Loc.GetString("anomaly-behavior-point", ("mod", mod)));
             }
             else
             {
-                msg.AddMarkup(Loc.GetString("anomaly-behavior-balanced"));
+                msg.AddMarkupOrThrow(Loc.GetString("anomaly-behavior-balanced"));
             }
         }
 
diff --git a/Content.Server/Anomaly/Effects/ReagentProducerAnomalySystem.cs b/Content.Server/Anomaly/Effects/ReagentProducerAnomalySystem.cs
index 0e49c5ee56b..d289fdabff8 100644
--- a/Content.Server/Anomaly/Effects/ReagentProducerAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/ReagentProducerAnomalySystem.cs
@@ -76,7 +76,7 @@ public override void Update(float frameTime)
             if (anomaly.Severity >= 0.97) reagentProducingAmount *= component.SupercriticalReagentProducingModifier;
 
             newSol.AddReagent(component.ProducingReagent, reagentProducingAmount);
-            _solutionContainer.TryAddSolution(component.Solution.Value, newSol); //TO DO - the container is not fully filled. 
+            _solutionContainer.TryAddSolution(component.Solution.Value, newSol); // TODO - the container is not fully filled.
 
             component.AccumulatedFrametime = 0;
 
diff --git a/Content.Server/Antag/AntagRandomObjectivesSystem.cs b/Content.Server/Antag/AntagRandomObjectivesSystem.cs
index c935b8c0648..b60759a3d5c 100644
--- a/Content.Server/Antag/AntagRandomObjectivesSystem.cs
+++ b/Content.Server/Antag/AntagRandomObjectivesSystem.cs
@@ -39,7 +39,8 @@ private void OnAntagSelected(Entity<AntagRandomObjectivesComponent> ent, ref Aft
 
             for (var pick = 0; pick < set.MaxPicks && ent.Comp.MaxDifficulty > difficulty; pick++)
             {
-                if (_objectives.GetRandomObjective(mindId, mind, set.Groups) is not {} objective)
+                var remainingDifficulty = ent.Comp.MaxDifficulty - difficulty;
+                if (_objectives.GetRandomObjective(mindId, mind, set.Groups, remainingDifficulty) is not { } objective)
                     continue;
 
                 _mind.AddObjective(mindId, mind, objective);
diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs
index cc44789fab2..270b39b3a28 100644
--- a/Content.Server/Antag/AntagSelectionSystem.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.cs
@@ -2,7 +2,6 @@
 using Content.Server.Antag.Components;
 using Content.Server.Chat.Managers;
 using Content.Server.GameTicking;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules;
 using Content.Server.Ghost.Roles;
 using Content.Server.Ghost.Roles.Components;
@@ -14,10 +13,15 @@
 using Content.Server.Shuttles.Components;
 using Content.Server.Station.Systems;
 using Content.Shared.Antag;
+using Content.Shared.Clothing;
 using Content.Shared.GameTicking;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Ghost;
 using Content.Shared.Humanoid;
+using Content.Shared.Mind;
 using Content.Shared.Players;
+using Content.Shared.Preferences.Loadouts;
+using Content.Shared.Roles;
 using Content.Shared.Whitelist;
 using Robust.Server.Audio;
 using Robust.Server.GameObjects;
@@ -25,6 +29,7 @@
 using Robust.Shared.Enums;
 using Robust.Shared.Map;
 using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
@@ -35,10 +40,13 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
     [Dependency] private readonly IChatManager _chat = default!;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IServerPreferencesManager _pref = default!;
+    [Dependency] private readonly ActorSystem _actors = default!;
     [Dependency] private readonly AudioSystem _audio = default!;
     [Dependency] private readonly GhostRoleSystem _ghostRole = default!;
     [Dependency] private readonly JobSystem _jobs = default!;
+    [Dependency] private readonly LoadoutSystem _loadout = default!;
     [Dependency] private readonly MindSystem _mind = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
     [Dependency] private readonly RoleSystem _role = default!;
     [Dependency] private readonly StationSpawningSystem _stationSpawning = default!;
     [Dependency] private readonly TransformSystem _transform = default!;
@@ -224,7 +232,7 @@ public void ChooseAntags(Entity<AntagSelectionComponent> ent, IList<ICommonSessi
 
         for (var i = 0; i < count; i++)
         {
-            var session = (ICommonSession?) null;
+            var session = (ICommonSession?)null;
             if (picking)
             {
                 if (!playerPool.TryPickAndTake(RobustRandom, out session) && noSpawner)
@@ -324,19 +332,28 @@ public void MakeAntag(Entity<AntagSelectionComponent> ent, ICommonSession? sessi
 
         // The following is where we apply components, equipment, and other changes to our antagonist entity.
         EntityManager.AddComponents(player, def.Components);
-        _stationSpawning.EquipStartingGear(player, def.StartingGear);
+
+        // Equip the entity's RoleLoadout and LoadoutGroup
+        List<ProtoId<StartingGearPrototype>>? gear = new();
+        if (def.StartingGear is not null)
+            gear.Add(def.StartingGear.Value);
+
+        _loadout.Equip(player, gear, def.RoleLoadout);
 
         if (session != null)
         {
             var curMind = session.GetMind();
-            if (curMind == null)
+            
+            if (curMind == null || 
+                !TryComp<MindComponent>(curMind.Value, out var mindComp) ||
+                mindComp.OwnedEntity != antagEnt)
             {
                 curMind = _mind.CreateMind(session.UserId, Name(antagEnt.Value));
                 _mind.SetUserId(curMind.Value, session.UserId);
             }
 
             _mind.TransferTo(curMind.Value, antagEnt, ghostCheckOverride: true);
-            _role.MindAddRoles(curMind.Value, def.MindComponents);
+            _role.MindAddRoles(curMind.Value, def.MindComponents, null, true);
             ent.Comp.SelectedMinds.Add((curMind.Value, Name(player)));
             SendBriefing(session, def.Briefing);
         }
@@ -450,7 +467,7 @@ public bool IsEntityValid(EntityUid? entity, AntagSelectionDefinition def)
 
     private void OnObjectivesTextGetInfo(Entity<AntagSelectionComponent> ent, ref ObjectivesTextGetInfoEvent args)
     {
-        if (ent.Comp.AgentName is not {} name)
+        if (ent.Comp.AgentName is not { } name)
             return;
 
         args.Minds = ent.Comp.SelectedMinds;
diff --git a/Content.Server/Antag/Components/AntagImmuneComponent.cs b/Content.Server/Antag/Components/AntagImmuneComponent.cs
index 3ae8e049f60..beec7960f0a 100644
--- a/Content.Server/Antag/Components/AntagImmuneComponent.cs
+++ b/Content.Server/Antag/Components/AntagImmuneComponent.cs
@@ -1,7 +1,7 @@
 namespace Content.Server.Antag.Components;
 
 [RegisterComponent]
-public partial class AntagImmuneComponent : Component
+public sealed partial class AntagImmuneComponent : Component
 {
 
 }
diff --git a/Content.Server/Antag/Components/AntagSelectionComponent.cs b/Content.Server/Antag/Components/AntagSelectionComponent.cs
index f70c27d12f2..0e5a0afc9bc 100644
--- a/Content.Server/Antag/Components/AntagSelectionComponent.cs
+++ b/Content.Server/Antag/Components/AntagSelectionComponent.cs
@@ -1,6 +1,7 @@
 using Content.Server.Administration.Systems;
-using Content.Server.Destructible.Thresholds;
 using Content.Shared.Antag;
+using Content.Shared.Destructible.Thresholds;
+using Content.Shared.Preferences.Loadouts;
 using Content.Shared.Roles;
 using Content.Shared.Storage;
 using Content.Shared.Whitelist;
@@ -154,6 +155,12 @@ public partial struct AntagSelectionDefinition()
     [DataField]
     public ProtoId<StartingGearPrototype>? StartingGear;
 
+    /// <summary>
+    /// A list of role loadouts, from which a randomly selected one will be equipped.
+    /// </summary>
+    [DataField]
+    public List<ProtoId<RoleLoadoutPrototype>>? RoleLoadout;
+
     /// <summary>
     /// A briefing shown to the player.
     /// </summary>
diff --git a/Content.Server/Antag/MobReplacementRuleSystem.cs b/Content.Server/Antag/MobReplacementRuleSystem.cs
index 18837b5a7c8..eeff765d8bb 100644
--- a/Content.Server/Antag/MobReplacementRuleSystem.cs
+++ b/Content.Server/Antag/MobReplacementRuleSystem.cs
@@ -1,7 +1,7 @@
 using Content.Server.Antag.Mimic;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules;
 using Content.Server.GameTicking.Rules.Components;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.VendingMachines;
 using Robust.Shared.Map;
 using Robust.Shared.Random;
diff --git a/Content.Server/Arcade/BlockGame/BlockGame.Ui.cs b/Content.Server/Arcade/BlockGame/BlockGame.Ui.cs
index cd22f1f6d31..943fb75525c 100644
--- a/Content.Server/Arcade/BlockGame/BlockGame.Ui.cs
+++ b/Content.Server/Arcade/BlockGame/BlockGame.Ui.cs
@@ -157,7 +157,7 @@ private void InputTick(float frameTime)
     /// <param name="message">The message to broadcase to all players/spectators.</param>
     private void SendMessage(BoundUserInterfaceMessage message)
     {
-        _uiSystem.ServerSendUiMessage(_entityManager.GetEntity(message.Entity), BlockGameUiKey.Key, message);
+        _uiSystem.ServerSendUiMessage(_owner, BlockGameUiKey.Key, message);
     }
 
     /// <summary>
@@ -167,7 +167,7 @@ private void SendMessage(BoundUserInterfaceMessage message)
     /// <param name="actor">The target recipient.</param>
     private void SendMessage(BoundUserInterfaceMessage message, EntityUid actor)
     {
-        _uiSystem.ServerSendUiMessage(_entityManager.GetEntity(message.Entity), BlockGameUiKey.Key, message, actor);
+        _uiSystem.ServerSendUiMessage(_owner, BlockGameUiKey.Key, message, actor);
     }
 
     /// <summary>
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
index 2e41e45d3f8..b96dd0ac48d 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
@@ -237,7 +237,7 @@ public void ExperiencePressureDifference(
                     // TODO: Technically these directions won't be correct but uhh I'm just here for optimisations buddy not to fix my old bugs.
                     if (throwTarget != EntityCoordinates.Invalid)
                     {
-                        var pos = ((throwTarget.ToMap(EntityManager, _transformSystem).Position - xform.WorldPosition).Normalized() + dirVec).Normalized();
+                        var pos = ((_transformSystem.ToMapCoordinates(throwTarget).Position - _transformSystem.GetWorldPosition(xform)).Normalized() + dirVec).Normalized();
                         _physics.ApplyLinearImpulse(uid, pos * moveForce, body: physics);
                     }
                     else
diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
index dd0ac25d703..cc816a3f10e 100644
--- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
@@ -72,6 +72,7 @@ public override void Initialize()
             SubscribeLocalEvent<FlammableComponent, IsHotEvent>(OnIsHot);
             SubscribeLocalEvent<FlammableComponent, TileFireEvent>(OnTileFire);
             SubscribeLocalEvent<FlammableComponent, RejuvenateEvent>(OnRejuvenate);
+            SubscribeLocalEvent<FlammableComponent, ResistFireAlertEvent>(OnResistFireAlert);
 
             SubscribeLocalEvent<IgniteOnCollideComponent, StartCollideEvent>(IgniteOnCollide);
             SubscribeLocalEvent<IgniteOnCollideComponent, LandEvent>(OnIgniteLand);
@@ -250,6 +251,15 @@ private void OnRejuvenate(EntityUid uid, FlammableComponent component, Rejuvenat
             Extinguish(uid, component);
         }
 
+        private void OnResistFireAlert(Entity<FlammableComponent> ent, ref ResistFireAlertEvent args)
+        {
+            if (args.Handled)
+                return;
+
+            Resist(ent, ent);
+            args.Handled = true;
+        }
+
         public void UpdateAppearance(EntityUid uid, FlammableComponent? flammable = null, AppearanceComponent? appearance = null)
         {
             if (!Resolve(uid, ref flammable, ref appearance))
diff --git a/Content.Server/Atmos/EntitySystems/GasAnalyzerSystem.cs b/Content.Server/Atmos/EntitySystems/GasAnalyzerSystem.cs
index c2cdd4a1072..0f4490cd7eb 100644
--- a/Content.Server/Atmos/EntitySystems/GasAnalyzerSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/GasAnalyzerSystem.cs
@@ -162,7 +162,7 @@ private bool UpdateAnalyzer(EntityUid uid, GasAnalyzerComponent? component = nul
             if (component.LastPosition.HasValue)
             {
                 // Check if position is out of range => don't update and disable
-                if (!component.LastPosition.Value.InRange(EntityManager, _transform, userPos, SharedInteractionSystem.InteractionRange))
+                if (!_transform.InRange(component.LastPosition.Value, userPos, SharedInteractionSystem.InteractionRange))
                 {
                     if (component.User is { } userId && component.Enabled)
                         _popup.PopupEntity(Loc.GetString("gas-analyzer-shutoff"), userId, userId);
diff --git a/Content.Server/Atmos/EntitySystems/GasMinerSystem.cs b/Content.Server/Atmos/EntitySystems/GasMinerSystem.cs
new file mode 100644
index 00000000000..f7a3b9eed8a
--- /dev/null
+++ b/Content.Server/Atmos/EntitySystems/GasMinerSystem.cs
@@ -0,0 +1,90 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Server.Atmos.Piping.Components;
+using Content.Shared.Atmos;
+using Content.Shared.Atmos.Components;
+using Content.Shared.Atmos.EntitySystems;
+using JetBrains.Annotations;
+using Robust.Server.GameObjects;
+
+namespace Content.Server.Atmos.EntitySystems;
+
+[UsedImplicitly]
+public sealed class GasMinerSystem : SharedGasMinerSystem
+{
+    [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
+    [Dependency] private readonly TransformSystem _transformSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<GasMinerComponent, AtmosDeviceUpdateEvent>(OnMinerUpdated);
+    }
+
+    private void OnMinerUpdated(Entity<GasMinerComponent> ent, ref AtmosDeviceUpdateEvent args)
+    {
+        var miner = ent.Comp;
+        var oldState = miner.MinerState;
+        float toSpawn;
+
+        if (!GetValidEnvironment(ent, out var environment) || !Transform(ent).Anchored)
+        {
+            miner.MinerState = GasMinerState.Disabled;
+        }
+        // SpawnAmount is declared in mol/s so to get the amount of gas we hope to mine, we have to multiply this by
+        // how long we have been waiting to spawn it and further cap the number according to the miner's state.
+        else if ((toSpawn = CapSpawnAmount(ent, miner.SpawnAmount * args.dt, environment)) == 0)
+        {
+            miner.MinerState = GasMinerState.Idle;
+        }
+        else
+        {
+            miner.MinerState = GasMinerState.Working;
+
+            // Time to mine some gas.
+            var merger = new GasMixture(1) { Temperature = miner.SpawnTemperature };
+            merger.SetMoles(miner.SpawnGas, toSpawn);
+            _atmosphereSystem.Merge(environment, merger);
+        }
+
+        if (miner.MinerState != oldState)
+        {
+            Dirty(ent);
+        }
+    }
+
+    private bool GetValidEnvironment(Entity<GasMinerComponent> ent, [NotNullWhen(true)] out GasMixture? environment)
+    {
+        var (uid, miner) = ent;
+        var transform = Transform(uid);
+        var position = _transformSystem.GetGridOrMapTilePosition(uid, transform);
+
+        // Treat space as an invalid environment
+        if (_atmosphereSystem.IsTileSpace(transform.GridUid, transform.MapUid, position))
+        {
+            environment = null;
+            return false;
+        }
+
+        environment = _atmosphereSystem.GetContainingMixture((uid, transform), true, true);
+        return environment != null;
+    }
+
+    private float CapSpawnAmount(Entity<GasMinerComponent> ent, float toSpawnTarget, GasMixture environment)
+    {
+        var (uid, miner) = ent;
+
+        // How many moles could we theoretically spawn. Cap by pressure and amount.
+        var allowableMoles = Math.Min(
+            (miner.MaxExternalPressure - environment.Pressure) * environment.Volume / (miner.SpawnTemperature * Atmospherics.R),
+            miner.MaxExternalAmount - environment.TotalMoles);
+
+        var toSpawnReal = Math.Clamp(allowableMoles, 0f, toSpawnTarget);
+
+        if (toSpawnReal < Atmospherics.GasMinMoles) {
+            return 0f;
+        }
+
+        return toSpawnReal;
+    }
+}
diff --git a/Content.Server/Atmos/EntitySystems/GasTankSystem.cs b/Content.Server/Atmos/EntitySystems/GasTankSystem.cs
index baad739804b..2d703439c0f 100644
--- a/Content.Server/Atmos/EntitySystems/GasTankSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/GasTankSystem.cs
@@ -81,7 +81,7 @@ public void UpdateUserInterface(Entity<GasTankComponent> ent, bool initialUpdate
                     TankPressure = component.Air?.Pressure ?? 0,
                     OutputPressure = initialUpdate ? component.OutputPressure : null,
                     InternalsConnected = component.IsConnected,
-                    CanConnectInternals = CanConnectToInternals(component)
+                    CanConnectInternals = CanConnectToInternals(ent)
                 });
         }
 
@@ -217,24 +217,24 @@ public GasMixture RemoveAirVolume(Entity<GasTankComponent> gasTank, float volume
             return air;
         }
 
-        public bool CanConnectToInternals(GasTankComponent component)
+        public bool CanConnectToInternals(Entity<GasTankComponent> ent)
         {
-            var internals = GetInternalsComponent(component, component.User);
-            return internals != null && internals.BreathTools.Count != 0 && !component.IsValveOpen;
+            TryGetInternalsComp(ent, out _, out var internalsComp, ent.Comp.User);
+            return internalsComp != null && internalsComp.BreathTools.Count != 0 && !ent.Comp.IsValveOpen;
         }
 
         public void ConnectToInternals(Entity<GasTankComponent> ent)
         {
             var (owner, component) = ent;
-            if (component.IsConnected || !CanConnectToInternals(component))
+            if (component.IsConnected || !CanConnectToInternals(ent))
                 return;
 
-            var internals = GetInternalsComponent(component);
-            if (internals == null)
+            TryGetInternalsComp(ent, out var internalsUid, out var internalsComp, ent.Comp.User);
+            if (internalsUid == null || internalsComp == null)
                 return;
 
-            if (_internals.TryConnectTank((internals.Owner, internals), owner))
-                component.User = internals.Owner;
+            if (_internals.TryConnectTank((internalsUid.Value, internalsComp), owner))
+                component.User = internalsUid.Value;
 
             _actions.SetToggled(component.ToggleActionEntity, component.IsConnected);
 
@@ -243,7 +243,7 @@ public void ConnectToInternals(Entity<GasTankComponent> ent)
                 return;
 
             component.ConnectStream = _audioSys.Stop(component.ConnectStream);
-            component.ConnectStream = _audioSys.PlayPvs(component.ConnectSound, component.Owner)?.Entity;
+            component.ConnectStream = _audioSys.PlayPvs(component.ConnectSound, owner)?.Entity;
 
             UpdateUserInterface(ent);
         }
@@ -251,29 +251,59 @@ public void ConnectToInternals(Entity<GasTankComponent> ent)
         public void DisconnectFromInternals(Entity<GasTankComponent> ent)
         {
             var (owner, component) = ent;
+
             if (component.User == null)
                 return;
 
-            var internals = GetInternalsComponent(component);
+            TryGetInternalsComp(ent, out var internalsUid, out var internalsComp, component.User);
             component.User = null;
 
             _actions.SetToggled(component.ToggleActionEntity, false);
 
-            _internals.DisconnectTank(internals);
+            if (internalsUid != null && internalsComp != null)
+                _internals.DisconnectTank((internalsUid.Value, internalsComp));
             component.DisconnectStream = _audioSys.Stop(component.DisconnectStream);
-            component.DisconnectStream = _audioSys.PlayPvs(component.DisconnectSound, component.Owner)?.Entity;
+            component.DisconnectStream = _audioSys.PlayPvs(component.DisconnectSound, owner)?.Entity;
 
             UpdateUserInterface(ent);
         }
 
-        private InternalsComponent? GetInternalsComponent(GasTankComponent component, EntityUid? owner = null)
+        /// <summary>
+        /// Tries to retrieve the internals component of either the gas tank's user,
+        /// or the gas tank's... containing container
+        /// </summary>
+        /// <param name="user">The user of the gas tank</param>
+        /// <returns>True if internals comp isn't null, false if it is null</returns>
+        private bool TryGetInternalsComp(Entity<GasTankComponent> ent, out EntityUid? internalsUid, out InternalsComponent? internalsComp, EntityUid? user = null)
         {
-            owner ??= component.User;
-            if (Deleted(component.Owner))return null;
-            if (owner != null) return CompOrNull<InternalsComponent>(owner.Value);
-            return _containers.TryGetContainingContainer(component.Owner, out var container)
-                ? CompOrNull<InternalsComponent>(container.Owner)
-                : null;
+            internalsUid = default;
+            internalsComp = default;
+
+            // If the gas tank doesn't exist for whatever reason, don't even bother
+            if (TerminatingOrDeleted(ent.Owner))
+                return false;
+
+            user ??= ent.Comp.User;
+            // Check if the gas tank's user actually has the component that allows them to use a gas tank and mask
+            if (TryComp<InternalsComponent>(user, out var userInternalsComp) && userInternalsComp != null)
+            {
+                internalsUid = user;
+                internalsComp = userInternalsComp;
+                return true;
+            }
+
+            // Yeah I have no clue what this actually does, I appreciate the lack of comments on the original function
+            if (_containers.TryGetContainingContainer((ent.Owner, Transform(ent.Owner)), out var container) && container != null)
+            {
+                if (TryComp<InternalsComponent>(container.Owner, out var containerInternalsComp) && containerInternalsComp != null)
+                {
+                    internalsUid = container.Owner;
+                    internalsComp = containerInternalsComp;
+                    return true;
+                }
+            }
+
+            return false;
         }
 
         public void AssumeAir(Entity<GasTankComponent> ent, GasMixture giver)
@@ -321,7 +351,7 @@ public void CheckStatus(Entity<GasTankComponent> ent)
                     if(environment != null)
                         _atmosphereSystem.Merge(environment, component.Air);
 
-                    _audioSys.PlayPvs(component.RuptureSound, Transform(component.Owner).Coordinates, AudioParams.Default.WithVariation(0.125f));
+                    _audioSys.PlayPvs(component.RuptureSound, Transform(owner).Coordinates, AudioParams.Default.WithVariation(0.125f));
 
                     QueueDel(owner);
                     return;
diff --git a/Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs b/Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs
index 3c73a8f64ee..f932ef36208 100644
--- a/Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs
+++ b/Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs
@@ -132,10 +132,19 @@ public override void Update(float frameTime)
             var ev = new AtmosDeviceUpdateEvent(_atmosphereSystem.AtmosTime, null, null);
             foreach (var device in _joinedDevices)
             {
-                DebugTools.Assert(!HasComp<GridAtmosphereComponent>(Transform(device).GridUid));
+                var deviceGrid = Transform(device).GridUid;
+                if (HasComp<GridAtmosphereComponent>(deviceGrid))
+                {
+                    RejoinAtmosphere(device);
+                }
                 RaiseLocalEvent(device, ref ev);
                 device.Comp.LastProcess = time;
             }
         }
+
+        public bool IsJoinedOffGrid(Entity<AtmosDeviceComponent> device)
+        {
+            return _joinedDevices.Contains(device);
+        }
     }
 }
diff --git a/Content.Server/Atmos/Piping/Other/Components/GasMinerComponent.cs b/Content.Server/Atmos/Piping/Other/Components/GasMinerComponent.cs
deleted file mode 100644
index 18a0b9b0782..00000000000
--- a/Content.Server/Atmos/Piping/Other/Components/GasMinerComponent.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Content.Shared.Atmos;
-
-namespace Content.Server.Atmos.Piping.Other.Components
-{
-    [RegisterComponent]
-    public sealed partial class GasMinerComponent : Component
-    {
-        public bool Enabled { get; set; } = true;
-
-        public bool Broken { get; set; } = false;
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("maxExternalAmount")]
-        public float MaxExternalAmount { get; set; } = float.PositiveInfinity;
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("maxExternalPressure")]
-        public float MaxExternalPressure { get; set; } = Atmospherics.GasMinerDefaultMaxExternalPressure;
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("spawnGas")]
-        public Gas? SpawnGas { get; set; } = null;
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("spawnTemperature")]
-        public float SpawnTemperature { get; set; } = Atmospherics.T20C;
-
-        /// <summary>
-        ///     Number of moles created per second when the miner is working.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("spawnAmount")]
-        public float SpawnAmount { get; set; } = Atmospherics.MolesCellStandard * 20f;
-    }
-}
diff --git a/Content.Server/Atmos/Piping/Other/EntitySystems/GasMinerSystem.cs b/Content.Server/Atmos/Piping/Other/EntitySystems/GasMinerSystem.cs
deleted file mode 100644
index 251ee797647..00000000000
--- a/Content.Server/Atmos/Piping/Other/EntitySystems/GasMinerSystem.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using Content.Server.Atmos.EntitySystems;
-using Content.Server.Atmos.Piping.Components;
-using Content.Server.Atmos.Piping.Other.Components;
-using Content.Shared.Atmos;
-using JetBrains.Annotations;
-using Robust.Server.GameObjects;
-
-namespace Content.Server.Atmos.Piping.Other.EntitySystems
-{
-    [UsedImplicitly]
-    public sealed class GasMinerSystem : EntitySystem
-    {
-        [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
-        [Dependency] private readonly TransformSystem _transformSystem = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            SubscribeLocalEvent<GasMinerComponent, AtmosDeviceUpdateEvent>(OnMinerUpdated);
-        }
-
-        private void OnMinerUpdated(Entity<GasMinerComponent> ent, ref AtmosDeviceUpdateEvent args)
-        {
-            var miner = ent.Comp;
-
-            // SpawnAmount is declared in mol/s so to get the amount of gas we hope to mine, we have to multiply this by
-            // how long we have been waiting to spawn it and further cap the number according to the miner's state.
-            var toSpawn = CapSpawnAmount(ent, miner.SpawnAmount * args.dt, out var environment);
-            if (toSpawn <= 0f || environment == null || !miner.Enabled || !miner.SpawnGas.HasValue)
-                return;
-
-            // Time to mine some gas.
-
-            var merger = new GasMixture(1) { Temperature = miner.SpawnTemperature };
-            merger.SetMoles(miner.SpawnGas.Value, toSpawn);
-
-            _atmosphereSystem.Merge(environment, merger);
-        }
-
-        private float CapSpawnAmount(Entity<GasMinerComponent> ent, float toSpawnTarget, [NotNullWhen(true)] out GasMixture? environment)
-        {
-            var (uid, miner) = ent;
-            var transform = Transform(uid);
-            environment = _atmosphereSystem.GetContainingMixture((uid, transform), true, true);
-
-            var position = _transformSystem.GetGridOrMapTilePosition(uid, transform);
-
-            // Space.
-            if (_atmosphereSystem.IsTileSpace(transform.GridUid, transform.MapUid, position))
-            {
-                miner.Broken = true;
-                return 0f;
-            }
-
-            // Air-blocked location.
-            if (environment == null)
-            {
-                miner.Broken = true;
-                return 0f;
-            }
-
-            // How many moles could we theoretically spawn. Cap by pressure and amount.
-            var allowableMoles = Math.Min(
-                (miner.MaxExternalPressure - environment.Pressure) * environment.Volume / (miner.SpawnTemperature * Atmospherics.R),
-                miner.MaxExternalAmount - environment.TotalMoles);
-
-            var toSpawnReal = Math.Clamp(allowableMoles, 0f, toSpawnTarget);
-
-            if (toSpawnReal < Atmospherics.GasMinMoles) {
-                miner.Broken = true;
-                return 0f;
-            }
-
-            miner.Broken = false;
-            return toSpawnReal;
-        }
-    }
-}
diff --git a/Content.Server/Atmos/Rotting/RottingSystem.cs b/Content.Server/Atmos/Rotting/RottingSystem.cs
index 5070b3f197f..43dddce4a4e 100644
--- a/Content.Server/Atmos/Rotting/RottingSystem.cs
+++ b/Content.Server/Atmos/Rotting/RottingSystem.cs
@@ -34,7 +34,7 @@ private void OnGibbed(EntityUid uid, RottingComponent component, BeingGibbedEven
         if (!TryComp<PerishableComponent>(uid, out var perishable))
             return;
 
-        var molsToDump = perishable.MolsPerSecondPerUnitMass * physics.FixturesMass * (float) component.TotalRotTime.TotalSeconds;
+        var molsToDump = perishable.MolsPerSecondPerUnitMass * physics.FixturesMass * (float)component.TotalRotTime.TotalSeconds;
         var tileMix = _atmosphere.GetTileMixture(uid, excite: true);
         tileMix?.AdjustMoles(Gas.Ammonia, molsToDump);
     }
@@ -54,7 +54,7 @@ private void OnTempIsRotting(EntityUid uid, TemperatureComponent component, ref
     /// <returns></returns>
     private float GetRotRate(EntityUid uid)
     {
-        if (_container.TryGetContainingContainer(uid, out var container) &&
+        if (_container.TryGetContainingContainer((uid, null, null), out var container) &&
             TryComp<ProRottingContainerComponent>(container.Owner, out var rotContainer))
         {
             return rotContainer.DecayModifier;
@@ -124,7 +124,7 @@ public override void Update(float frameTime)
                 continue;
             // We need a way to get the mass of the mob alone without armor etc in the future
             // or just remove the mass mechanics altogether because they aren't good.
-            var molRate = perishable.MolsPerSecondPerUnitMass * (float) rotting.RotUpdateRate.TotalSeconds;
+            var molRate = perishable.MolsPerSecondPerUnitMass * (float)rotting.RotUpdateRate.TotalSeconds;
             var tileMix = _atmosphere.GetTileMixture(uid, excite: true);
             tileMix?.AdjustMoles(Gas.Ammonia, molRate * physics.FixturesMass);
         }
diff --git a/Content.Server/Bible/BibleSystem.cs b/Content.Server/Bible/BibleSystem.cs
index 2cb0ac1dd76..76efe3290bf 100644
--- a/Content.Server/Bible/BibleSystem.cs
+++ b/Content.Server/Bible/BibleSystem.cs
@@ -1,11 +1,11 @@
 using Content.Server.Bible.Components;
-using Content.Server.Ghost.Roles.Components;
 using Content.Server.Ghost.Roles.Events;
 using Content.Server.Popups;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Actions;
 using Content.Shared.Bible;
 using Content.Shared.Damage;
+using Content.Shared.Ghost.Roles.Components;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Inventory;
diff --git a/Content.Server/Body/Components/InternalsComponent.cs b/Content.Server/Body/Components/InternalsComponent.cs
index ef908f96553..a7edab4a6b0 100644
--- a/Content.Server/Body/Components/InternalsComponent.cs
+++ b/Content.Server/Body/Components/InternalsComponent.cs
@@ -25,4 +25,5 @@ public sealed partial class InternalsComponent : Component
         [DataField]
         public ProtoId<AlertPrototype> InternalsAlert = "Internals";
     }
+
 }
diff --git a/Content.Server/Body/Systems/BloodstreamSystem.cs b/Content.Server/Body/Systems/BloodstreamSystem.cs
index a8a86028d40..9647634a9eb 100644
--- a/Content.Server/Body/Systems/BloodstreamSystem.cs
+++ b/Content.Server/Body/Systems/BloodstreamSystem.cs
@@ -8,10 +8,12 @@
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reaction;
+using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.Drunk;
 using Content.Shared.FixedPoint;
+using Content.Shared.Forensics;
 using Content.Shared.HealthExaminable;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Popups;
@@ -54,6 +56,7 @@ public override void Initialize()
         SubscribeLocalEvent<BloodstreamComponent, ReactionAttemptEvent>(OnReactionAttempt);
         SubscribeLocalEvent<BloodstreamComponent, SolutionRelayEvent<ReactionAttemptEvent>>(OnReactionAttempt);
         SubscribeLocalEvent<BloodstreamComponent, RejuvenateEvent>(OnRejuvenate);
+        SubscribeLocalEvent<BloodstreamComponent, GenerateDnaEvent>(OnDnaGenerated);
     }
 
     private void OnMapInit(Entity<BloodstreamComponent> ent, ref MapInitEvent args)
@@ -183,8 +186,18 @@ private void OnComponentInit(Entity<BloodstreamComponent> entity, ref ComponentI
         bloodSolution.MaxVolume = entity.Comp.BloodMaxVolume;
         tempSolution.MaxVolume = entity.Comp.BleedPuddleThreshold * 4; // give some leeway, for chemstream as well
 
+        // Ensure blood that should have DNA has it; must be run here, in case DnaComponent has not yet been initialized
+
+        if (TryComp<DnaComponent>(entity.Owner, out var donorComp) && donorComp.DNA == String.Empty)
+        {
+            donorComp.DNA = _forensicsSystem.GenerateDNA();
+
+            var ev = new GenerateDnaEvent { Owner = entity.Owner, DNA = donorComp.DNA };
+            RaiseLocalEvent(entity.Owner, ref ev);
+        }
+
         // Fill blood solution with BLOOD
-        bloodSolution.AddReagent(entity.Comp.BloodReagent, entity.Comp.BloodMaxVolume - bloodSolution.Volume);
+        bloodSolution.AddReagent(new ReagentId(entity.Comp.BloodReagent, GetEntityBloodData(entity.Owner)), entity.Comp.BloodMaxVolume - bloodSolution.Volume);
     }
 
     private void OnDamageChanged(Entity<BloodstreamComponent> ent, ref DamageChangedEvent args)
@@ -349,7 +362,7 @@ public bool TryModifyBloodLevel(EntityUid uid, FixedPoint2 amount, BloodstreamCo
         }
 
         if (amount >= 0)
-            return _solutionContainerSystem.TryAddReagent(component.BloodSolution.Value, component.BloodReagent, amount, out _);
+            return _solutionContainerSystem.TryAddReagent(component.BloodSolution.Value, component.BloodReagent, amount, null, GetEntityBloodData(uid));
 
         // Removal is more involved,
         // since we also wanna handle moving it to the temporary solution
@@ -370,10 +383,7 @@ public bool TryModifyBloodLevel(EntityUid uid, FixedPoint2 amount, BloodstreamCo
                 tempSolution.AddSolution(temp, _prototypeManager);
             }
 
-            if (_puddleSystem.TrySpillAt(uid, tempSolution, out var puddleUid, sound: false))
-            {
-                _forensicsSystem.TransferDna(puddleUid, uid, canDnaBeCleaned: false);
-            }
+            _puddleSystem.TrySpillAt(uid, tempSolution, out var puddleUid, sound: false);
 
             tempSolution.RemoveAllSolution();
         }
@@ -436,10 +446,7 @@ public void SpillAllSolutions(EntityUid uid, BloodstreamComponent? component = n
             _solutionContainerSystem.RemoveAllSolution(component.TemporarySolution.Value);
         }
 
-        if (_puddleSystem.TrySpillAt(uid, tempSol, out var puddleUid))
-        {
-            _forensicsSystem.TransferDna(puddleUid, uid, canDnaBeCleaned: false);
-        }
+        _puddleSystem.TrySpillAt(uid, tempSol, out var puddleUid);
     }
 
     /// <summary>
@@ -464,6 +471,40 @@ public void ChangeBloodReagent(EntityUid uid, string reagent, BloodstreamCompone
         component.BloodReagent = reagent;
 
         if (currentVolume > 0)
-            _solutionContainerSystem.TryAddReagent(component.BloodSolution.Value, component.BloodReagent, currentVolume, out _);
+            _solutionContainerSystem.TryAddReagent(component.BloodSolution.Value, component.BloodReagent, currentVolume, null, GetEntityBloodData(uid));
+    }
+
+    private void OnDnaGenerated(Entity<BloodstreamComponent> entity, ref GenerateDnaEvent args)
+    {
+        if (_solutionContainerSystem.ResolveSolution(entity.Owner, entity.Comp.BloodSolutionName, ref entity.Comp.BloodSolution, out var bloodSolution))
+        {
+            foreach (var reagent in bloodSolution.Contents)
+            {
+                List<ReagentData> reagentData = reagent.Reagent.EnsureReagentData();
+                reagentData.RemoveAll(x => x is DnaData);
+                reagentData.AddRange(GetEntityBloodData(entity.Owner));
+            }
+        }
+    }
+
+    /// <summary>
+    /// Get the reagent data for blood that a specific entity should have.
+    /// </summary>
+    public List<ReagentData> GetEntityBloodData(EntityUid uid)
+    {
+        var bloodData = new List<ReagentData>();
+        var dnaData = new DnaData();
+
+        if (TryComp<DnaComponent>(uid, out var donorComp))
+        {
+            dnaData.DNA = donorComp.DNA;
+        } else
+        {
+            dnaData.DNA = Loc.GetString("forensics-dna-unknown");
+        }
+
+        bloodData.Add(dnaData);
+
+        return bloodData;
     }
 }
diff --git a/Content.Server/Body/Systems/BodySystem.cs b/Content.Server/Body/Systems/BodySystem.cs
index e10158cf357..bd5edb0ea50 100644
--- a/Content.Server/Body/Systems/BodySystem.cs
+++ b/Content.Server/Body/Systems/BodySystem.cs
@@ -34,7 +34,7 @@ public override void Initialize()
     private void OnRelayMoveInput(Entity<BodyComponent> ent, ref MoveInputEvent args)
     {
         // If they haven't actually moved then ignore it.
-        if ((args.Component.HeldMoveButtons &
+        if ((args.Entity.Comp.HeldMoveButtons &
              (MoveButtons.Down | MoveButtons.Left | MoveButtons.Up | MoveButtons.Right)) == 0x0)
         {
             return;
diff --git a/Content.Server/Body/Systems/InternalsSystem.cs b/Content.Server/Body/Systems/InternalsSystem.cs
index 922d48f13ed..7e86cb6f07e 100644
--- a/Content.Server/Body/Systems/InternalsSystem.cs
+++ b/Content.Server/Body/Systems/InternalsSystem.cs
@@ -38,6 +38,7 @@ public override void Initialize()
         SubscribeLocalEvent<InternalsComponent, ComponentShutdown>(OnInternalsShutdown);
         SubscribeLocalEvent<InternalsComponent, GetVerbsEvent<InteractionVerb>>(OnGetInteractionVerbs);
         SubscribeLocalEvent<InternalsComponent, InternalsDoAfterEvent>(OnDoAfter);
+        SubscribeLocalEvent<InternalsComponent, ToggleInternalsAlertEvent>(OnToggleInternalsAlert);
 
         SubscribeLocalEvent<InternalsComponent, StartingGearEquippedEvent>(OnStartingGear);
     }
@@ -72,6 +73,9 @@ private void OnGetInteractionVerbs(
         if (!args.CanAccess || !args.CanInteract || args.Hands is null)
             return;
 
+        if (!AreInternalsWorking(ent) && ent.Comp.BreathTools.Count == 0)
+            return;
+
         var user = args.User;
 
         InteractionVerb verb = new()
@@ -100,9 +104,9 @@ public void ToggleInternals(
         // Toggle off if they're on
         if (AreInternalsWorking(internals))
         {
-            if (force || user == uid)
+            if (force)
             {
-                DisconnectTank(internals);
+                DisconnectTank((uid, internals));
                 return;
             }
 
@@ -158,6 +162,14 @@ private void OnDoAfter(Entity<InternalsComponent> ent, ref InternalsDoAfterEvent
         args.Handled = true;
     }
 
+    private void OnToggleInternalsAlert(Entity<InternalsComponent> ent, ref ToggleInternalsAlertEvent args)
+    {
+        if (args.Handled)
+            return;
+        ToggleInternals(ent, ent, false, internals: ent.Comp);
+        args.Handled = true;
+    }
+
     private void OnInternalsStartup(Entity<InternalsComponent> ent, ref ComponentStartup args)
     {
         _alerts.ShowAlert(ent, ent.Comp.InternalsAlert, GetSeverity(ent));
@@ -199,16 +211,13 @@ public void ConnectBreathTool(Entity<InternalsComponent> ent, EntityUid toolEnti
         _alerts.ShowAlert(ent, ent.Comp.InternalsAlert, GetSeverity(ent));
     }
 
-    public void DisconnectTank(InternalsComponent? component)
+    public void DisconnectTank(Entity<InternalsComponent> ent)
     {
-        if (component is null)
-            return;
-
-        if (TryComp(component.GasTankEntity, out GasTankComponent? tank))
-            _gasTank.DisconnectFromInternals((component.GasTankEntity.Value, tank));
+        if (TryComp(ent.Comp.GasTankEntity, out GasTankComponent? tank))
+            _gasTank.DisconnectFromInternals((ent.Comp.GasTankEntity.Value, tank));
 
-        component.GasTankEntity = null;
-        _alerts.ShowAlert(component.Owner, component.InternalsAlert, GetSeverity(component));
+        ent.Comp.GasTankEntity = null;
+        _alerts.ShowAlert(ent.Owner, ent.Comp.InternalsAlert, GetSeverity(ent.Comp));
     }
 
     public bool TryConnectTank(Entity<InternalsComponent> ent, EntityUid tankEntity)
@@ -267,21 +276,21 @@ private short GetSeverity(InternalsComponent component)
 
         if (_inventory.TryGetSlotEntity(user, "back", out var backEntity, user.Comp2, user.Comp3) &&
             TryComp<GasTankComponent>(backEntity, out var backGasTank) &&
-            _gasTank.CanConnectToInternals(backGasTank))
+            _gasTank.CanConnectToInternals((backEntity.Value, backGasTank)))
         {
             return (backEntity.Value, backGasTank);
         }
 
         if (_inventory.TryGetSlotEntity(user, "suitstorage", out var entity, user.Comp2, user.Comp3) &&
             TryComp<GasTankComponent>(entity, out var gasTank) &&
-            _gasTank.CanConnectToInternals(gasTank))
+            _gasTank.CanConnectToInternals((entity.Value, gasTank)))
         {
             return (entity.Value, gasTank);
         }
 
         foreach (var item in _inventory.GetHandOrInventoryEntities((user.Owner, user.Comp1, user.Comp2)))
         {
-            if (TryComp(item, out gasTank) && _gasTank.CanConnectToInternals(gasTank))
+            if (TryComp(item, out gasTank) && _gasTank.CanConnectToInternals((item, gasTank)))
                 return (item, gasTank);
         }
 
diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs
index 5fbd0c48147..45074dc8260 100644
--- a/Content.Server/Body/Systems/RespiratorSystem.cs
+++ b/Content.Server/Body/Systems/RespiratorSystem.cs
@@ -114,7 +114,7 @@ public void Inhale(EntityUid uid, BodyComponent? body = null)
         if (!Resolve(uid, ref body, logMissing: false))
             return;
 
-        var organs = _bodySystem.GetBodyOrganComponents<LungComponent>(uid, body);
+        var organs = _bodySystem.GetBodyOrganEntityComps<LungComponent>((uid, body));
 
         // Inhale gas
         var ev = new InhaleLocationEvent();
@@ -131,11 +131,11 @@ public void Inhale(EntityUid uid, BodyComponent? body = null)
 
         var lungRatio = 1.0f / organs.Count;
         var gas = organs.Count == 1 ? actualGas : actualGas.RemoveRatio(lungRatio);
-        foreach (var (lung, _) in organs)
+        foreach (var (organUid, lung, _) in organs)
         {
             // Merge doesn't remove gas from the giver.
             _atmosSys.Merge(lung.Air, gas);
-            _lungSystem.GasToReagent(lung.Owner, lung);
+            _lungSystem.GasToReagent(organUid, lung);
         }
     }
 
@@ -144,7 +144,7 @@ public void Exhale(EntityUid uid, BodyComponent? body = null)
         if (!Resolve(uid, ref body, logMissing: false))
             return;
 
-        var organs = _bodySystem.GetBodyOrganComponents<LungComponent>(uid, body);
+        var organs = _bodySystem.GetBodyOrganEntityComps<LungComponent>((uid, body));
 
         // exhale gas
 
@@ -161,12 +161,12 @@ public void Exhale(EntityUid uid, BodyComponent? body = null)
         }
 
         var outGas = new GasMixture(ev.Gas.Volume);
-        foreach (var (lung, _) in organs)
+        foreach (var (organUid, lung, _) in organs)
         {
             _atmosSys.Merge(outGas, lung.Air);
             lung.Air.Clear();
 
-            if (_solutionContainerSystem.ResolveSolution(lung.Owner, lung.SolutionName, ref lung.Solution))
+            if (_solutionContainerSystem.ResolveSolution(organUid, lung.SolutionName, ref lung.Solution))
                 _solutionContainerSystem.RemoveAllSolution(lung.Solution.Value);
         }
 
@@ -201,7 +201,7 @@ public bool CanMetabolizeGas(Entity<RespiratorComponent?> ent, GasMixture gas)
         if (!Resolve(ent, ref ent.Comp))
             return false;
 
-        var organs = _bodySystem.GetBodyOrganComponents<LungComponent>(ent);
+        var organs = _bodySystem.GetBodyOrganEntityComps<LungComponent>((ent, null));
         if (organs.Count == 0)
             return false;
 
@@ -213,7 +213,7 @@ public bool CanMetabolizeGas(Entity<RespiratorComponent?> ent, GasMixture gas)
         float saturation = 0;
         foreach (var organ in organs)
         {
-            saturation += GetSaturation(solution, organ.Comp.Owner, out var toxic);
+            saturation += GetSaturation(solution, organ.Owner, out var toxic);
             if (toxic)
                 return false;
         }
@@ -287,10 +287,10 @@ private void TakeSuffocationDamage(Entity<RespiratorComponent> ent)
         if (ent.Comp.SuffocationCycles >= ent.Comp.SuffocationCycleThreshold)
         {
             // TODO: This is not going work with multiple different lungs, if that ever becomes a possibility
-            var organs = _bodySystem.GetBodyOrganComponents<LungComponent>(ent);
-            foreach (var (comp, _) in organs)
+            var organs = _bodySystem.GetBodyOrganEntityComps<LungComponent>((ent, null));
+            foreach (var entity in organs)
             {
-                _alertsSystem.ShowAlert(ent, comp.Alert);
+                _alertsSystem.ShowAlert(entity.Owner, entity.Comp1.Alert);
             }
         }
 
@@ -303,10 +303,10 @@ private void StopSuffocation(Entity<RespiratorComponent> ent)
             _adminLogger.Add(LogType.Asphyxiation, $"{ToPrettyString(ent):entity} stopped suffocating");
 
         // TODO: This is not going work with multiple different lungs, if that ever becomes a possibility
-        var organs = _bodySystem.GetBodyOrganComponents<LungComponent>(ent);
-        foreach (var (comp, _) in organs)
+        var organs = _bodySystem.GetBodyOrganEntityComps<LungComponent>((ent, null));
+        foreach (var entity in organs)
         {
-            _alertsSystem.ClearAlert(ent, comp.Alert);
+            _alertsSystem.ClearAlert(entity.Owner, entity.Comp1.Alert);
         }
 
         _damageableSys.TryChangeDamage(ent, ent.Comp.DamageRecovery);
diff --git a/Content.Server/Botany/Components/SeedComponent.cs b/Content.Server/Botany/Components/SeedComponent.cs
index f475ec3cfc4..ffa1b7ef4e9 100644
--- a/Content.Server/Botany/Components/SeedComponent.cs
+++ b/Content.Server/Botany/Components/SeedComponent.cs
@@ -24,7 +24,7 @@ public sealed partial class SeedComponent : SharedSeedComponent
         /// <summary>
         ///     Name of a base seed prototype that is used if <see cref="Seed"/> is null.
         /// </summary>
-        [DataField("seedId", customTypeSerializer:typeof(PrototypeIdSerializer<SeedPrototype>))]
+        [DataField("seedId", customTypeSerializer: typeof(PrototypeIdSerializer<SeedPrototype>))]
         public string? SeedId;
     }
 }
diff --git a/Content.Server/Botany/Systems/BotanySwabSystem.cs b/Content.Server/Botany/Systems/BotanySwabSystem.cs
index f6190bae4ea..e8c7af92c27 100644
--- a/Content.Server/Botany/Systems/BotanySwabSystem.cs
+++ b/Content.Server/Botany/Systems/BotanySwabSystem.cs
@@ -48,7 +48,7 @@ private void OnAfterInteract(EntityUid uid, BotanySwabComponent swab, AfterInter
         {
             Broadcast = true,
             BreakOnMove = true,
-            NeedHand = true
+            NeedHand = true,
         });
     }
 
diff --git a/Content.Server/Botany/Systems/MutationSystem.cs b/Content.Server/Botany/Systems/MutationSystem.cs
index c7ce5d47efa..474859823a3 100644
--- a/Content.Server/Botany/Systems/MutationSystem.cs
+++ b/Content.Server/Botany/Systems/MutationSystem.cs
@@ -2,10 +2,8 @@
 using Robust.Shared.Random;
 using Content.Shared.Random;
 using Content.Shared.Random.Helpers;
-using Content.Shared.Chemistry.Reagent;
 using System.Linq;
 using Content.Shared.Atmos;
-using FastAccessors;
 
 namespace Content.Server.Botany;
 
@@ -42,6 +40,7 @@ public void MutateSeed(ref SeedData seed, float severity)
         // Add up everything in the bits column and put the number here.
         const int totalbits = 275;
 
+        #pragma warning disable IDE0055 // disable formatting warnings because this looks more readable
         // Tolerances (55)
         MutateFloat(ref seed.NutrientConsumption  , 0.05f, 1.2f, 5, totalbits, severity);
         MutateFloat(ref seed.WaterConsumption     , 3f   , 9f  , 5, totalbits, severity);
@@ -75,6 +74,7 @@ public void MutateSeed(ref SeedData seed, float severity)
         MutateBool(ref seed.TurnIntoKudzu , true , 10, totalbits, severity);
         MutateBool(ref seed.CanScream     , true , 10, totalbits, severity);
         seed.BioluminescentColor = RandomColor(seed.BioluminescentColor, 10, totalbits, severity);
+        #pragma warning restore IDE0055
 
         // ConstantUpgade (10)
         MutateHarvestType(ref seed.HarvestRepeat, 10, totalbits, severity);
@@ -261,7 +261,7 @@ private void MutateChemicals(ref Dictionary<string, SeedChemQuantity> chemicals,
         {
             var pick = _randomChems.Pick(_robustRandom);
             string chemicalId = pick.reagent;
-            int amount = _robustRandom.Next(1, ((int)pick.quantity));
+            int amount = _robustRandom.Next(1, (int)pick.quantity);
             SeedChemQuantity seedChemQuantity = new SeedChemQuantity();
             if (chemicals.ContainsKey(chemicalId))
             {
@@ -274,7 +274,7 @@ private void MutateChemicals(ref Dictionary<string, SeedChemQuantity> chemicals,
                 seedChemQuantity.Max = 1 + amount;
                 seedChemQuantity.Inherent = false;
             }
-            int potencyDivisor = (int) Math.Ceiling(100.0f / seedChemQuantity.Max);
+            int potencyDivisor = (int)Math.Ceiling(100.0f / seedChemQuantity.Max);
             seedChemQuantity.PotencyDivisor = potencyDivisor;
             chemicals[chemicalId] = seedChemQuantity;
         }
diff --git a/Content.Server/Botany/Systems/SeedExtractorSystem.cs b/Content.Server/Botany/Systems/SeedExtractorSystem.cs
index f1ae6c9f11a..9a5e70762e7 100644
--- a/Content.Server/Botany/Systems/SeedExtractorSystem.cs
+++ b/Content.Server/Botany/Systems/SeedExtractorSystem.cs
@@ -29,12 +29,12 @@ private void OnInteractUsing(EntityUid uid, SeedExtractorComponent seedExtractor
             return;
         if (!_botanySystem.TryGetSeed(produce, out var seed) || seed.Seedless)
         {
-            _popupSystem.PopupCursor(Loc.GetString("seed-extractor-component-no-seeds",("name", args.Used)),
+            _popupSystem.PopupCursor(Loc.GetString("seed-extractor-component-no-seeds", ("name", args.Used)),
                 args.User, PopupType.MediumCaution);
             return;
         }
 
-        _popupSystem.PopupCursor(Loc.GetString("seed-extractor-component-interact-message",("name", args.Used)),
+        _popupSystem.PopupCursor(Loc.GetString("seed-extractor-component-interact-message", ("name", args.Used)),
             args.User, PopupType.Medium);
 
         QueueDel(args.Used);
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
index 4cbf2e63be8..e118f493639 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
@@ -3,13 +3,13 @@
 using Content.Server.Cargo.Components;
 using Content.Server.Labels;
 using Content.Server.NameIdentifier;
-using Content.Server.Paper;
 using Content.Shared.Access.Components;
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.Components;
 using Content.Shared.Cargo.Prototypes;
 using Content.Shared.Database;
 using Content.Shared.NameIdentifier;
+using Content.Shared.Paper;
 using Content.Shared.Stacks;
 using Content.Shared.Whitelist;
 using JetBrains.Annotations;
@@ -125,7 +125,7 @@ public void SetupBountyLabel(EntityUid uid, EntityUid stationId, CargoBountyData
             msg.PushNewline();
         }
         msg.AddMarkup(Loc.GetString("bounty-console-manifest-reward", ("reward", prototype.Reward)));
-        _paperSystem.SetContent(uid, msg.ToMarkup(), paper);
+        _paperSystem.SetContent((uid, paper), msg.ToMarkup());
     }
 
     /// <summary>
@@ -138,7 +138,7 @@ private void OnGetBountyPrice(EntityUid uid, CargoBountyLabelComponent component
             return;
 
         // make sure this label was actually applied to a crate.
-        if (!_container.TryGetContainingContainer(uid, out var container) || container.ID != LabelSystem.ContainerName)
+        if (!_container.TryGetContainingContainer((uid, null, null), out var container) || container.ID != LabelSystem.ContainerName)
             return;
 
         if (component.AssociatedStationId is not { } station || !TryComp<StationCargoBountyDatabaseComponent>(station, out var database))
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
index 06738a2deb0..2c681fc40c9 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
@@ -1,7 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using 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;
@@ -10,10 +9,9 @@
 using Content.Shared.Cargo.Prototypes;
 using Content.Shared.Database;
 using Content.Shared.Interaction;
+using Content.Shared.Paper;
 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
@@ -40,6 +38,7 @@ private void InitializeConsole()
             SubscribeLocalEvent<CargoOrderConsoleComponent, BoundUIOpenedEvent>(OnOrderUIOpened);
             SubscribeLocalEvent<CargoOrderConsoleComponent, ComponentInit>(OnInit);
             SubscribeLocalEvent<CargoOrderConsoleComponent, InteractUsingEvent>(OnInteractUsing);
+            SubscribeLocalEvent<CargoOrderConsoleComponent, BankBalanceUpdatedEvent>(OnOrderBalanceUpdated);
             Reset();
         }
 
@@ -176,6 +175,10 @@ private void OnApproveOrderMessage(EntityUid uid, CargoOrderConsoleComponent com
             RaiseLocalEvent(ref ev);
             ev.FulfillmentEntity ??= station.Value;
 
+            _idCardSystem.TryFindIdCard(player, out var idCard);
+            // ReSharper disable once ConditionalAccessQualifierIsNonNullableAccordingToAPIContract
+            order.SetApproverData(idCard.Comp?.FullName, idCard.Comp?.JobTitle);
+
             if (!ev.Handled)
             {
                 ev.FulfillmentEntity = TryFulfillOrder((station.Value, stationData), order, orderDatabase);
@@ -188,18 +191,13 @@ private void OnApproveOrderMessage(EntityUid uid, CargoOrderConsoleComponent com
                 }
             }
 
-            _idCardSystem.TryFindIdCard(player, out var idCard);
-            // ReSharper disable once ConditionalAccessQualifierIsNonNullableAccordingToAPIContract
-            order.SetApproverData(idCard.Comp?.FullName, idCard.Comp?.JobTitle);
+            order.Approved = true;
             _audio.PlayPvs(component.ConfirmSound, uid);
 
-            var approverName = idCard.Comp?.FullName ?? Loc.GetString("access-reader-unknown-id");
-            var approverJob = idCard.Comp?.JobTitle ?? Loc.GetString("access-reader-unknown-id");
             var message = Loc.GetString("cargo-console-unlock-approved-order-broadcast",
                 ("productName", Loc.GetString(order.ProductName)),
                 ("orderAmount", order.OrderQuantity),
-                ("approverName", approverName),
-                ("approverJob", approverJob),
+                ("approver", order.Approver ?? string.Empty),
                 ("cost", cost));
             _radio.SendRadioMessage(uid, message, component.AnnouncementChannel, uid, escapeMarkup: false);
             ConsolePopup(args.Actor, Loc.GetString("cargo-console-trade-station", ("destination", MetaData(ev.FulfillmentEntity.Value).EntityName)));
@@ -317,6 +315,15 @@ private void OnOrderUIOpened(EntityUid uid, CargoOrderConsoleComponent component
 
         #endregion
 
+
+        private void OnOrderBalanceUpdated(Entity<CargoOrderConsoleComponent> ent, ref BankBalanceUpdatedEvent args)
+        {
+            if (!_uiSystem.IsUiOpen(ent.Owner, CargoConsoleUiKey.Orders))
+                return;
+
+            UpdateOrderState(ent, args.Station);
+        }
+
         private void UpdateOrderState(EntityUid consoleUid, EntityUid? station)
         {
             if (station == null ||
@@ -413,6 +420,7 @@ Entity<StationDataComponent> stationData
 
             // Approve it now
             order.SetApproverData(dest, sender);
+            order.Approved = true;
 
             // Log order addition
             _adminLogger.Add(LogType.Action, LogImpact.Low,
@@ -504,15 +512,14 @@ private bool FulfillOrder(CargoOrderData order, EntityCoordinates spawn, string?
                 var val = Loc.GetString("cargo-console-paper-print-name", ("orderNumber", order.OrderId));
                 _metaSystem.SetEntityName(printed, val);
 
-                _paperSystem.SetContent(printed, Loc.GetString(
+                _paperSystem.SetContent((printed, paper), Loc.GetString(
                         "cargo-console-paper-print-text",
                         ("orderNumber", order.OrderId),
                         ("itemName", MetaData(item).EntityName),
                         ("orderQuantity", order.OrderQuantity),
                         ("requester", order.Requester),
                         ("reason", order.Reason),
-                        ("approver", order.Approver ?? string.Empty)),
-                    paper);
+                        ("approver", order.Approver ?? string.Empty)));
 
                 // attempt to attach the label to the item
                 if (TryComp<PaperLabelComponent>(item, out var label))
diff --git a/Content.Server/Cargo/Systems/CargoSystem.cs b/Content.Server/Cargo/Systems/CargoSystem.cs
index 62cd8f49f6d..60d33da44db 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.cs
@@ -2,7 +2,6 @@
 using Content.Server.Cargo.Components;
 using Content.Server.DeviceLinking.Systems;
 using Content.Server.GameTicking;
-using Content.Server.Paper;
 using Content.Server.Popups;
 using Content.Server.Shuttles.Systems;
 using Content.Server.Stack;
@@ -14,6 +13,7 @@
 using Content.Shared.Cargo.Components;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Mobs.Components;
+using Content.Shared.Paper;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
@@ -89,18 +89,18 @@ public override void Update(float frameTime)
     public void UpdateBankAccount(EntityUid uid, StationBankAccountComponent component, int balanceAdded)
     {
         component.Balance += balanceAdded;
-        var query = EntityQueryEnumerator<CargoOrderConsoleComponent>();
+        var query = EntityQueryEnumerator<BankClientComponent, TransformComponent>();
 
-        while (query.MoveNext(out var oUid, out var _))
+        var ev = new BankBalanceUpdatedEvent(uid, component.Balance);
+        while (query.MoveNext(out var client, out var comp, out var xform))
         {
-            if (!_uiSystem.IsUiOpen(oUid, CargoConsoleUiKey.Orders))
-                continue;
-
-            var station = _station.GetOwningStation(oUid);
+            var station = _station.GetOwningStation(client, xform);
             if (station != uid)
                 continue;
 
-            UpdateOrderState(oUid, station);
+            comp.Balance = component.Balance;
+            Dirty(client, comp);
+            RaiseLocalEvent(client, ref ev);
         }
     }
 }
diff --git a/Content.Server/Cargo/Systems/PricingSystem.cs b/Content.Server/Cargo/Systems/PricingSystem.cs
index f878eeee75c..d936451d524 100644
--- a/Content.Server/Cargo/Systems/PricingSystem.cs
+++ b/Content.Server/Cargo/Systems/PricingSystem.cs
@@ -16,6 +16,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 using System.Linq;
+using Content.Shared.Research.Prototypes;
 
 namespace Content.Server.Cargo.Systems;
 
@@ -158,6 +159,26 @@ private double GetMaterialPrice(PhysicalCompositionComponent component)
         return price;
     }
 
+    public double GetLatheRecipePrice(LatheRecipePrototype recipe)
+    {
+        var price = 0.0;
+
+        if (recipe.Result is { } result)
+        {
+            price += GetEstimatedPrice(_prototypeManager.Index(result));
+        }
+
+        if (recipe.ResultReagents is { } resultReagents)
+        {
+            foreach (var (reagent, amount) in resultReagents)
+            {
+                price += (_prototypeManager.Index(reagent).PricePerUnit * amount).Double();
+            }
+        }
+
+        return price;
+    }
+
     /// <summary>
     /// Get a rough price for an entityprototype. Does not consider contained entities.
     /// </summary>
diff --git a/Content.Server/CharacterInfo/CharacterInfoSystem.cs b/Content.Server/CharacterInfo/CharacterInfoSystem.cs
index df8718a022e..3d83a667057 100644
--- a/Content.Server/CharacterInfo/CharacterInfoSystem.cs
+++ b/Content.Server/CharacterInfo/CharacterInfoSystem.cs
@@ -31,19 +31,19 @@ private void OnRequestCharacterInfoEvent(RequestCharacterInfoEvent msg, EntitySe
         var entity = args.SenderSession.AttachedEntity.Value;
 
         var objectives = new Dictionary<string, List<ObjectiveInfo>>();
-        var jobTitle = "No Profession";
+        var jobTitle = Loc.GetString("character-info-no-profession");
         string? briefing = null;
         if (_minds.TryGetMind(entity, out var mindId, out var mind))
         {
             // Get objectives
-            foreach (var objective in mind.AllObjectives)
+            foreach (var objective in mind.Objectives)
             {
                 var info = _objectives.GetInfo(objective, mindId, mind);
                 if (info == null)
                     continue;
 
                 // group objectives by their issuer
-                var issuer = Comp<ObjectiveComponent>(objective).Issuer;
+                var issuer = Comp<ObjectiveComponent>(objective).LocIssuer;
                 if (!objectives.ContainsKey(issuer))
                     objectives[issuer] = new List<ObjectiveInfo>();
                 objectives[issuer].Add(info.Value);
diff --git a/Content.Server/Charges/Components/AutoRechargeComponent.cs b/Content.Server/Charges/Components/AutoRechargeComponent.cs
index 9dcf555ea93..165b181dcbc 100644
--- a/Content.Server/Charges/Components/AutoRechargeComponent.cs
+++ b/Content.Server/Charges/Components/AutoRechargeComponent.cs
@@ -7,6 +7,7 @@ namespace Content.Server.Charges.Components;
 /// Something with limited charges that can be recharged automatically.
 /// Requires LimitedChargesComponent to function.
 /// </summary>
+// TODO: no reason this cant be predicted and server system deleted
 [RegisterComponent, AutoGenerateComponentPause]
 [Access(typeof(ChargesSystem))]
 public sealed partial class AutoRechargeComponent : Component
diff --git a/Content.Server/Charges/Systems/ChargesSystem.cs b/Content.Server/Charges/Systems/ChargesSystem.cs
index 03e192e680e..974928ee4bb 100644
--- a/Content.Server/Charges/Systems/ChargesSystem.cs
+++ b/Content.Server/Charges/Systems/ChargesSystem.cs
@@ -37,15 +37,17 @@ protected override void OnExamine(EntityUid uid, LimitedChargesComponent comp, E
         args.PushMarkup(Loc.GetString("limited-charges-recharging", ("seconds", timeRemaining)));
     }
 
-    public override void UseCharge(EntityUid uid, LimitedChargesComponent? comp = null)
+    public override void AddCharges(EntityUid uid, int change, LimitedChargesComponent? comp = null)
     {
-        if (!Resolve(uid, ref comp, false))
+        if (!Query.Resolve(uid, ref comp, false))
             return;
 
         var startRecharge = comp.Charges == comp.MaxCharges;
-        base.UseCharge(uid, comp);
-        // start the recharge time after first use at full charge
-        if (startRecharge && TryComp<AutoRechargeComponent>(uid, out var recharge))
+        base.AddCharges(uid, change, comp);
+
+        // if a charge was just used from full, start the recharge timer
+        // TODO: probably make this an event instead of having le server system that just does this
+        if (change < 0 && startRecharge && TryComp<AutoRechargeComponent>(uid, out var recharge))
             recharge.NextChargeTime = _timing.CurTime + recharge.RechargeDuration;
     }
 }
diff --git a/Content.Server/Chat/SpeakOnUseComponent.cs b/Content.Server/Chat/SpeakOnUseComponent.cs
new file mode 100644
index 00000000000..f8953aebefe
--- /dev/null
+++ b/Content.Server/Chat/SpeakOnUseComponent.cs
@@ -0,0 +1,18 @@
+using Content.Shared.Dataset;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Chat;
+
+/// <summary>
+/// Entity will say the things when activated
+/// </summary>
+[RegisterComponent]
+public sealed partial class SpeakOnUseComponent : Component
+{
+    /// <summary>
+    /// The identifier for the dataset prototype containing messages to be spoken by this entity.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<LocalizedDatasetPrototype> Pack { get; private set; }
+
+}
diff --git a/Content.Server/Chat/Systems/AnnounceOnSpawnSystem.cs b/Content.Server/Chat/Systems/AnnounceOnSpawnSystem.cs
index 0f0365e56ba..cc46545237b 100644
--- a/Content.Server/Chat/Systems/AnnounceOnSpawnSystem.cs
+++ b/Content.Server/Chat/Systems/AnnounceOnSpawnSystem.cs
@@ -16,7 +16,7 @@ public override void Initialize()
     private void OnInit(EntityUid uid, AnnounceOnSpawnComponent comp, MapInitEvent args)
     {
         var message = Loc.GetString(comp.Message);
-        var sender = comp.Sender != null ? Loc.GetString(comp.Sender) : "Central Command";
+        var sender = comp.Sender != null ? Loc.GetString(comp.Sender) : Loc.GetString("chat-manager-sender-announcement");
         _chat.DispatchGlobalAnnouncement(message, sender, playSound: true, comp.Sound, comp.Color);
     }
 }
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index 66fa02d1170..c6a86655a08 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -63,7 +63,6 @@ public sealed partial class ChatSystem : SharedChatSystem
     [Dependency] private readonly StationSystem _stationSystem = default!;
     [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
     [Dependency] private readonly ReplacementAccentSystem _wordreplacement = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
     [Dependency] private readonly ExamineSystemShared _examineSystem = default!;
@@ -329,12 +328,14 @@ public void TrySendInGameOOCMessage(
     /// <param name="colorOverride">Optional color for the announcement message</param>
     public void DispatchGlobalAnnouncement(
         string message,
-        string sender = "Central Command",
+        string? sender = null,
         bool playSound = true,
         SoundSpecifier? announcementSound = null,
         Color? colorOverride = null
         )
     {
+        sender ??= Loc.GetString("chat-manager-sender-announcement");
+
         var wrappedMessage = Loc.GetString("chat-manager-sender-announcement-wrap-message", ("sender", sender), ("message", FormattedMessage.EscapeText(message)));
         _chatManager.ChatMessageToAll(ChatChannel.Radio, message, wrappedMessage, default, false, true, colorOverride);
         if (playSound)
@@ -355,11 +356,13 @@ public void DispatchGlobalAnnouncement(
     public void DispatchStationAnnouncement(
         EntityUid source,
         string message,
-        string sender = "Central Command",
+        string? sender = null,
         bool playDefaultSound = true,
         SoundSpecifier? announcementSound = null,
         Color? colorOverride = null)
     {
+        sender ??= Loc.GetString("chat-manager-sender-announcement");
+
         var wrappedMessage = Loc.GetString("chat-manager-sender-announcement-wrap-message", ("sender", sender), ("message", FormattedMessage.EscapeText(message)));
         var station = _stationSystem.GetOwningStation(source);
 
@@ -838,7 +841,7 @@ private Dictionary<ICommonSession, ICChatRecipientData> GetRecipients(EntityUid
                 recipients.Add(player, new ICChatRecipientData(-1, true));
         }
 
-        RaiseLocalEvent(new ExpandICChatRecipientstEvent(source, voiceGetRange, recipients));
+        RaiseLocalEvent(new ExpandICChatRecipientsEvent(source, voiceGetRange, recipients));
         return recipients;
     }
 
@@ -883,7 +886,7 @@ public string BuildGibberishString(IReadOnlyList<char> charOptions, int length)
 ///     This event is raised before chat messages are sent out to clients. This enables some systems to send the chat
 ///     messages to otherwise out-of view entities (e.g. for multiple viewports from cameras).
 /// </summary>
-public record ExpandICChatRecipientstEvent(EntityUid Source, float VoiceRange, Dictionary<ICommonSession, ChatSystem.ICChatRecipientData> Recipients)
+public record ExpandICChatRecipientsEvent(EntityUid Source, float VoiceRange, Dictionary<ICommonSession, ChatSystem.ICChatRecipientData> Recipients)
 {
 }
 
diff --git a/Content.Server/Chat/Systems/SpeakOnUseSystem.cs b/Content.Server/Chat/Systems/SpeakOnUseSystem.cs
new file mode 100644
index 00000000000..addec79e410
--- /dev/null
+++ b/Content.Server/Chat/Systems/SpeakOnUseSystem.cs
@@ -0,0 +1,42 @@
+using Content.Server.Chat;
+using Content.Shared.Dataset;
+using Content.Shared.Interaction.Events;
+using Content.Shared.Timing;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server.Chat.Systems;
+
+/// <summary>
+/// Handles the speech on activating an entity
+/// </summary>
+public sealed partial class SpeakOnUIClosedSystem : EntitySystem
+{
+    [Dependency] private readonly UseDelaySystem _useDelay = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly ChatSystem _chat = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<SpeakOnUseComponent, UseInHandEvent>(OnUseInHand);
+    }
+
+    public void OnUseInHand(EntityUid uid, SpeakOnUseComponent? component, UseInHandEvent args)
+    {
+        if (!Resolve(uid, ref component))
+            return;
+
+        // Yes it won't work without UseDelayComponent, but we don't want any kind of spam
+        if (!TryComp(uid, out UseDelayComponent? useDelay) || _useDelay.IsDelayed((uid, useDelay)))
+            return;
+
+        if (!_prototypeManager.TryIndex(component.Pack, out var messagePack))
+            return;
+
+        var message = Loc.GetString(_random.Pick(messagePack.Values));
+        _chat.TrySendInGameICMessage(uid, message, InGameICChatType.Speak, true);
+        _useDelay.TryResetDelay((uid, useDelay));
+    }
+}
diff --git a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
index aac171371fb..d94faa81232 100644
--- a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
@@ -118,21 +118,25 @@ private void InjectDoAfter(Entity<InjectorComponent> injector, EntityUid target,
         if (!SolutionContainers.TryGetSolution(injector.Owner, injector.Comp.SolutionName, out _, out var solution))
             return;
 
-        var actualDelay = MathHelper.Max(injector.Comp.Delay, TimeSpan.FromSeconds(1));
-        float amountToInject;
+        var actualDelay = injector.Comp.Delay;
+        FixedPoint2 amountToInject;
         if (injector.Comp.ToggleState == InjectorToggleMode.Draw)
         {
             // additional delay is based on actual volume left to draw in syringe when smaller than transfer amount
-            amountToInject = Math.Min(injector.Comp.TransferAmount.Float(), (solution.MaxVolume - solution.Volume).Float());
+            amountToInject = FixedPoint2.Min(injector.Comp.TransferAmount, (solution.MaxVolume - solution.Volume));
         }
         else
         {
             // additional delay is based on actual volume left to inject in syringe when smaller than transfer amount
-            amountToInject = Math.Min(injector.Comp.TransferAmount.Float(), solution.Volume.Float());
+            amountToInject = FixedPoint2.Min(injector.Comp.TransferAmount, solution.Volume);
         }
 
         // Injections take 0.5 seconds longer per 5u of possible space/content
-        actualDelay += TimeSpan.FromSeconds(amountToInject / 10);
+        // First 5u(MinimumTransferAmount) doesn't incur delay
+        actualDelay += injector.Comp.DelayPerVolume * FixedPoint2.Max(0, amountToInject - injector.Comp.MinimumTransferAmount).Double();
+
+        // Ensure that minimum delay before incapacitation checks is 1 seconds
+        actualDelay = MathHelper.Max(actualDelay, TimeSpan.FromSeconds(1));
 
 
         var isTarget = user != target;
@@ -199,9 +203,9 @@ private void InjectDoAfter(Entity<InjectorComponent> injector, EntityUid target,
             BreakOnMove = true,
             BreakOnWeightlessMove = false,
             BreakOnDamage = true,
-            NeedHand = true,
-            BreakOnHandChange = true,
-            MovementThreshold = 0.1f,
+            NeedHand = injector.Comp.NeedHand,
+            BreakOnHandChange = injector.Comp.BreakOnHandChange,
+            MovementThreshold = injector.Comp.MovementThreshold,
         });
     }
 
diff --git a/Content.Server/Chemistry/EntitySystems/ReactionMixerSystem.cs b/Content.Server/Chemistry/EntitySystems/ReactionMixerSystem.cs
index d5f7655f884..a81f38a21d4 100644
--- a/Content.Server/Chemistry/EntitySystems/ReactionMixerSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/ReactionMixerSystem.cs
@@ -1,6 +1,9 @@
+using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reaction;
+using Content.Shared.DoAfter;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
+using Content.Shared.Nutrition.EntitySystems;
 using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.Popups;
 
@@ -10,34 +13,68 @@ public sealed partial class ReactionMixerSystem : EntitySystem
 {
     [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly SolutionContainerSystem _solutionContainers = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<ReactionMixerComponent, AfterInteractEvent>(OnAfterInteract);
+        SubscribeLocalEvent<ReactionMixerComponent, ShakeEvent>(OnShake);
+        SubscribeLocalEvent<ReactionMixerComponent, ReactionMixDoAfterEvent>(OnDoAfter);
     }
 
     private void OnAfterInteract(Entity<ReactionMixerComponent> entity, ref AfterInteractEvent args)
     {
-        if (!args.Target.HasValue || !args.CanReach)
+        if (!args.Target.HasValue || !args.CanReach || !entity.Comp.MixOnInteract)
             return;
 
-        var mixAttemptEvent = new MixingAttemptEvent(entity);
-        RaiseLocalEvent(entity, ref mixAttemptEvent);
-        if (mixAttemptEvent.Cancelled)
-        {
+        if (!MixAttempt(entity, args.Target.Value, out var solution))
             return;
-        }
 
-        if (!_solutionContainers.TryGetMixableSolution(args.Target.Value, out var solution, out _))
+        var doAfterArgs = new DoAfterArgs(EntityManager, args.User, entity.Comp.TimeToMix, new ReactionMixDoAfterEvent(), entity, args.Target.Value, entity);
+
+        _doAfterSystem.TryStartDoAfter(doAfterArgs);
+    }
+
+    private void OnDoAfter(Entity<ReactionMixerComponent> entity, ref ReactionMixDoAfterEvent args)
+    {
+        //Do again to get the solution again
+        if (!MixAttempt(entity, args.Target!.Value, out var solution))
             return;
 
-        _popup.PopupEntity(Loc.GetString(entity.Comp.MixMessage, ("mixed", Identity.Entity(args.Target.Value, EntityManager)), ("mixer", Identity.Entity(entity.Owner, EntityManager))), args.User, args.User);
+        _popup.PopupEntity(Loc.GetString(entity.Comp.MixMessage, ("mixed", Identity.Entity(args.Target!.Value, EntityManager)), ("mixer", Identity.Entity(entity.Owner, EntityManager))), args.User, args.User);
+
+        _solutionContainers.UpdateChemicals(solution!.Value, true, entity.Comp);
+
+        var afterMixingEvent = new AfterMixingEvent(entity, args.Target!.Value);
+        RaiseLocalEvent(entity, afterMixingEvent);
+    }
+
+    private void OnShake(Entity<ReactionMixerComponent> entity, ref ShakeEvent args)
+    {
+        if (!MixAttempt(entity, entity, out var solution))
+            return;
 
-        _solutionContainers.UpdateChemicals(solution.Value, true, entity.Comp);
+        _solutionContainers.UpdateChemicals(solution!.Value, true, entity.Comp);
 
-        var afterMixingEvent = new AfterMixingEvent(entity, args.Target.Value);
+        var afterMixingEvent = new AfterMixingEvent(entity, entity);
         RaiseLocalEvent(entity, afterMixingEvent);
     }
+
+    private bool MixAttempt(EntityUid ent, EntityUid target, out Entity<SolutionComponent>? solution)
+    {
+        solution = null;
+        var mixAttemptEvent = new MixingAttemptEvent(ent);
+        RaiseLocalEvent(ent, ref mixAttemptEvent);
+        if (mixAttemptEvent.Cancelled)
+        {
+            return false;
+        }
+
+        if (!_solutionContainers.TryGetMixableSolution(target, out solution, out _))
+            return false;
+
+        return true;
+    }
 }
diff --git a/Content.Server/Chemistry/EntitySystems/VaporSystem.cs b/Content.Server/Chemistry/EntitySystems/VaporSystem.cs
index 8e12670ca62..5093b59409f 100644
--- a/Content.Server/Chemistry/EntitySystems/VaporSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/VaporSystem.cs
@@ -28,6 +28,7 @@ internal sealed class VaporSystem : EntitySystem
         [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
         [Dependency] private readonly ThrowingSystem _throwing = default!;
         [Dependency] private readonly ReactiveSystem _reactive = default!;
+        [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
 
         private const float ReactTime = 0.125f;
 
@@ -69,7 +70,7 @@ public void Start(Entity<VaporComponent> vapor, TransformComponent vaporXform, V
 
                 _throwing.TryThrow(vapor, dir, speed, user: user);
 
-                var distance = (target.Position - vaporXform.WorldPosition).Length();
+                var distance = (target.Position - _transformSystem.GetWorldPosition(vaporXform)).Length();
                 var time = (distance / physics.LinearVelocity.Length());
                 despawn.Lifetime = MathF.Min(aliveTime, time);
             }
@@ -122,7 +123,7 @@ private void Update(float frameTime, Entity<VaporComponent> ent, Entity<Solution
                     var reagent = _protoManager.Index<ReagentPrototype>(reagentQuantity.Reagent.Prototype);
 
                     var reaction =
-                        reagent.ReactionTile(tile, (reagentQuantity.Quantity / vapor.TransferAmount) * 0.25f, EntityManager);
+                        reagent.ReactionTile(tile, (reagentQuantity.Quantity / vapor.TransferAmount) * 0.25f, EntityManager, reagentQuantity.Reagent.Data);
 
                     if (reaction > reagentQuantity.Quantity)
                     {
diff --git a/Content.Server/Chemistry/TileReactions/CleanDecalsReaction.cs b/Content.Server/Chemistry/TileReactions/CleanDecalsReaction.cs
index 6958dabb81b..5047a260521 100644
--- a/Content.Server/Chemistry/TileReactions/CleanDecalsReaction.cs
+++ b/Content.Server/Chemistry/TileReactions/CleanDecalsReaction.cs
@@ -21,10 +21,12 @@ public sealed partial class CleanDecalsReaction : ITileReaction
     [DataField]
     public FixedPoint2 CleanCost { get; private set; } = FixedPoint2.New(0.25f);
 
+
     public FixedPoint2 TileReact(TileRef tile,
         ReagentPrototype reagent,
         FixedPoint2 reactVolume,
-        IEntityManager entityManager)
+        IEntityManager entityManager,
+        List<ReagentData>? data)
     {
         if (reactVolume <= CleanCost ||
             !entityManager.TryGetComponent<MapGridComponent>(tile.GridUid, out var grid) ||
diff --git a/Content.Server/Chemistry/TileReactions/CleanTileReaction.cs b/Content.Server/Chemistry/TileReactions/CleanTileReaction.cs
index 08f77de72dd..ad02cb8ff90 100644
--- a/Content.Server/Chemistry/TileReactions/CleanTileReaction.cs
+++ b/Content.Server/Chemistry/TileReactions/CleanTileReaction.cs
@@ -34,7 +34,8 @@ public sealed partial class CleanTileReaction : ITileReaction
     FixedPoint2 ITileReaction.TileReact(TileRef tile,
         ReagentPrototype reagent,
         FixedPoint2 reactVolume,
-        IEntityManager entityManager)
+        IEntityManager entityManager
+        , List<ReagentData>? data)
     {
         var entities = entityManager.System<EntityLookupSystem>().GetLocalEntitiesIntersecting(tile, 0f).ToArray();
         var puddleQuery = entityManager.GetEntityQuery<PuddleComponent>();
diff --git a/Content.Server/Chemistry/TileReactions/CreateEntityTileReaction.cs b/Content.Server/Chemistry/TileReactions/CreateEntityTileReaction.cs
index 6b106b1fc0a..0249b6255a2 100644
--- a/Content.Server/Chemistry/TileReactions/CreateEntityTileReaction.cs
+++ b/Content.Server/Chemistry/TileReactions/CreateEntityTileReaction.cs
@@ -38,7 +38,8 @@ public sealed partial class CreateEntityTileReaction : ITileReaction
     public FixedPoint2 TileReact(TileRef tile,
         ReagentPrototype reagent,
         FixedPoint2 reactVolume,
-        IEntityManager entityManager)
+        IEntityManager entityManager,
+        List<ReagentData>? data)
     {
         if (reactVolume >= Usage)
         {
diff --git a/Content.Server/Chemistry/TileReactions/ExtinguishTileReaction.cs b/Content.Server/Chemistry/TileReactions/ExtinguishTileReaction.cs
index 198f650ac1a..2b9475235f8 100644
--- a/Content.Server/Chemistry/TileReactions/ExtinguishTileReaction.cs
+++ b/Content.Server/Chemistry/TileReactions/ExtinguishTileReaction.cs
@@ -17,7 +17,8 @@ public sealed partial class ExtinguishTileReaction : ITileReaction
         public FixedPoint2 TileReact(TileRef tile,
             ReagentPrototype reagent,
             FixedPoint2 reactVolume,
-            IEntityManager entityManager)
+            IEntityManager entityManager,
+            List<ReagentData>? data)
         {
             if (reactVolume <= FixedPoint2.Zero || tile.Tile.IsEmpty)
                 return FixedPoint2.Zero;
diff --git a/Content.Server/Chemistry/TileReactions/FlammableTileReaction.cs b/Content.Server/Chemistry/TileReactions/FlammableTileReaction.cs
index b13b70d3d5c..dd0b4960efc 100644
--- a/Content.Server/Chemistry/TileReactions/FlammableTileReaction.cs
+++ b/Content.Server/Chemistry/TileReactions/FlammableTileReaction.cs
@@ -16,7 +16,8 @@ public sealed partial class FlammableTileReaction : ITileReaction
         public FixedPoint2 TileReact(TileRef tile,
             ReagentPrototype reagent,
             FixedPoint2 reactVolume,
-            IEntityManager entityManager)
+            IEntityManager entityManager,
+            List<ReagentData>? data)
         {
             if (reactVolume <= FixedPoint2.Zero || tile.Tile.IsEmpty)
                 return FixedPoint2.Zero;
diff --git a/Content.Server/Chemistry/TileReactions/PryTileReaction.cs b/Content.Server/Chemistry/TileReactions/PryTileReaction.cs
index c10b031720f..49971475c12 100644
--- a/Content.Server/Chemistry/TileReactions/PryTileReaction.cs
+++ b/Content.Server/Chemistry/TileReactions/PryTileReaction.cs
@@ -1,4 +1,4 @@
-using Content.Server.Maps;
+using Content.Server.Maps;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
@@ -15,7 +15,8 @@ public sealed partial class PryTileReaction : ITileReaction
     public FixedPoint2 TileReact(TileRef tile,
         ReagentPrototype reagent,
         FixedPoint2 reactVolume,
-        IEntityManager entityManager)
+        IEntityManager entityManager,
+        List<ReagentData>? data)
     {
         var sys = entityManager.System<TileSystem>();
         sys.PryTile(tile);
diff --git a/Content.Server/Chemistry/TileReactions/SpillIfPuddlePresentTileReaction.cs b/Content.Server/Chemistry/TileReactions/SpillIfPuddlePresentTileReaction.cs
index 6b46b894959..8c8b371da36 100644
--- a/Content.Server/Chemistry/TileReactions/SpillIfPuddlePresentTileReaction.cs
+++ b/Content.Server/Chemistry/TileReactions/SpillIfPuddlePresentTileReaction.cs
@@ -15,13 +15,14 @@ public sealed partial class SpillIfPuddlePresentTileReaction : ITileReaction
         public FixedPoint2 TileReact(TileRef tile,
             ReagentPrototype reagent,
             FixedPoint2 reactVolume,
-            IEntityManager entityManager)
+            IEntityManager entityManager,
+            List<ReagentData>? data)
         {
             var spillSystem = entityManager.System<PuddleSystem>();
             if (reactVolume < 5 || !spillSystem.TryGetPuddle(tile, out _))
                 return FixedPoint2.Zero;
 
-            return spillSystem.TrySpillAt(tile, new Solution(reagent.ID, reactVolume), out _, sound: false, tileReact: false)
+            return spillSystem.TrySpillAt(tile, new Solution(reagent.ID, reactVolume, data), out _, sound: false, tileReact: false)
                 ? reactVolume
                 : FixedPoint2.Zero;
         }
diff --git a/Content.Server/Chemistry/TileReactions/SpillTileReaction.cs b/Content.Server/Chemistry/TileReactions/SpillTileReaction.cs
index fadc7147c9c..f9fb2b90d0b 100644
--- a/Content.Server/Chemistry/TileReactions/SpillTileReaction.cs
+++ b/Content.Server/Chemistry/TileReactions/SpillTileReaction.cs
@@ -29,13 +29,14 @@ public sealed partial class SpillTileReaction : ITileReaction
         public FixedPoint2 TileReact(TileRef tile,
             ReagentPrototype reagent,
             FixedPoint2 reactVolume,
-            IEntityManager entityManager)
+            IEntityManager entityManager,
+            List<ReagentData>? data)
         {
             if (reactVolume < 5)
                 return FixedPoint2.Zero;
 
             if (entityManager.EntitySysManager.GetEntitySystem<PuddleSystem>()
-                .TrySpillAt(tile, new Solution(reagent.ID, reactVolume), out var puddleUid, false, false))
+                .TrySpillAt(tile, new Solution(reagent.ID, reactVolume, data), out var puddleUid, false, false))
             {
                 var slippery = entityManager.EnsureComponent<SlipperyComponent>(puddleUid);
                 slippery.LaunchForwardsMultiplier = _launchForwardsMultiplier;
diff --git a/Content.Server/Clock/ClockSystem.cs b/Content.Server/Clock/ClockSystem.cs
new file mode 100644
index 00000000000..29400a59f7b
--- /dev/null
+++ b/Content.Server/Clock/ClockSystem.cs
@@ -0,0 +1,42 @@
+using Content.Server.GameTicking.Events;
+using Content.Shared.Clock;
+using Content.Shared.Destructible;
+using Robust.Server.GameStates;
+using Robust.Shared.Random;
+
+namespace Content.Server.Clock;
+
+public sealed class ClockSystem : SharedClockSystem
+{
+    [Dependency] private readonly PvsOverrideSystem _pvsOverride = default!;
+    [Dependency] private readonly IRobustRandom _robustRandom = default!;
+
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<RoundStartingEvent>(OnRoundStart);
+        SubscribeLocalEvent<GlobalTimeManagerComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<ClockComponent, BreakageEventArgs>(OnBreak);
+    }
+
+    private void OnRoundStart(RoundStartingEvent ev)
+    {
+        var manager = Spawn();
+        AddComp<GlobalTimeManagerComponent>(manager);
+    }
+
+    private void OnMapInit(Entity<GlobalTimeManagerComponent> ent, ref MapInitEvent args)
+    {
+        ent.Comp.TimeOffset = TimeSpan.FromHours(_robustRandom.NextFloat(0, 24));
+        _pvsOverride.AddGlobalOverride(ent);
+        Dirty(ent);
+    }
+
+    private void OnBreak(Entity<ClockComponent> ent, ref BreakageEventArgs args)
+    {
+        ent.Comp.StuckTime = GetClockTime(ent);
+        Dirty(ent, ent.Comp);
+    }
+}
diff --git a/Content.Server/Clothing/Components/GloveHeatResistanceComponent.cs b/Content.Server/Clothing/Components/GloveHeatResistanceComponent.cs
deleted file mode 100644
index 29a3b901a78..00000000000
--- a/Content.Server/Clothing/Components/GloveHeatResistanceComponent.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace Content.Server.Clothing.Components;
-
-/// <summary>
-///     TODO this needs removed somehow.
-///     Handles 'heat resistance' for gloves touching bulbs and that's it, ick.
-/// </summary>
-[RegisterComponent]
-public sealed partial class GloveHeatResistanceComponent : Component
-{
-    [DataField("heatResistance")]
-    public int HeatResistance = 323;
-}
diff --git a/Content.Server/Cluwne/CluwneSystem.cs b/Content.Server/Cluwne/CluwneSystem.cs
index 18d82659deb..f24f0143f31 100644
--- a/Content.Server/Cluwne/CluwneSystem.cs
+++ b/Content.Server/Cluwne/CluwneSystem.cs
@@ -29,7 +29,6 @@ public sealed class CluwneSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly ChatSystem _chat = default!;
     [Dependency] private readonly AutoEmoteSystem _autoEmote = default!;
-    [Dependency] private readonly MetaDataSystem _metaData = default!;
     [Dependency] private readonly NameModifierSystem _nameMod = default!;
 
     public override void Initialize()
diff --git a/Content.Server/Commands/CommandUtils.cs b/Content.Server/Commands/CommandUtils.cs
index 172f3324e35..30ea41b7c9f 100644
--- a/Content.Server/Commands/CommandUtils.cs
+++ b/Content.Server/Commands/CommandUtils.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using Robust.Server.Player;
 using Robust.Shared.Console;
@@ -55,13 +55,15 @@ public static string SubstituteEntityDetails(IConsoleShell shell, EntityUid ent,
         {
             var entMan = IoCManager.Resolve<IEntityManager>();
             var transform = entMan.GetComponent<TransformComponent>(ent);
+            var transformSystem = entMan.System<SharedTransformSystem>();
+            var worldPosition = transformSystem.GetWorldPosition(transform);
 
             // gross, is there a better way to do this?
             ruleString = ruleString.Replace("$ID", ent.ToString());
             ruleString = ruleString.Replace("$WX",
-                transform.WorldPosition.X.ToString(CultureInfo.InvariantCulture));
+                worldPosition.X.ToString(CultureInfo.InvariantCulture));
             ruleString = ruleString.Replace("$WY",
-                transform.WorldPosition.Y.ToString(CultureInfo.InvariantCulture));
+                worldPosition.Y.ToString(CultureInfo.InvariantCulture));
             ruleString = ruleString.Replace("$LX",
                 transform.LocalPosition.X.ToString(CultureInfo.InvariantCulture));
             ruleString = ruleString.Replace("$LY",
@@ -73,12 +75,13 @@ public static string SubstituteEntityDetails(IConsoleShell shell, EntityUid ent,
                 if (player.AttachedEntity is {Valid: true} p)
                 {
                     var pTransform = entMan.GetComponent<TransformComponent>(p);
+                    var pWorldPosition = transformSystem.GetWorldPosition(pTransform);
 
                     ruleString = ruleString.Replace("$PID", ent.ToString());
                     ruleString = ruleString.Replace("$PWX",
-                        pTransform.WorldPosition.X.ToString(CultureInfo.InvariantCulture));
+                        pWorldPosition.X.ToString(CultureInfo.InvariantCulture));
                     ruleString = ruleString.Replace("$PWY",
-                        pTransform.WorldPosition.Y.ToString(CultureInfo.InvariantCulture));
+                        pWorldPosition.Y.ToString(CultureInfo.InvariantCulture));
                     ruleString = ruleString.Replace("$PLX",
                         pTransform.LocalPosition.X.ToString(CultureInfo.InvariantCulture));
                     ruleString = ruleString.Replace("$PLY",
diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs
index d42902b94a5..d0252ce1bef 100644
--- a/Content.Server/Connection/ConnectionManager.cs
+++ b/Content.Server/Connection/ConnectionManager.cs
@@ -216,7 +216,7 @@ session.Status is SessionStatus.Connected or SessionStatus.InGame
                 var minMinutesAge = _cfg.GetCVar(CCVars.PanicBunkerMinAccountAge);
                 var record = await _dbManager.GetPlayerRecordByUserId(userId);
                 var validAccountAge = record != null &&
-                                      record.FirstSeenTime.CompareTo(DateTimeOffset.Now - TimeSpan.FromMinutes(minMinutesAge)) <= 0;
+                                      record.FirstSeenTime.CompareTo(DateTimeOffset.UtcNow - TimeSpan.FromMinutes(minMinutesAge)) <= 0;
                 var bypassAllowed = _cfg.GetCVar(CCVars.BypassBunkerWhitelist) && await _db.GetWhitelistStatusAsync(userId);
 
                 // Use the custom reason if it exists & they don't have the minimum account age
@@ -330,7 +330,17 @@ session.Status is SessionStatus.Connected or SessionStatus.InGame
             // Wait some time to lookup data
             var record = await _dbManager.GetPlayerRecordByUserId(userId);
 
-            var isAccountAgeInvalid = record == null || record.FirstSeenTime.CompareTo(DateTimeOffset.Now - TimeSpan.FromMinutes(maxAccountAgeMinutes)) <= 0;
+            // No player record = new account or the DB is having a skill issue
+            if (record == null)
+                return (false, "");
+
+            var isAccountAgeInvalid = record.FirstSeenTime.CompareTo(DateTimeOffset.UtcNow - TimeSpan.FromMinutes(maxAccountAgeMinutes)) <= 0;
+
+            if (isAccountAgeInvalid)
+            {
+                _sawmill.Debug($"Baby jail will deny {userId} for account age {record.FirstSeenTime}"); // Remove on or after 2024-09
+            }
+
             if (isAccountAgeInvalid && showReason)
             {
                 var locAccountReason = reason != string.Empty
@@ -345,7 +355,12 @@ session.Status is SessionStatus.Connected or SessionStatus.InGame
             }
 
             var overallTime = ( await _db.GetPlayTimes(e.UserId)).Find(p => p.Tracker == PlayTimeTrackingShared.TrackerOverall);
-            var isTotalPlaytimeInvalid = overallTime == null || overallTime.TimeSpent.TotalMinutes >= maxPlaytimeMinutes;
+            var isTotalPlaytimeInvalid = overallTime != null && overallTime.TimeSpent.TotalMinutes >= maxPlaytimeMinutes;
+
+            if (isTotalPlaytimeInvalid)
+            {
+                _sawmill.Debug($"Baby jail will deny {userId} for playtime {overallTime!.TimeSpent}"); // Remove on or after 2024-09
+            }
 
             if (isTotalPlaytimeInvalid && showReason)
             {
diff --git a/Content.Server/Construction/ConstructionSystem.Interactions.cs b/Content.Server/Construction/ConstructionSystem.Interactions.cs
index ad7b2a11b0e..426ab6e80fb 100644
--- a/Content.Server/Construction/ConstructionSystem.Interactions.cs
+++ b/Content.Server/Construction/ConstructionSystem.Interactions.cs
@@ -2,7 +2,6 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Construction.Components;
 using Content.Server.Temperature.Components;
-using Content.Server.Temperature.Systems;
 using Content.Shared.Construction;
 using Content.Shared.Construction.Components;
 using Content.Shared.Construction.EntitySystems;
@@ -11,6 +10,7 @@
 using Content.Shared.Interaction;
 using Content.Shared.Prying.Systems;
 using Content.Shared.Radio.EntitySystems;
+using Content.Shared.Temperature;
 using Content.Shared.Tools.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Utility;
@@ -287,7 +287,7 @@ private HandleResult HandleInteraction(EntityUid uid, object ev, ConstructionGra
                         {
                             BreakOnDamage = false,
                             BreakOnMove = true,
-                            NeedHand = true
+                            NeedHand = true,
                         };
 
                         var started  = _doAfterSystem.TryStartDoAfter(doAfterEventArgs);
diff --git a/Content.Server/Containers/ThrowInsertContainerSystem.cs b/Content.Server/Containers/ThrowInsertContainerSystem.cs
index 12bb602811a..cbaec7f5c6e 100644
--- a/Content.Server/Containers/ThrowInsertContainerSystem.cs
+++ b/Content.Server/Containers/ThrowInsertContainerSystem.cs
@@ -30,8 +30,6 @@ private void OnThrowCollide(Entity<ThrowInsertContainerComponent> ent, ref Throw
         if (!_containerSystem.CanInsert(args.Thrown, container))
             return;
 
-
-        var rand = _random.NextFloat();
         if (_random.Prob(ent.Comp.Probability))
         {
             _audio.PlayPvs(ent.Comp.MissSound, ent);
diff --git a/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs b/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
index ff4d1cabe98..8a7b3df0b24 100644
--- a/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
+++ b/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
@@ -32,31 +32,25 @@ public override void Initialize()
 
         private void OnDoHit(EntityUid uid, DamageOtherOnHitComponent component, ThrowDoHitEvent args)
         {
-            if (!TerminatingOrDeleted(args.Target))
-            {
-                var dmg = _damageable.TryChangeDamage(args.Target, component.Damage, component.IgnoreResistances, origin: args.Component.Thrower);
+            if (TerminatingOrDeleted(args.Target))
+                return;
 
-                // Log damage only for mobs. Useful for when people throw spears at each other, but also avoids log-spam when explosions send glass shards flying.
-                if (dmg != null && HasComp<MobStateComponent>(args.Target))
-                    _adminLogger.Add(LogType.ThrowHit, $"{ToPrettyString(args.Target):target} received {dmg.GetTotal():damage} damage from collision");
+            var dmg = _damageable.TryChangeDamage(args.Target, component.Damage, component.IgnoreResistances, origin: args.Component.Thrower);
 
-                if (dmg is { Empty: false })
-                {
-                    _color.RaiseEffect(Color.Red, new List<EntityUid>() { args.Target }, Filter.Pvs(args.Target, entityManager: EntityManager));
-                }
+            // Log damage only for mobs. Useful for when people throw spears at each other, but also avoids log-spam when explosions send glass shards flying.
+            if (dmg != null && HasComp<MobStateComponent>(args.Target))
+                _adminLogger.Add(LogType.ThrowHit, $"{ToPrettyString(args.Target):target} received {dmg.GetTotal():damage} damage from collision");
 
-                _guns.PlayImpactSound(args.Target, dmg, null, false);
-                if (TryComp<PhysicsComponent>(uid, out var body) && body.LinearVelocity.LengthSquared() > 0f)
-                {
-                    var direction = body.LinearVelocity.Normalized();
-                    _sharedCameraRecoil.KickCamera(args.Target, direction);
-                }
+            if (dmg is { Empty: false })
+            {
+                _color.RaiseEffect(Color.Red, new List<EntityUid>() { args.Target }, Filter.Pvs(args.Target, entityManager: EntityManager));
             }
 
-            // TODO: If more stuff touches this then handle it after.
-            if (TryComp<PhysicsComponent>(uid, out var physics))
+            _guns.PlayImpactSound(args.Target, dmg, null, false);
+            if (TryComp<PhysicsComponent>(uid, out var body) && body.LinearVelocity.LengthSquared() > 0f)
             {
-                _thrownItem.LandComponent(args.Thrown, args.Component, physics, false);
+                var direction = body.LinearVelocity.Normalized();
+                _sharedCameraRecoil.KickCamera(args.Target, direction);
             }
         }
 
diff --git a/Content.Server/Database/ServerDbSqlite.cs b/Content.Server/Database/ServerDbSqlite.cs
index ce6f97a1171..204d9fca4fb 100644
--- a/Content.Server/Database/ServerDbSqlite.cs
+++ b/Content.Server/Database/ServerDbSqlite.cs
@@ -131,6 +131,10 @@ private static async Task<List<ServerBan>> GetAllBans(
 
             if (exemptFlags is { } exempt)
             {
+                // Any flag to bypass BlacklistedRange bans.
+                if (exempt != ServerBanExemptFlags.None)
+                    exempt |= ServerBanExemptFlags.BlacklistedRange;
+
                 query = query.Where(b => (b.ExemptFlags & exempt) == 0);
             }
 
@@ -144,15 +148,12 @@ private static bool BanMatches(ServerBan ban,
             ServerBanExemptFlags? exemptFlags,
             bool newPlayer)
         {
-            // Any flag to bypass BlacklistedRange bans.
-            var exemptFromBlacklistedRange = exemptFlags != null && exemptFlags.Value != ServerBanExemptFlags.None;
-
             if (!exemptFlags.GetValueOrDefault(ServerBanExemptFlags.None).HasFlag(ServerBanExemptFlags.IP)
                 && address != null
                 && ban.Address is not null
                 && address.IsInSubnet(ban.Address.ToTuple().Value)
                 && (!ban.ExemptFlags.HasFlag(ServerBanExemptFlags.BlacklistedRange) ||
-                     newPlayer && !exemptFromBlacklistedRange))
+                     newPlayer))
             {
                 return true;
             }
diff --git a/Content.Server/DeltaV/StationEvents/Events/FugitiveRule.cs b/Content.Server/DeltaV/StationEvents/Events/FugitiveRule.cs
index 31b89f5c32d..3b9969c4433 100644
--- a/Content.Server/DeltaV/StationEvents/Events/FugitiveRule.cs
+++ b/Content.Server/DeltaV/StationEvents/Events/FugitiveRule.cs
@@ -1,11 +1,11 @@
 using Content.Server.Antag;
 using Content.Server.Communications;
-using Content.Server.GameTicking.Components; // TODO: Shared when upstream merged
-using Content.Server.Paper;
 using Content.Server.StationEvents.Components;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Ghost;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Prototypes;
+using Content.Shared.Paper;
 using Content.Shared.Popups;
 using Content.Shared.Random.Helpers;
 using Robust.Shared.Physics.Components;
@@ -48,7 +48,8 @@ protected override void ActiveTick(EntityUid uid, FugitiveRuleComponent comp, Ga
         foreach (var xform in consoles)
         {
             var report = Spawn(comp.ReportPaper, xform.Coordinates);
-            _paper.SetContent(report, comp.Report);
+            var paper = Comp<PaperComponent>(report);
+            _paper.SetContent((report, paper), comp.Report);
         }
 
         // prevent any possible funnies
diff --git a/Content.Server/DeltaV/StationEvents/Events/GlimmerMobSpawnRule.cs b/Content.Server/DeltaV/StationEvents/Events/GlimmerMobSpawnRule.cs
index db1396e8387..802a6379b21 100644
--- a/Content.Server/DeltaV/StationEvents/Events/GlimmerMobSpawnRule.cs
+++ b/Content.Server/DeltaV/StationEvents/Events/GlimmerMobSpawnRule.cs
@@ -1,10 +1,10 @@
 using System.Linq;
-using Content.Server.GameTicking.Components;
 using Content.Server.Psionics.Glimmer;
 using Content.Server.StationEvents;
 using Content.Server.StationEvents.Components;
 using Content.Server.StationEvents.Events;
 using Content.Shared.Abilities.Psionics;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.NPC.Components;
 using Content.Shared.Psionics.Glimmer;
 using Robust.Shared.Random;
diff --git a/Content.Server/DeltaV/StationEvents/Events/LoadFarGridRule.cs b/Content.Server/DeltaV/StationEvents/Events/LoadFarGridRule.cs
index 66039084f75..760b6cc6a02 100644
--- a/Content.Server/DeltaV/StationEvents/Events/LoadFarGridRule.cs
+++ b/Content.Server/DeltaV/StationEvents/Events/LoadFarGridRule.cs
@@ -4,10 +4,10 @@
 * See AGPLv3.txt for details.
 */
 
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules;
 using Content.Server.Station.Components;
 using Content.Server.StationEvents.Components;
+using Content.Shared.GameTicking.Components;
 using Robust.Server.GameObjects;
 using Robust.Server.Maps;
 using Robust.Shared.Map;
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
index 057b6df9df2..4ec6fa9e908 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
@@ -1,12 +1,12 @@
 using System.Numerics;
 using Content.Server.Forensics;
 using Content.Server.Stack;
+using Content.Shared.Destructible.Thresholds;
 using Content.Shared.Prototypes;
 using Content.Shared.Stacks;
 using Robust.Server.GameObjects;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
 
 namespace Content.Server.Destructible.Thresholds.Behaviors
 {
@@ -17,8 +17,8 @@ public sealed partial class SpawnEntitiesBehavior : IThresholdBehavior
         /// <summary>
         ///     Entities spawned on reaching this threshold, from a min to a max.
         /// </summary>
-        [DataField("spawn", customTypeSerializer:typeof(PrototypeIdDictionarySerializer<MinMax, EntityPrototype>))]
-        public Dictionary<string, MinMax> Spawn { get; set; } = new();
+        [DataField]
+        public Dictionary<EntProtoId, MinMax> Spawn = new();
 
         [DataField("offset")]
         public float Offset { get; set; } = 0.5f;
diff --git a/Content.Server/Destructible/Thresholds/MinMax.cs b/Content.Server/Destructible/Thresholds/MinMax.cs
deleted file mode 100644
index c44864183ab..00000000000
--- a/Content.Server/Destructible/Thresholds/MinMax.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Robust.Shared.Random;
-
-namespace Content.Server.Destructible.Thresholds
-{
-    [Serializable]
-    [DataDefinition]
-    public partial struct MinMax
-    {
-        [DataField("min")]
-        public int Min;
-
-        [DataField("max")]
-        public int Max;
-
-        public MinMax(int min, int max)
-        {
-            Min = min;
-            Max = max;
-        }
-
-        public int Next(IRobustRandom random)
-        {
-            return random.Next(Min, Max + 1);
-        }
-    }
-}
diff --git a/Content.Server/DeviceNetwork/Systems/WirelessNetworkSystem.cs b/Content.Server/DeviceNetwork/Systems/WirelessNetworkSystem.cs
index b27ef52eca6..1741afd4ce3 100644
--- a/Content.Server/DeviceNetwork/Systems/WirelessNetworkSystem.cs
+++ b/Content.Server/DeviceNetwork/Systems/WirelessNetworkSystem.cs
@@ -6,6 +6,8 @@ namespace Content.Server.DeviceNetwork.Systems
     [UsedImplicitly]
     public sealed class WirelessNetworkSystem : EntitySystem
     {
+        [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
+
         public override void Initialize()
         {
             base.Initialize();
@@ -25,7 +27,7 @@ private void OnBeforePacketSent(EntityUid uid, WirelessNetworkComponent componen
                 return;
 
             if (xform.MapID != args.SenderTransform.MapID
-                || (ownPosition - xform.WorldPosition).Length() > sendingComponent.Range)
+                || (ownPosition - _transformSystem.GetWorldPosition(xform)).Length() > sendingComponent.Range)
             {
                 args.Cancel();
             }
diff --git a/Content.Server/Disposal/Mailing/MailingUnitSystem.cs b/Content.Server/Disposal/Mailing/MailingUnitSystem.cs
index e1fbdbf0894..6249b9497d8 100644
--- a/Content.Server/Disposal/Mailing/MailingUnitSystem.cs
+++ b/Content.Server/Disposal/Mailing/MailingUnitSystem.cs
@@ -9,6 +9,7 @@
 using Content.Shared.Interaction;
 using Robust.Server.GameObjects;
 using Robust.Shared.Player;
+using Robust.Shared.Utility;
 
 namespace Content.Server.Disposal.Mailing;
 
@@ -35,7 +36,7 @@ public override void Initialize()
         SubscribeLocalEvent<MailingUnitComponent, DeviceNetworkPacketEvent>(OnPacketReceived);
         SubscribeLocalEvent<MailingUnitComponent, BeforeDisposalFlushEvent>(OnBeforeFlush);
         SubscribeLocalEvent<MailingUnitComponent, ConfigurationSystem.ConfigurationUpdatedEvent>(OnConfigurationUpdated);
-        SubscribeLocalEvent<MailingUnitComponent, ActivateInWorldEvent>(HandleActivate);
+        SubscribeLocalEvent<MailingUnitComponent, ActivateInWorldEvent>(HandleActivate, before: new[] { typeof(DisposalUnitSystem) });
         SubscribeLocalEvent<MailingUnitComponent, DisposalUnitUIStateUpdatedEvent>(OnDisposalUnitUIStateChange);
         SubscribeLocalEvent<MailingUnitComponent, TargetSelectedMessage>(OnTargetSelected);
     }
@@ -179,7 +180,7 @@ private void UpdateUserInterface(EntityUid uid, MailingUnitComponent component)
         if (component.DisposalUnitInterfaceState == null)
             return;
 
-        var state = new MailingUnitBoundUserInterfaceState(component.DisposalUnitInterfaceState, component.Target, component.TargetList, component.Tag);
+        var state = new MailingUnitBoundUserInterfaceState(component.DisposalUnitInterfaceState, component.Target, component.TargetList.ShallowClone(), component.Tag);
         _userInterfaceSystem.SetUiState(uid, MailingUnitUiKey.Key, state);
     }
 
diff --git a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
index aa1ab3daccd..ba0124626ad 100644
--- a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
+++ b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
@@ -25,7 +25,6 @@
 using Content.Shared.Item;
 using Content.Shared.Movement.Events;
 using Content.Shared.Popups;
-using Content.Shared.Throwing;
 using Content.Shared.Verbs;
 using Robust.Server.Audio;
 using Robust.Server.GameObjects;
@@ -35,7 +34,6 @@
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Player;
-using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Disposal.Unit.EntitySystems;
@@ -331,12 +329,13 @@ private void OnMovement(EntityUid uid, SharedDisposalUnitComponent component, re
     {
         var currentTime = GameTiming.CurTime;
 
+        if (!_actionBlockerSystem.CanMove(args.Entity))
+            return;
+
         if (!TryComp(args.Entity, out HandsComponent? hands) ||
             hands.Count == 0 ||
             currentTime < component.LastExitAttempt + ExitAttemptDelay)
-        {
             return;
-        }
 
         component.LastExitAttempt = currentTime;
         Remove(uid, component, args.Entity);
@@ -489,7 +488,7 @@ public bool TryInsert(EntityUid unitId, EntityUid toInsertId, EntityUid? userId,
         {
             BreakOnDamage = true,
             BreakOnMove = true,
-            NeedHand = false
+            NeedHand = false,
         };
 
         _doAfterSystem.TryStartDoAfter(doAfterArgs);
diff --git a/Content.Server/Doors/Systems/FirelockSystem.cs b/Content.Server/Doors/Systems/FirelockSystem.cs
index 93ee18f6831..87e5887c422 100644
--- a/Content.Server/Doors/Systems/FirelockSystem.cs
+++ b/Content.Server/Doors/Systems/FirelockSystem.cs
@@ -16,7 +16,6 @@ namespace Content.Server.Doors.Systems
     public sealed class FirelockSystem : SharedFirelockSystem
     {
         [Dependency] private readonly SharedDoorSystem _doorSystem = default!;
-        [Dependency] private readonly AtmosAlarmableSystem _atmosAlarmable = default!;
         [Dependency] private readonly AtmosphereSystem _atmosSystem = default!;
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
         [Dependency] private readonly SharedMapSystem _mapping = default!;
diff --git a/Content.Server/Dragon/DragonSystem.cs b/Content.Server/Dragon/DragonSystem.cs
index 62d1f61a35b..42610a03237 100644
--- a/Content.Server/Dragon/DragonSystem.cs
+++ b/Content.Server/Dragon/DragonSystem.cs
@@ -8,6 +8,7 @@
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 using Content.Shared.Mobs;
+using Content.Shared.Mobs.Systems;
 using Content.Shared.Movement.Systems;
 using Content.Shared.NPC.Systems;
 using Content.Shared.Zombies;
@@ -24,10 +25,10 @@ public sealed partial class DragonSystem : EntitySystem
     [Dependency] private readonly MovementSpeedModifierSystem _movement = default!;
     [Dependency] private readonly NpcFactionSystem _faction = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
-    [Dependency] private readonly RoleSystem _role = default!;
     [Dependency] private readonly SharedActionsSystem _actions = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
 
     private EntityQuery<CarpRiftsConditionComponent> _objQuery;
 
@@ -92,7 +93,8 @@ public override void Update(float frameTime)
                 }
             }
 
-            comp.RiftAccumulator += frameTime;
+            if (!_mobState.IsDead(uid))
+                comp.RiftAccumulator += frameTime;
 
             // Delete it, naughty dragon!
             if (comp.RiftAccumulator >= comp.RiftMaxAccumulator)
@@ -146,7 +148,7 @@ private void OnSpawnRift(EntityUid uid, DragonComponent component, DragonSpawnRi
         // cant stack rifts near eachother
         foreach (var (_, riftXform) in EntityQuery<DragonRiftComponent, TransformComponent>(true))
         {
-            if (riftXform.Coordinates.InRange(EntityManager, _transform, xform.Coordinates, RiftRange))
+            if (_transform.InRange(riftXform.Coordinates, xform.Coordinates, RiftRange))
             {
                 _popup.PopupEntity(Loc.GetString("carp-rift-proximity", ("proximity", RiftRange)), uid, uid);
                 return;
@@ -154,7 +156,7 @@ private void OnSpawnRift(EntityUid uid, DragonComponent component, DragonSpawnRi
         }
 
         // cant put a rift on solars
-        foreach (var tile in grid.GetTilesIntersecting(new Circle(xform.WorldPosition, RiftTileRadius), false))
+        foreach (var tile in grid.GetTilesIntersecting(new Circle(_transform.GetWorldPosition(xform), RiftTileRadius), false))
         {
             if (!tile.IsSpace(_tileDef))
                 continue;
@@ -225,7 +227,7 @@ public void DeleteRifts(EntityUid uid, bool resetRole, DragonComponent? comp = n
             return;
 
         var mind = Comp<MindComponent>(mindContainer.Mind.Value);
-        foreach (var objId in mind.AllObjectives)
+        foreach (var objId in mind.Objectives)
         {
             if (_objQuery.TryGetComponent(objId, out var obj))
             {
@@ -247,7 +249,7 @@ public void RiftCharged(EntityUid uid, DragonComponent? comp = null)
             return;
 
         var mind = Comp<MindComponent>(mindContainer.Mind.Value);
-        foreach (var objId in mind.AllObjectives)
+        foreach (var objId in mind.Objectives)
         {
             if (_objQuery.TryGetComponent(objId, out var obj))
             {
diff --git a/Content.Server/Drowsiness/DrowsinessSystem.cs b/Content.Server/Drowsiness/DrowsinessSystem.cs
new file mode 100644
index 00000000000..2511bc790e9
--- /dev/null
+++ b/Content.Server/Drowsiness/DrowsinessSystem.cs
@@ -0,0 +1,50 @@
+using Content.Shared.Bed.Sleep;
+using Content.Shared.Drowsiness;
+using Content.Shared.StatusEffect;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Server.Drowsiness;
+
+public sealed class DrowsinessSystem : SharedDrowsinessSystem
+{
+    [ValidatePrototypeId<StatusEffectPrototype>]
+    private const string SleepKey = "ForcedSleep"; // Same one used by N2O and other sleep chems.
+
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
+
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<DrowsinessComponent, ComponentStartup>(OnInit);
+    }
+
+    private void OnInit(EntityUid uid, DrowsinessComponent component, ComponentStartup args)
+    {
+        component.NextIncidentTime = _timing.CurTime + TimeSpan.FromSeconds(_random.NextFloat(component.TimeBetweenIncidents.X, component.TimeBetweenIncidents.Y));
+    }
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<DrowsinessComponent>();
+        while (query.MoveNext(out var uid, out var component))
+        {
+            if (_timing.CurTime < component.NextIncidentTime)
+                continue;
+
+            // Set the new time.
+            component.NextIncidentTime = _timing.CurTime + TimeSpan.FromSeconds(_random.NextFloat(component.TimeBetweenIncidents.X, component.TimeBetweenIncidents.Y));
+
+            // sleep duration
+            var duration = TimeSpan.FromSeconds(_random.NextFloat(component.DurationOfIncident.X, component.DurationOfIncident.Y));
+
+            // Make sure the sleep time doesn't cut into the time to next incident.
+            component.NextIncidentTime += duration;
+
+            _statusEffects.TryAddStatusEffect<ForcedSleepingComponent>(uid, SleepKey, duration, false);
+        }
+    }
+}
diff --git a/Content.Server/Electrocution/Components/ElectrifiedComponent.cs b/Content.Server/Electrocution/Components/ElectrifiedComponent.cs
index 4ef07a0cca8..5755e98091b 100644
--- a/Content.Server/Electrocution/Components/ElectrifiedComponent.cs
+++ b/Content.Server/Electrocution/Components/ElectrifiedComponent.cs
@@ -11,33 +11,63 @@ public sealed partial class ElectrifiedComponent : Component
     [DataField("enabled")]
     public bool Enabled = true;
 
+    /// <summary>
+    /// Should player get damage on collide
+    /// </summary>
     [DataField("onBump")]
     public bool OnBump = true;
 
+    /// <summary>
+    /// Should player get damage on attack
+    /// </summary>
     [DataField("onAttacked")]
     public bool OnAttacked = true;
 
+    /// <summary>
+    /// When true - disables power if a window is present in the same tile
+    /// </summary>
     [DataField("noWindowInTile")]
     public bool NoWindowInTile = false;
 
+    /// <summary>
+    /// Should player get damage on interact with empty hand
+    /// </summary>
     [DataField("onHandInteract")]
     public bool OnHandInteract = true;
 
+    /// <summary>
+    /// Should player get damage on interact while holding an object in their hand
+    /// </summary>
     [DataField("onInteractUsing")]
     public bool OnInteractUsing = true;
 
+    /// <summary>
+    /// Indicates if the entity requires power to function
+    /// </summary>
     [DataField("requirePower")]
     public bool RequirePower = true;
 
+    /// <summary>
+    /// Indicates if the entity uses APC power
+    /// </summary>
     [DataField("usesApcPower")]
     public bool UsesApcPower = false;
 
+    /// <summary>
+    /// Identifier for the high voltage node.
+    /// </summary>
     [DataField("highVoltageNode")]
     public string? HighVoltageNode;
 
+    /// <summary>
+    /// Identifier for the medium voltage node.
+    /// </summary>
     [DataField("mediumVoltageNode")]
     public string? MediumVoltageNode;
 
+    /// <summary>
+    /// Identifier for the low voltage node.
+    /// </summary>
     [DataField("lowVoltageNode")]
     public string? LowVoltageNode;
 
@@ -69,7 +99,7 @@ public sealed partial class ElectrifiedComponent : Component
     public float ShockDamage = 7.5f;
 
     /// <summary>
-    ///     Shock time, in seconds.
+    /// Shock time, in seconds.
     /// </summary>
     [DataField("shockTime")]
     public float ShockTime = 8f;
diff --git a/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs b/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
index 281bbc47211..8391e8faada 100644
--- a/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
+++ b/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
@@ -65,8 +65,8 @@ bool IsTileClear()
 
             EntityManager.SpawnEntity(component.Prototype, args.ClickLocation.SnapToGrid(grid));
 
-            if (component.RemoveOnInteract && stackComp == null && !((!EntityManager.EntityExists(uid) ? EntityLifeStage.Deleted : EntityManager.GetComponent<MetaDataComponent>(component.Owner).EntityLifeStage) >= EntityLifeStage.Deleted))
-                EntityManager.DeleteEntity(uid);
+            if (component.RemoveOnInteract && stackComp == null)
+                TryQueueDel(uid);
         }
     }
 }
diff --git a/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs b/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs
index 51d3242ce4f..7d6963826ad 100644
--- a/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs
+++ b/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs
@@ -28,6 +28,7 @@ public void InitializeEnsnaring()
         SubscribeLocalEvent<EnsnaringComponent, StepTriggeredOffEvent>(OnStepTrigger);
         SubscribeLocalEvent<EnsnaringComponent, ThrowDoHitEvent>(OnThrowHit);
         SubscribeLocalEvent<EnsnaringComponent, AttemptPacifiedThrowEvent>(OnAttemptPacifiedThrow);
+        SubscribeLocalEvent<EnsnareableComponent, RemoveEnsnareAlertEvent>(OnRemoveEnsnareAlert);
     }
 
     private void OnAttemptPacifiedThrow(Entity<EnsnaringComponent> ent, ref AttemptPacifiedThrowEvent args)
@@ -35,6 +36,24 @@ private void OnAttemptPacifiedThrow(Entity<EnsnaringComponent> ent, ref AttemptP
         args.Cancel("pacified-cannot-throw-snare");
     }
 
+    private void OnRemoveEnsnareAlert(Entity<EnsnareableComponent> ent, ref RemoveEnsnareAlertEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        foreach (var ensnare in ent.Comp.Container.ContainedEntities)
+        {
+            if (!TryComp<EnsnaringComponent>(ensnare, out var ensnaringComponent))
+                return;
+
+            TryFree(ent, ent, ensnare, ensnaringComponent);
+
+            args.Handled = true;
+            // Only one snare at a time.
+            break;
+        }
+    }
+
     private void OnComponentRemove(EntityUid uid, EnsnaringComponent component, ComponentRemove args)
     {
         if (!TryComp<EnsnareableComponent>(component.Ensnared, out var ensnared))
@@ -109,7 +128,7 @@ public void TryEnsnare(EntityUid target, EntityUid ensnare, EnsnaringComponent c
     /// <param name="component">The ensnaring component</param>
     public void TryFree(EntityUid target, EntityUid user, EntityUid ensnare, EnsnaringComponent component)
     {
-        //Don't do anything if they don't have the ensnareable component.
+        // Don't do anything if they don't have the ensnareable component.
         if (!HasComp<EnsnareableComponent>(target))
             return;
 
@@ -121,7 +140,7 @@ public void TryFree(EntityUid target, EntityUid user, EntityUid ensnare, Ensnari
             BreakOnMove = breakOnMove,
             BreakOnDamage = false,
             NeedHand = true,
-            BlockDuplicate = true,
+            BreakOnDropItem = false,
         };
 
         if (!_doAfter.TryStartDoAfter(doAfterEventArgs))
diff --git a/Content.Server/EntityEffects/Effects/AreaReactionEffect.cs b/Content.Server/EntityEffects/Effects/AreaReactionEffect.cs
index 481f1fc27c5..858da2b3605 100644
--- a/Content.Server/EntityEffects/Effects/AreaReactionEffect.cs
+++ b/Content.Server/EntityEffects/Effects/AreaReactionEffect.cs
@@ -1,4 +1,5 @@
 using Content.Server.Fluids.EntitySystems;
+using Content.Server.Spreader;
 using Content.Shared.Audio;
 using Content.Shared.Coordinates.Helpers;
 using Content.Shared.Database;
@@ -64,16 +65,19 @@ public override void Effect(EntityEffectBaseArgs args)
             var transform = reagentArgs.EntityManager.GetComponent<TransformComponent>(reagentArgs.TargetEntity);
             var mapManager = IoCManager.Resolve<IMapManager>();
             var mapSys = reagentArgs.EntityManager.System<MapSystem>();
-            var sys = reagentArgs.EntityManager.System<TransformSystem>();
+            var spreaderSys = args.EntityManager.System<SpreaderSystem>();
+            var sys = args.EntityManager.System<TransformSystem>();
             var mapCoords = sys.GetMapCoordinates(reagentArgs.TargetEntity, xform: transform);
 
             if (!mapManager.TryFindGridAt(mapCoords, out var gridUid, out var grid) ||
-                !mapSys.TryGetTileRef(gridUid, grid, transform.Coordinates, out var tileRef) ||
-                tileRef.Tile.IsSpace())
+                !mapSys.TryGetTileRef(gridUid, grid, transform.Coordinates, out var tileRef))
             {
                 return;
             }
 
+            if (spreaderSys.RequiresFloorToSpread(_prototypeId) && tileRef.Tile.IsSpace())
+                return;
+
             var coords = mapSys.MapToGrid(gridUid, mapCoords);
             var ent = reagentArgs.EntityManager.SpawnEntity(_prototypeId, coords.SnapToGrid());
 
diff --git a/Content.Server/Execution/ExecutionSystem.cs b/Content.Server/Execution/ExecutionSystem.cs
index 1f1b2f82327..a22682f558b 100644
--- a/Content.Server/Execution/ExecutionSystem.cs
+++ b/Content.Server/Execution/ExecutionSystem.cs
@@ -331,7 +331,7 @@ private void OnDoafterGun(EntityUid uid, GunComponent component, DoAfterEvent ar
                 prototype.TryGetComponent<ProjectileComponent>(out var projectileA, _componentFactory); // sloth forgive me
                 if (projectileA != null)
                 {
-                    damage = projectileA.Damage * cartridge.Count;
+                    damage = projectileA.Damage;
                 }
 
                 // Expend the cartridge
@@ -342,8 +342,7 @@ private void OnDoafterGun(EntityUid uid, GunComponent component, DoAfterEvent ar
                 break;
 
             case AmmoComponent newAmmo:
-                TryComp<ProjectileComponent>(ammoUid, out var projectileB);
-                if (projectileB != null)
+                if (TryComp<ProjectileComponent>(ammoUid, out var projectileB))
                 {
                     damage = projectileB.Damage;
                 }
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs
index 55e8de26321..4b59c8f1c48 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs
@@ -3,12 +3,12 @@
 using Content.Shared.Atmos;
 using Content.Shared.Damage;
 using Content.Shared.Explosion;
+using Content.Shared.Explosion.EntitySystems;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Map.Components;
-
 namespace Content.Server.Explosion.EntitySystems;
 
-public sealed partial class ExplosionSystem : EntitySystem
+public sealed partial class ExplosionSystem : SharedExplosionSystem
 {
     [Dependency] private readonly DestructibleSystem _destructibleSystem = default!;
 
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.CVars.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.CVars.cs
index 3332d3a4f59..ce98f89de7a 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.CVars.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.CVars.cs
@@ -1,8 +1,8 @@
 using Content.Shared.CCVar;
-
+using Content.Shared.Explosion.EntitySystems;
 namespace Content.Server.Explosion.EntitySystems;
 
-public sealed partial class ExplosionSystem : EntitySystem
+public sealed partial class ExplosionSystem : SharedExplosionSystem
 {
     public int MaxIterations { get; private set; }
     public int MaxArea { get; private set; }
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs
index 556fe7c1415..75bb606441a 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Atmos;
 using Content.Shared.Explosion;
 using Content.Shared.Explosion.Components;
+using Content.Shared.Explosion.EntitySystems;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 
@@ -11,7 +12,7 @@ namespace Content.Server.Explosion.EntitySystems;
 // A good portion of it is focused around keeping track of what tile-indices on a grid correspond to tiles that border
 // space. AFAIK no other system currently needs to track these "edge-tiles". If they do, this should probably be a
 // property of the grid itself?
-public sealed partial class ExplosionSystem : EntitySystem
+public sealed partial class ExplosionSystem : SharedExplosionSystem
 {
     /// <summary>
     ///     Set of tiles of each grid that are directly adjacent to space, along with the directions that face space.
@@ -104,7 +105,7 @@ private void OnGridRemoved(GridRemovalEvent ev)
 
             var xforms = EntityManager.GetEntityQuery<TransformComponent>();
             var xform = xforms.GetComponent(gridToTransform);
-            var  (_, gridWorldRotation, gridWorldMatrix, invGridWorldMatrid) = xform.GetWorldPositionRotationMatrixWithInv(xforms);
+            var  (_, gridWorldRotation, gridWorldMatrix, invGridWorldMatrid) = _transformSystem.GetWorldPositionRotationMatrixWithInv(xform, xforms);
 
             var localEpicentre = (Vector2i) Vector2.Transform(epicentre.Position, invGridWorldMatrid);
             var matrix = offsetMatrix * gridWorldMatrix * targetMatrix;
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
index c30a9ce3006..6d0cbcf2794 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
@@ -1,9 +1,13 @@
+using System.Linq;
 using System.Numerics;
 using Content.Server.Atmos.EntitySystems;
+using Content.Server.Explosion.Components;
 using Content.Shared.CCVar;
 using Content.Shared.Damage;
+using Content.Shared.Database;
 using Content.Shared.Explosion;
 using Content.Shared.Explosion.Components;
+using Content.Shared.Explosion.EntitySystems;
 using Content.Shared.Maps;
 using Content.Shared.Physics;
 using Content.Shared.Projectiles;
@@ -13,14 +17,14 @@
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Dynamics;
+using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using TimedDespawnComponent = Robust.Shared.Spawners.TimedDespawnComponent;
-
 namespace Content.Server.Explosion.EntitySystems;
 
-public sealed partial class ExplosionSystem
+public sealed partial class ExplosionSystem : SharedExplosionSystem
 {
     [Dependency] private readonly FlammableSystem _flammableSystem = default!;
 
@@ -205,7 +209,8 @@ internal bool ExplodeTile(BroadphaseComponent lookup,
         MapCoordinates epicenter,
         HashSet<EntityUid> processed,
         string id,
-        float? fireStacks)
+        float? fireStacks,
+        EntityUid? cause)
     {
         var size = grid.Comp.TileSize;
         var gridBox = new Box2(tile * size, (tile + 1) * size);
@@ -224,7 +229,7 @@ internal bool ExplodeTile(BroadphaseComponent lookup,
         // process those entities
         foreach (var (uid, xform) in list)
         {
-            ProcessEntity(uid, epicenter, damage, throwForce, id, xform, fireStacks);
+            ProcessEntity(uid, epicenter, damage, throwForce, id, xform, fireStacks, cause);
         }
 
         // process anchored entities
@@ -234,7 +239,7 @@ internal bool ExplodeTile(BroadphaseComponent lookup,
         foreach (var entity in _anchored)
         {
             processed.Add(entity);
-            ProcessEntity(entity, epicenter, damage, throwForce, id, null, fireStacks);
+            ProcessEntity(entity, epicenter, damage, throwForce, id, null, fireStacks, cause);
         }
 
         // Walls and reinforced walls will break into girders. These girders will also be considered turf-blocking for
@@ -270,7 +275,7 @@ internal bool ExplodeTile(BroadphaseComponent lookup,
         {
             // Here we only throw, no dealing damage. Containers n such might drop their entities after being destroyed, but
             // they should handle their own damage pass-through, with their own damage reduction calculation.
-            ProcessEntity(uid, epicenter, null, throwForce, id, xform, null);
+            ProcessEntity(uid, epicenter, null, throwForce, id, xform, null, cause);
         }
 
         return !tileBlocked;
@@ -306,7 +311,8 @@ internal void ExplodeSpace(BroadphaseComponent lookup,
         MapCoordinates epicenter,
         HashSet<EntityUid> processed,
         string id,
-        float? fireStacks)
+        float? fireStacks,
+        EntityUid? cause)
     {
         var gridBox = Box2.FromDimensions(tile * DefaultTileSize, new Vector2(DefaultTileSize, DefaultTileSize));
         var worldBox = spaceMatrix.TransformBox(gridBox);
@@ -322,7 +328,7 @@ internal void ExplodeSpace(BroadphaseComponent lookup,
         foreach (var (uid, xform) in state.Item1)
         {
             processed.Add(uid);
-            ProcessEntity(uid, epicenter, damage, throwForce, id, xform, fireStacks);
+            ProcessEntity(uid, epicenter, damage, throwForce, id, xform, fireStacks, cause);
         }
 
         if (throwForce <= 0)
@@ -336,7 +342,7 @@ internal void ExplodeSpace(BroadphaseComponent lookup,
 
         foreach (var (uid, xform) in list)
         {
-            ProcessEntity(uid, epicenter, null, throwForce, id, xform, fireStacks);
+            ProcessEntity(uid, epicenter, null, throwForce, id, xform, fireStacks, cause);
         }
     }
 
@@ -434,13 +440,28 @@ private void ProcessEntity(
         float throwForce,
         string id,
         TransformComponent? xform,
-        float? fireStacksOnIgnite)
+        float? fireStacksOnIgnite,
+        EntityUid? cause)
     {
         if (originalDamage != null)
         {
             GetEntitiesToDamage(uid, originalDamage, id);
             foreach (var (entity, damage) in _toDamage)
             {
+                if (damage.GetTotal() > 0 && TryComp<ActorComponent>(entity, out var actorComponent))
+                {
+                    // Log damage to player entities only, cause this will create a massive amount of log spam otherwise.
+                    if (cause != null)
+                    {
+                        _adminLogger.Add(LogType.ExplosionHit, LogImpact.Medium, $"Explosion of {ToPrettyString(cause):actor} dealt {damage.GetTotal()} damage to {ToPrettyString(entity):subject}");
+                    }
+                    else
+                    {
+                        _adminLogger.Add(LogType.ExplosionHit, LogImpact.Medium, $"Explosion at {epicenter:epicenter} dealt {damage.GetTotal()} damage to {ToPrettyString(entity):subject}");
+                    }
+
+                }
+
                 // TODO EXPLOSIONS turn explosions into entities, and pass the the entity in as the damage origin.
                 _damageableSystem.TryChangeDamage(entity, damage, ignoreResistances: true);
 
@@ -647,6 +668,8 @@ struct ExplosionData
 
     public readonly EntityUid VisualEnt;
 
+    public readonly EntityUid? Cause;
+
     /// <summary>
     ///     Initialize a new instance for processing
     /// </summary>
@@ -663,9 +686,11 @@ public Explosion(ExplosionSystem system,
         bool canCreateVacuum,
         IEntityManager entMan,
         IMapManager mapMan,
-        EntityUid visualEnt)
+        EntityUid visualEnt,
+        EntityUid? cause)
     {
         VisualEnt = visualEnt;
+        Cause = cause;
         _system = system;
         ExplosionType = explosionType;
         _tileSetIntensity = tileSetIntensity;
@@ -829,7 +854,8 @@ public int Process(int processingTarget)
                     Epicenter,
                     ProcessedEntities,
                     ExplosionType.ID,
-                    ExplosionType.FireStacks);
+                    ExplosionType.FireStacks,
+                    Cause);
 
                 // If the floor is not blocked by some dense object, damage the floor tiles.
                 if (canDamageFloor)
@@ -847,7 +873,8 @@ public int Process(int processingTarget)
                     Epicenter,
                     ProcessedEntities,
                     ExplosionType.ID,
-                    ExplosionType.FireStacks);
+                    ExplosionType.FireStacks,
+                    Cause);
             }
 
             if (!MoveNext())
@@ -888,4 +915,5 @@ public sealed class QueuedExplosion
     public float TotalIntensity, Slope, MaxTileIntensity, TileBreakScale;
     public int MaxTileBreak;
     public bool CanCreateVacuum;
+    public EntityUid? Cause; // The entity that exploded, for logging purposes.
 }
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs
index 8b4c0e14c5f..8c3229e06ee 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs
@@ -7,13 +7,13 @@
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Timing;
-
+using Content.Shared.Explosion.EntitySystems;
 namespace Content.Server.Explosion.EntitySystems;
 
 // This partial part of the explosion system has all of the functions used to create the actual explosion map.
 // I.e, to get the sets of tiles & intensity values that describe an explosion.
 
-public sealed partial class ExplosionSystem : EntitySystem
+public sealed partial class ExplosionSystem : SharedExplosionSystem
 {
     /// <summary>
     ///     This is the main explosion generating function.
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Visuals.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Visuals.cs
index 5db8b55bf96..219dba4bdeb 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Visuals.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Visuals.cs
@@ -1,14 +1,14 @@
 using System.Numerics;
 using Content.Shared.Explosion;
 using Content.Shared.Explosion.Components;
+using Content.Shared.Explosion.EntitySystems;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameStates;
 using Robust.Shared.Map;
-
 namespace Content.Server.Explosion.EntitySystems;
 
 // This part of the system handled send visual / overlay data to clients.
-public sealed partial class ExplosionSystem : EntitySystem
+public sealed partial class ExplosionSystem : SharedExplosionSystem
 {
     public void InitVisuals()
     {
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
index b9f0f6fdb79..cd0ca1c22eb 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
@@ -16,6 +16,8 @@
 using Content.Shared.Inventory;
 using Content.Shared.Projectiles;
 using Content.Shared.Throwing;
+using Content.Shared.Explosion.Components;
+using Content.Shared.Explosion.EntitySystems;
 using Robust.Server.GameStates;
 using Robust.Server.Player;
 using Robust.Shared.Audio.Systems;
@@ -29,7 +31,7 @@
 
 namespace Content.Server.Explosion.EntitySystems;
 
-public sealed partial class ExplosionSystem : EntitySystem
+public sealed partial class ExplosionSystem : SharedExplosionSystem
 {
     [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
@@ -92,8 +94,6 @@ public override void Initialize()
 
         SubscribeLocalEvent<RoundRestartCleanupEvent>(OnReset);
 
-        SubscribeLocalEvent<ExplosionResistanceComponent, ArmorExamineEvent>(OnArmorExamine);
-
         // Handled by ExplosionSystem.Processing.cs
         SubscribeLocalEvent<MapChangedEvent>(OnMapChanged);
 
@@ -253,7 +253,7 @@ public void QueueExplosion(EntityUid uid,
 
         var posFound = _transformSystem.TryGetMapOrGridCoordinates(uid, out var gridPos, pos);
 
-        QueueExplosion(mapPos, typeId, totalIntensity, slope, maxTileIntensity, tileBreakScale, maxTileBreak, canCreateVacuum, addLog: false);
+        QueueExplosion(mapPos, typeId, totalIntensity, slope, maxTileIntensity, uid, tileBreakScale, maxTileBreak, canCreateVacuum, addLog: false);
 
         if (!addLog)
             return;
@@ -281,6 +281,7 @@ public void QueueExplosion(MapCoordinates epicenter,
         float totalIntensity,
         float slope,
         float maxTileIntensity,
+        EntityUid? cause,
         float tileBreakScale = 1f,
         int maxTileBreak = int.MaxValue,
         bool canCreateVacuum = true,
@@ -324,7 +325,8 @@ public void QueueExplosion(MapCoordinates epicenter,
             MaxTileIntensity = maxTileIntensity,
             TileBreakScale = tileBreakScale,
             MaxTileBreak = maxTileBreak,
-            CanCreateVacuum = canCreateVacuum
+            CanCreateVacuum = canCreateVacuum,
+            Cause = cause
         };
         _explosionQueue.Enqueue(boom);
         _queuedExplosions.Add(boom);
@@ -393,7 +395,8 @@ public void QueueExplosion(MapCoordinates epicenter,
             queued.CanCreateVacuum,
             EntityManager,
             _mapManager,
-            visualEnt);
+            visualEnt,
+            queued.Cause);
     }
 
     private void CameraShake(float range, MapCoordinates epicenter, float totalIntensity)
@@ -406,7 +409,7 @@ private void CameraShake(float range, MapCoordinates epicenter, float totalInten
             if (player.AttachedEntity is not EntityUid uid)
                 continue;
 
-            var playerPos = Transform(player.AttachedEntity!.Value).WorldPosition;
+            var playerPos = _transformSystem.GetWorldPosition(player.AttachedEntity!.Value);
             var delta = epicenter.Position - playerPos;
 
             if (delta.EqualsApprox(Vector2.Zero))
@@ -418,15 +421,4 @@ private void CameraShake(float range, MapCoordinates epicenter, float totalInten
                 _recoilSystem.KickCamera(uid, -delta.Normalized() * effect);
         }
     }
-
-    private void OnArmorExamine(EntityUid uid, ExplosionResistanceComponent component, ref ArmorExamineEvent args)
-    {
-        var value = MathF.Round((1f - component.DamageCoefficient) * 100, 1);
-
-        if (value == 0)
-            return;
-
-        args.Msg.PushNewline();
-        args.Msg.AddMarkupOrThrow(Loc.GetString(component.Examine, ("value", value)));
-    }
 }
diff --git a/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs b/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs
index f958373ac74..3d3c5d85630 100644
--- a/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Explosion.Components;
 using Content.Shared.Explosion.EntitySystems;
 using Content.Server.Fluids.EntitySystems;
+using Content.Server.Spreader;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Coordinates.Helpers;
 using Content.Shared.Maps;
@@ -17,6 +18,7 @@ public sealed class SmokeOnTriggerSystem : SharedSmokeOnTriggerSystem
     [Dependency] private readonly IMapManager _mapMan = default!;
     [Dependency] private readonly SmokeSystem _smoke = default!;
     [Dependency] private readonly TransformSystem _transform = default!;
+    [Dependency] private readonly SpreaderSystem _spreader = default!;
 
     public override void Initialize()
     {
@@ -31,11 +33,14 @@ private void OnTrigger(EntityUid uid, SmokeOnTriggerComponent comp, TriggerEvent
         var mapCoords = _transform.GetMapCoordinates(uid, xform);
         if (!_mapMan.TryFindGridAt(mapCoords, out _, out var grid) ||
             !grid.TryGetTileRef(xform.Coordinates, out var tileRef) ||
-            tileRef.Tile.IsSpace())
+            tileRef.Tile.IsEmpty)
         {
             return;
         }
 
+        if (_spreader.RequiresFloorToSpread(comp.SmokePrototype.ToString()) && tileRef.Tile.IsSpace())
+            return;
+
         var coords = grid.MapToGrid(mapCoords);
         var ent = Spawn(comp.SmokePrototype, coords.SnapToGrid());
         if (!TryComp<SmokeComponent>(ent, out var smoke))
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs
index dcd11062bb7..d06e9fa1c2d 100644
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs
@@ -1,9 +1,9 @@
 using Content.Server.Explosion.Components;
-using Content.Server.Sticky.Events;
 using Content.Shared.Examine;
 using Content.Shared.Explosion.Components;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Popups;
+using Content.Shared.Sticky;
 using Content.Shared.Verbs;
 
 namespace Content.Server.Explosion.EntitySystems;
@@ -21,7 +21,7 @@ private void InitializeOnUse()
         SubscribeLocalEvent<RandomTimerTriggerComponent, MapInitEvent>(OnRandomTimerTriggerMapInit);
     }
 
-    private void OnStuck(EntityUid uid, OnUseTimerTriggerComponent component, EntityStuckEvent args)
+    private void OnStuck(EntityUid uid, OnUseTimerTriggerComponent component, ref EntityStuckEvent args)
     {
         if (!component.StartOnStick)
             return;
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.TimedCollide.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.TimedCollide.cs
index 29b81deb32c..ea10b7c69b3 100644
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.TimedCollide.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.TimedCollide.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Server.Explosion.Components;
 using Content.Server.Explosion.EntitySystems;
 using Robust.Shared.Physics.Dynamics;
@@ -42,14 +42,15 @@ private void OnComponentRemove(EntityUid uid, TriggerOnTimedCollideComponent com
 
     private void UpdateTimedCollide(float frameTime)
     {
-        foreach (var (activeTrigger, triggerOnTimedCollide) in EntityQuery<ActiveTriggerOnTimedCollideComponent, TriggerOnTimedCollideComponent>())
+        var query = EntityQueryEnumerator<ActiveTriggerOnTimedCollideComponent, TriggerOnTimedCollideComponent>();
+        while (query.MoveNext(out var uid, out _, out var triggerOnTimedCollide))
         {
             foreach (var (collidingEntity, collidingTimer) in triggerOnTimedCollide.Colliding)
             {
                 triggerOnTimedCollide.Colliding[collidingEntity] += frameTime;
                 if (collidingTimer > triggerOnTimedCollide.Threshold)
                 {
-                    RaiseLocalEvent(activeTrigger.Owner, new TriggerEvent(activeTrigger.Owner, collidingEntity), true);
+                    RaiseLocalEvent(uid, new TriggerEvent(uid, collidingEntity), true);
                     triggerOnTimedCollide.Colliding[collidingEntity] -= triggerOnTimedCollide.Threshold;
                 }
             }
diff --git a/Content.Server/Explosion/EntitySystems/TwoStageTriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TwoStageTriggerSystem.cs
index 4e95eabff04..89950edf8c0 100644
--- a/Content.Server/Explosion/EntitySystems/TwoStageTriggerSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/TwoStageTriggerSystem.cs
@@ -30,13 +30,12 @@ private void LoadComponents(EntityUid uid, TwoStageTriggerComponent component)
     {
         foreach (var (name, entry) in component.SecondStageComponents)
         {
-            var comp = (Component) _factory.GetComponent(name);
-            var temp = (object) comp;
+            var comp = (Component)_factory.GetComponent(name);
+            var temp = (object)comp;
 
             if (EntityManager.TryGetComponent(uid, entry.Component.GetType(), out var c))
                 RemComp(uid, c);
 
-            comp.Owner = uid;
             _serializationManager.CopyTo(entry.Component, ref temp);
             EntityManager.AddComponent(uid, comp);
         }
diff --git a/Content.Server/Extinguisher/FireExtinguisherComponent.cs b/Content.Server/Extinguisher/FireExtinguisherComponent.cs
deleted file mode 100644
index 991fc76c62e..00000000000
--- a/Content.Server/Extinguisher/FireExtinguisherComponent.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Content.Shared.Extinguisher;
-using Robust.Shared.GameStates;
-
-namespace Content.Server.Extinguisher;
-
-[RegisterComponent]
-[Access(typeof(FireExtinguisherSystem))]
-public sealed partial class FireExtinguisherComponent : SharedFireExtinguisherComponent
-{
-}
diff --git a/Content.Server/Extinguisher/FireExtinguisherSystem.cs b/Content.Server/Extinguisher/FireExtinguisherSystem.cs
deleted file mode 100644
index b33a1af157f..00000000000
--- a/Content.Server/Extinguisher/FireExtinguisherSystem.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.Fluids.EntitySystems;
-using Content.Server.Popups;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Extinguisher;
-using Content.Shared.FixedPoint;
-using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
-using Content.Shared.Verbs;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-
-namespace Content.Server.Extinguisher;
-
-public sealed class FireExtinguisherSystem : EntitySystem
-{
-    [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
-    [Dependency] private readonly PopupSystem _popupSystem = default!;
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<FireExtinguisherComponent, ComponentInit>(OnFireExtinguisherInit);
-        SubscribeLocalEvent<FireExtinguisherComponent, UseInHandEvent>(OnUseInHand);
-        SubscribeLocalEvent<FireExtinguisherComponent, AfterInteractEvent>(OnAfterInteract);
-        SubscribeLocalEvent<FireExtinguisherComponent, GetVerbsEvent<InteractionVerb>>(OnGetInteractionVerbs);
-        SubscribeLocalEvent<FireExtinguisherComponent, SprayAttemptEvent>(OnSprayAttempt);
-    }
-
-    private void OnFireExtinguisherInit(Entity<FireExtinguisherComponent> entity, ref ComponentInit args)
-    {
-        if (entity.Comp.HasSafety)
-        {
-            UpdateAppearance((entity.Owner, entity.Comp));
-        }
-    }
-
-    private void OnUseInHand(Entity<FireExtinguisherComponent> entity, ref UseInHandEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        ToggleSafety((entity.Owner, entity.Comp), args.User);
-
-        args.Handled = true;
-    }
-
-    private void OnAfterInteract(Entity<FireExtinguisherComponent> entity, ref AfterInteractEvent args)
-    {
-        if (args.Target == null || !args.CanReach)
-        {
-            return;
-        }
-
-        if (args.Handled)
-            return;
-
-        if (entity.Comp.HasSafety && entity.Comp.Safety)
-        {
-            _popupSystem.PopupEntity(Loc.GetString("fire-extinguisher-component-safety-on-message"), entity.Owner, args.User);
-            return;
-        }
-
-        if (args.Target is not { Valid: true } target ||
-            !_solutionContainerSystem.TryGetDrainableSolution(target, out var targetSoln, out var targetSolution) ||
-            !_solutionContainerSystem.TryGetRefillableSolution(entity.Owner, out var containerSoln, out var containerSolution))
-        {
-            return;
-        }
-
-        args.Handled = true;
-
-        // TODO: why is this copy paste shit here just have fire extinguisher cancel transfer when safety is on
-        var transfer = containerSolution.AvailableVolume;
-        if (TryComp<SolutionTransferComponent>(entity.Owner, out var solTrans))
-        {
-            transfer = solTrans.TransferAmount;
-        }
-        transfer = FixedPoint2.Min(transfer, targetSolution.Volume);
-
-        if (transfer > 0)
-        {
-            var drained = _solutionContainerSystem.Drain(target, targetSoln.Value, transfer);
-            _solutionContainerSystem.TryAddSolution(containerSoln.Value, drained);
-
-            _audio.PlayPvs(entity.Comp.RefillSound, entity.Owner);
-            _popupSystem.PopupEntity(Loc.GetString("fire-extinguisher-component-after-interact-refilled-message", ("owner", entity.Owner)),
-                entity.Owner, args.Target.Value);
-        }
-    }
-
-    private void OnGetInteractionVerbs(Entity<FireExtinguisherComponent> entity, ref GetVerbsEvent<InteractionVerb> args)
-    {
-        if (!args.CanAccess || !args.CanInteract)
-            return;
-
-        var user = args.User;
-        var verb = new InteractionVerb
-        {
-            Act = () => ToggleSafety((entity.Owner, entity.Comp), user),
-            Text = Loc.GetString("fire-extinguisher-component-verb-text"),
-        };
-
-        args.Verbs.Add(verb);
-    }
-
-    private void OnSprayAttempt(Entity<FireExtinguisherComponent> entity, ref SprayAttemptEvent args)
-    {
-        if (entity.Comp.HasSafety && entity.Comp.Safety)
-        {
-            _popupSystem.PopupEntity(Loc.GetString("fire-extinguisher-component-safety-on-message"), entity, args.User);
-            args.Cancel();
-        }
-    }
-
-    private void UpdateAppearance(Entity<FireExtinguisherComponent, AppearanceComponent?> entity)
-    {
-        if (!Resolve(entity, ref entity.Comp2, false))
-            return;
-
-        if (entity.Comp1.HasSafety)
-        {
-            _appearance.SetData(entity, FireExtinguisherVisuals.Safety, entity.Comp1.Safety, entity.Comp2);
-        }
-    }
-
-    public void ToggleSafety(Entity<FireExtinguisherComponent?> extinguisher, EntityUid user)
-    {
-        if (!Resolve(extinguisher, ref extinguisher.Comp))
-            return;
-
-        extinguisher.Comp.Safety = !extinguisher.Comp.Safety;
-        _audio.PlayPvs(extinguisher.Comp.SafetySound, extinguisher, AudioParams.Default.WithVariation(0.125f).WithVolume(-4f));
-        UpdateAppearance((extinguisher.Owner, extinguisher.Comp));
-    }
-}
diff --git a/Content.Server/Fax/AdminUI/AdminFaxEui.cs b/Content.Server/Fax/AdminUI/AdminFaxEui.cs
index 452fc593d95..fe6b03fab7b 100644
--- a/Content.Server/Fax/AdminUI/AdminFaxEui.cs
+++ b/Content.Server/Fax/AdminUI/AdminFaxEui.cs
@@ -1,3 +1,4 @@
+using Content.Server.Construction.Conditions;
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.EUI;
 using Content.Shared.Eui;
@@ -56,7 +57,8 @@ public override void HandleMessage(EuiMessageBase msg)
             case AdminFaxEuiMsg.Send sendData:
             {
                 var printout = new FaxPrintout(sendData.Content, sendData.Title, null, null, sendData.StampState,
-                        new() { new StampDisplayInfo { StampedName = sendData.From, StampedColor = sendData.StampColor } });
+                        new() { new StampDisplayInfo { StampedName = sendData.From, StampedColor = sendData.StampColor } },
+                        locked: sendData.Locked);
                 _faxSystem.Receive(_entityManager.GetEntity(sendData.Target), printout);
                 break;
             }
diff --git a/Content.Server/Fax/FaxConstants.cs b/Content.Server/Fax/FaxConstants.cs
index 24ed7cbcf32..4b0ff7853eb 100644
--- a/Content.Server/Fax/FaxConstants.cs
+++ b/Content.Server/Fax/FaxConstants.cs
@@ -29,4 +29,5 @@ public static class FaxConstants
     public const string FaxPaperStampStateData = "fax_data_stamp_state";
     public const string FaxPaperStampedByData = "fax_data_stamped_by";
     public const string FaxSyndicateData = "fax_data_i_am_syndicate";
+    public const string FaxPaperLockedData = "fax_data_locked";
 }
diff --git a/Content.Server/Fax/FaxSystem.cs b/Content.Server/Fax/FaxSystem.cs
index 82acb3c60c3..18852ac7555 100644
--- a/Content.Server/Fax/FaxSystem.cs
+++ b/Content.Server/Fax/FaxSystem.cs
@@ -5,7 +5,6 @@
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.Labels;
-using Content.Server.Paper;
 using Content.Server.Popups;
 using Content.Server.Power.Components;
 using Content.Server.Tools;
@@ -53,16 +52,6 @@ public sealed class FaxSystem : EntitySystem
 
     private const string PaperSlotId = "Paper";
 
-    /// <summary>
-    ///     The prototype ID to use for faxed or copied entities if we can't get one from
-    ///     the paper entity for whatever reason.
-    /// </summary>
-    [ValidatePrototypeId<EntityPrototype>]
-    private const string DefaultPaperPrototypeId = "Paper";
-
-    [ValidatePrototypeId<EntityPrototype>]
-    private const string OfficePaperPrototypeId = "PaperOffice";
-
     public override void Initialize()
     {
         base.Initialize();
@@ -243,7 +232,8 @@ private void OnInteractUsing(EntityUid uid, FaxMachineComponent component, Inter
                 return;
             }
 
-            _adminLogger.Add(LogType.Action, LogImpact.Low,
+            _adminLogger.Add(LogType.Action,
+                LogImpact.Low,
                 $"{ToPrettyString(args.User):user} renamed {ToPrettyString(uid):tool} from \"{component.FaxName}\" to \"{newName}\"");
             component.FaxName = newName;
             _popupSystem.PopupEntity(Loc.GetString("fax-machine-popup-name-set"), uid);
@@ -300,8 +290,9 @@ private void OnPacketReceived(EntityUid uid, FaxMachineComponent component, Devi
                     args.Data.TryGetValue(FaxConstants.FaxPaperStampStateData, out string? stampState);
                     args.Data.TryGetValue(FaxConstants.FaxPaperStampedByData, out List<StampDisplayInfo>? stampedBy);
                     args.Data.TryGetValue(FaxConstants.FaxPaperPrototypeData, out string? prototypeId);
+                    args.Data.TryGetValue(FaxConstants.FaxPaperLockedData, out bool? locked);
 
-                    var printout = new FaxPrintout(content, name, label, prototypeId, stampState, stampedBy);
+                    var printout = new FaxPrintout(content, name, label, prototypeId, stampState, stampedBy, locked ?? false);
                     Receive(uid, printout, args.SenderAddress);
 
                     break;
@@ -324,7 +315,7 @@ private void OnFileButtonPressed(EntityUid uid, FaxMachineComponent component, F
     private void OnCopyButtonPressed(EntityUid uid, FaxMachineComponent component, FaxCopyMessage args)
     {
         if (HasComp<MobStateComponent>(component.PaperSlot.Item))
-            _faxecute.Faxecute(uid, component); /// when button pressed it will hurt the mob.
+            _faxecute.Faxecute(uid, component); // when button pressed it will hurt the mob.
         else
             Copy(uid, component, args);
     }
@@ -332,7 +323,7 @@ private void OnCopyButtonPressed(EntityUid uid, FaxMachineComponent component, F
     private void OnSendButtonPressed(EntityUid uid, FaxMachineComponent component, FaxSendMessage args)
     {
         if (HasComp<MobStateComponent>(component.PaperSlot.Item))
-            _faxecute.Faxecute(uid, component); /// when button pressed it will hurt the mob.
+            _faxecute.Faxecute(uid, component); // when button pressed it will hurt the mob.
         else
             Send(uid, component, args);
     }
@@ -425,11 +416,7 @@ public void Refresh(EntityUid uid, FaxMachineComponent? component = null)
     /// </summary>
     public void PrintFile(EntityUid uid, FaxMachineComponent component, FaxFileMessage args)
     {
-        string prototype;
-        if (args.OfficePaper)
-            prototype = OfficePaperPrototypeId;
-        else
-            prototype = DefaultPaperPrototypeId;
+        var prototype = args.OfficePaper ? component.PrintOfficePaperId : component.PrintPaperId;
 
         var name = Loc.GetString("fax-machine-printed-paper-name");
 
@@ -441,7 +428,8 @@ public void PrintFile(EntityUid uid, FaxMachineComponent component, FaxFileMessa
 
         // Unfortunately, since a paper entity does not yet exist, we have to emulate what LabelSystem will do.
         var nameWithLabel = (args.Label is { } label) ? $"{name} ({label})" : name;
-        _adminLogger.Add(LogType.Action, LogImpact.Low,
+        _adminLogger.Add(LogType.Action,
+            LogImpact.Low,
             $"{ToPrettyString(args.Actor):actor} " +
             $"added print job to \"{component.FaxName}\" {ToPrettyString(uid):tool} " +
             $"of {nameWithLabel}: {args.Content}");
@@ -471,9 +459,10 @@ public void Copy(EntityUid uid, FaxMachineComponent? component, FaxCopyMessage a
         var printout = new FaxPrintout(paper.Content,
                                        nameMod?.BaseName ?? metadata.EntityName,
                                        labelComponent?.CurrentLabel,
-                                       metadata.EntityPrototype?.ID ?? DefaultPaperPrototypeId,
+                                       metadata.EntityPrototype?.ID ?? component.PrintPaperId,
                                        paper.StampState,
-                                       paper.StampedBy);
+                                       paper.StampedBy,
+                                       paper.EditingDisabled);
 
         component.PrintingQueue.Enqueue(printout);
         component.SendTimeoutRemaining += component.SendTimeout;
@@ -483,7 +472,8 @@ public void Copy(EntityUid uid, FaxMachineComponent? component, FaxCopyMessage a
 
         UpdateUserInterface(uid, component);
 
-        _adminLogger.Add(LogType.Action, LogImpact.Low,
+        _adminLogger.Add(LogType.Action,
+            LogImpact.Low,
             $"{ToPrettyString(args.Actor):actor} " +
             $"added copy job to \"{component.FaxName}\" {ToPrettyString(uid):tool} " +
             $"of {ToPrettyString(sendEntity):subject}: {printout.Content}");
@@ -522,6 +512,7 @@ public void Send(EntityUid uid, FaxMachineComponent? component, FaxSendMessage a
             { FaxConstants.FaxPaperNameData, nameMod?.BaseName ?? metadata.EntityName },
             { FaxConstants.FaxPaperLabelData, labelComponent?.CurrentLabel },
             { FaxConstants.FaxPaperContentData, paper.Content },
+            { FaxConstants.FaxPaperLockedData, paper.EditingDisabled },
         };
 
         if (metadata.EntityPrototype != null)
@@ -529,7 +520,7 @@ public void Send(EntityUid uid, FaxMachineComponent? component, FaxSendMessage a
             // TODO: Ideally, we could just make a copy of the whole entity when it's
             // faxed, in order to preserve visuals, etc.. This functionality isn't
             // available yet, so we'll pass along the originating prototypeId and fall
-            // back to DefaultPaperPrototypeId in SpawnPaperFromQueue if we can't find one here.
+            // back to component.PrintPaperId in SpawnPaperFromQueue if we can't find one here.
             payload[FaxConstants.FaxPaperPrototypeData] = metadata.EntityPrototype.ID;
         }
 
@@ -541,7 +532,8 @@ public void Send(EntityUid uid, FaxMachineComponent? component, FaxSendMessage a
 
         _deviceNetworkSystem.QueuePacket(uid, component.DestinationFaxAddress, payload);
 
-        _adminLogger.Add(LogType.Action, LogImpact.Low,
+        _adminLogger.Add(LogType.Action,
+            LogImpact.Low,
             $"{ToPrettyString(args.Actor):actor} " +
             $"sent fax from \"{component.FaxName}\" {ToPrettyString(uid):tool} " +
             $"to \"{faxName}\" ({component.DestinationFaxAddress}) " +
@@ -583,21 +575,23 @@ private void SpawnPaperFromQueue(EntityUid uid, FaxMachineComponent? component =
 
         var printout = component.PrintingQueue.Dequeue();
 
-        var entityToSpawn = printout.PrototypeId.Length == 0 ? DefaultPaperPrototypeId : printout.PrototypeId;
+        var entityToSpawn = printout.PrototypeId.Length == 0 ? component.PrintPaperId.ToString() : printout.PrototypeId;
         var printed = EntityManager.SpawnEntity(entityToSpawn, Transform(uid).Coordinates);
 
         if (TryComp<PaperComponent>(printed, out var paper))
         {
-            _paperSystem.SetContent(printed, printout.Content);
+            _paperSystem.SetContent((printed, paper), printout.Content);
 
             // Apply stamps
             if (printout.StampState != null)
             {
                 foreach (var stamp in printout.StampedBy)
                 {
-                    _paperSystem.TryStamp(printed, stamp, printout.StampState);
+                    _paperSystem.TryStamp((printed, paper), stamp, printout.StampState);
                 }
             }
+
+            paper.EditingDisabled = printout.Locked;
         }
 
         _metaData.SetEntityName(printed, printout.Name);
diff --git a/Content.Server/Flash/DamagedByFlashingSystem.cs b/Content.Server/Flash/DamagedByFlashingSystem.cs
index cf0368ca42a..5b4c19b8e54 100644
--- a/Content.Server/Flash/DamagedByFlashingSystem.cs
+++ b/Content.Server/Flash/DamagedByFlashingSystem.cs
@@ -16,7 +16,7 @@ private void OnFlashAttempt(Entity<DamagedByFlashingComponent> ent, ref FlashAtt
     {
         _damageable.TryChangeDamage(ent, ent.Comp.FlashDamage);
 
-        //To Do: It would be more logical if different flashes had different power,
+        //TODO: It would be more logical if different flashes had different power,
         //and the damage would be inflicted depending on the strength of the flash.
     }
 }
diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
index 8cdae84a936..e722108e147 100644
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
+++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
@@ -70,13 +70,18 @@ private void SplashOnMeleeHit(Entity<SpillableComponent> entity, ref MeleeHitEve
             return;
 
         args.Handled = true;
+
+        // First update the hit count so anything that is not reactive wont count towards the total!
+        foreach (var hit in args.HitEntities)
+        {
+            if (!HasComp<ReactiveComponent>(hit))
+                hitCount -= 1;
+        }
+
         foreach (var hit in args.HitEntities)
         {
             if (!HasComp<ReactiveComponent>(hit))
-            {
-                hitCount -= 1; // so we don't undershoot solution calculation for actual reactive entities
                 continue;
-            }
 
             var splitSolution = _solutionContainerSystem.SplitSolution(soln.Value, totalSplit / hitCount);
 
diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
index a232ed8c0eb..67ba2a76bb1 100644
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
@@ -712,7 +712,7 @@ public void DoTileReactions(TileRef tileRef, Solution solution)
         {
             var (reagent, quantity) = solution.Contents[i];
             var proto = _prototypeManager.Index<ReagentPrototype>(reagent.Prototype);
-            var removed = proto.ReactionTile(tileRef, quantity, EntityManager);
+            var removed = proto.ReactionTile(tileRef, quantity, EntityManager, reagent.Data);
             if (removed <= FixedPoint2.Zero)
                 continue;
 
diff --git a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
index 78693bfdbcc..72450562f1e 100644
--- a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
@@ -315,7 +315,7 @@ private void ReactOnTile(EntityUid uid, SmokeComponent? component = null, Transf
                 continue;
 
             var reagent = _prototype.Index<ReagentPrototype>(reagentQuantity.Reagent.Prototype);
-            reagent.ReactionTile(tile, reagentQuantity.Quantity, EntityManager);
+            reagent.ReactionTile(tile, reagentQuantity.Quantity, EntityManager, reagentQuantity.Reagent.Data);
         }
     }
 
diff --git a/Content.Server/Fluids/EntitySystems/SpraySystem.cs b/Content.Server/Fluids/EntitySystems/SpraySystem.cs
index 5499070738f..215ed7c33ff 100644
--- a/Content.Server/Fluids/EntitySystems/SpraySystem.cs
+++ b/Content.Server/Fluids/EntitySystems/SpraySystem.cs
@@ -1,11 +1,11 @@
 using Content.Server.Chemistry.Components;
 using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.Chemistry.EntitySystems;
-using Content.Server.Extinguisher;
 using Content.Server.Fluids.Components;
 using Content.Server.Gravity;
 using Content.Server.Popups;
 using Content.Shared.FixedPoint;
+using Content.Shared.Fluids;
 using Content.Shared.Interaction;
 using Content.Shared.Timing;
 using Content.Shared.Vapor;
@@ -34,7 +34,7 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<SprayComponent, AfterInteractEvent>(OnAfterInteract, after: new[] { typeof(FireExtinguisherSystem) });
+        SubscribeLocalEvent<SprayComponent, AfterInteractEvent>(OnAfterInteract);
     }
 
     private void OnAfterInteract(Entity<SprayComponent> entity, ref AfterInteractEvent args)
@@ -48,7 +48,7 @@ private void OnAfterInteract(Entity<SprayComponent> entity, ref AfterInteractEve
             return;
 
         var ev = new SprayAttemptEvent(args.User);
-        RaiseLocalEvent(entity, ev);
+        RaiseLocalEvent(entity, ref ev);
         if (ev.Cancelled)
             return;
 
@@ -148,13 +148,3 @@ private void OnAfterInteract(Entity<SprayComponent> entity, ref AfterInteractEve
         _useDelay.TryResetDelay((entity, useDelay));
     }
 }
-
-public sealed class SprayAttemptEvent : CancellableEntityEventArgs
-{
-    public EntityUid User;
-
-    public SprayAttemptEvent(EntityUid user)
-    {
-        User = user;
-    }
-}
diff --git a/Content.Server/Forensics/Components/DnaSubstanceTraceComponent.cs b/Content.Server/Forensics/Components/DnaSubstanceTraceComponent.cs
new file mode 100644
index 00000000000..7b3cb978f21
--- /dev/null
+++ b/Content.Server/Forensics/Components/DnaSubstanceTraceComponent.cs
@@ -0,0 +1,9 @@
+namespace Content.Server.Forensics;
+
+/// <summary>
+/// This component stops the entity from leaving finger prints,
+/// usually so fibres can be left instead.
+/// </summary>
+[RegisterComponent]
+public sealed partial class DnaSubstanceTraceComponent : Component
+{ }
diff --git a/Content.Server/Forensics/Components/ForensicScannerComponent.cs b/Content.Server/Forensics/Components/ForensicScannerComponent.cs
index ad262138482..033ea913c3f 100644
--- a/Content.Server/Forensics/Components/ForensicScannerComponent.cs
+++ b/Content.Server/Forensics/Components/ForensicScannerComponent.cs
@@ -26,7 +26,13 @@ public sealed partial class ForensicScannerComponent : Component
         /// DNA that the forensic scanner found from the <see cref="DNAComponent"/> on an entity.
         /// </summary>
         [ViewVariables(VVAccess.ReadOnly), DataField("dnas")]
-        public List<string> DNAs = new();
+        public List<string> TouchDNAs = new();
+
+        /// <summary>
+        /// DNA that the forensic scanner found from the solution containers in an entity.
+        /// </summary>
+        [ViewVariables(VVAccess.ReadOnly), DataField]
+        public List<string> SolutionDNAs = new();
 
         /// <summary>
         /// Residue that the forensic scanner found from the <see cref="ForensicsComponent"/> on an entity.
diff --git a/Content.Server/Forensics/Systems/ForensicScannerSystem.cs b/Content.Server/Forensics/Systems/ForensicScannerSystem.cs
index 5e2a562577d..b6dc068f789 100644
--- a/Content.Server/Forensics/Systems/ForensicScannerSystem.cs
+++ b/Content.Server/Forensics/Systems/ForensicScannerSystem.cs
@@ -1,18 +1,21 @@
 using System.Linq;
 using System.Text;
-using Content.Server.Paper;
 using Content.Server.Popups;
 using Content.Shared.UserInterface;
 using Content.Shared.DoAfter;
+using Content.Shared.Fluids.Components;
 using Content.Shared.Forensics;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
+using Content.Shared.Paper;
 using Content.Shared.Verbs;
+using Content.Shared.Tag;
 using Robust.Shared.Audio.Systems;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
+using Content.Server.Chemistry.Containers.EntitySystems;
 // todo: remove this stinky LINQy
 
 namespace Content.Server.Forensics
@@ -27,6 +30,9 @@ public sealed class ForensicScannerSystem : EntitySystem
         [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
         [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
         [Dependency] private readonly MetaDataSystem _metaData = default!;
+        [Dependency] private readonly ForensicsSystem _forensicsSystem = default!;
+        [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
+        [Dependency] private readonly TagSystem _tag = default!;
 
         public override void Initialize()
         {
@@ -46,7 +52,8 @@ private void UpdateUserInterface(EntityUid uid, ForensicScannerComponent compone
             var state = new ForensicScannerBoundUserInterfaceState(
                 component.Fingerprints,
                 component.Fibers,
-                component.DNAs,
+                component.TouchDNAs,
+                component.SolutionDNAs,
                 component.Residues,
                 component.LastScannedName,
                 component.PrintCooldown,
@@ -69,18 +76,25 @@ private void OnDoAfter(EntityUid uid, ForensicScannerComponent component, DoAfte
                 {
                     scanner.Fingerprints = new();
                     scanner.Fibers = new();
-                    scanner.DNAs = new();
+                    scanner.TouchDNAs = new();
                     scanner.Residues = new();
                 }
-
                 else
                 {
                     scanner.Fingerprints = forensics.Fingerprints.ToList();
                     scanner.Fibers = forensics.Fibers.ToList();
-                    scanner.DNAs = forensics.DNAs.ToList();
+                    scanner.TouchDNAs = forensics.DNAs.ToList();
                     scanner.Residues = forensics.Residues.ToList();
                 }
 
+                if (_tag.HasTag(args.Args.Target.Value, "DNASolutionScannable"))
+                {
+                    scanner.SolutionDNAs = _forensicsSystem.GetSolutionsDNA(args.Args.Target.Value);
+                } else
+                {
+                    scanner.SolutionDNAs = new();
+                }
+
                 scanner.LastScannedName = MetaData(args.Args.Target.Value).EntityName;
             }
 
@@ -183,7 +197,7 @@ private void OnPrint(EntityUid uid, ForensicScannerComponent component, Forensic
             var printed = EntityManager.SpawnEntity(component.MachineOutput, Transform(uid).Coordinates);
             _handsSystem.PickupOrDrop(args.Actor, printed, checkActionBlocker: false);
 
-            if (!HasComp<PaperComponent>(printed))
+            if (!TryComp<PaperComponent>(printed, out var paperComp))
             {
                 Log.Error("Printed paper did not have PaperComponent.");
                 return;
@@ -206,8 +220,15 @@ private void OnPrint(EntityUid uid, ForensicScannerComponent component, Forensic
             }
             text.AppendLine();
             text.AppendLine(Loc.GetString("forensic-scanner-interface-dnas"));
-            foreach (var dna in component.DNAs)
+            foreach (var dna in component.TouchDNAs)
+            {
+                text.AppendLine(dna);
+            }
+            foreach (var dna in component.SolutionDNAs)
             {
+                Log.Debug(dna);
+                if (component.TouchDNAs.Contains(dna))
+                    continue;
                 text.AppendLine(dna);
             }
             text.AppendLine();
@@ -217,7 +238,7 @@ private void OnPrint(EntityUid uid, ForensicScannerComponent component, Forensic
                 text.AppendLine(residue);
             }
 
-            _paperSystem.SetContent(printed, text.ToString());
+            _paperSystem.SetContent((printed, paperComp), text.ToString());
             _audioSystem.PlayPvs(component.SoundPrint, uid,
                 AudioParams.Default
                 .WithVariation(0.25f)
@@ -232,7 +253,8 @@ private void OnClear(EntityUid uid, ForensicScannerComponent component, Forensic
         {
             component.Fingerprints = new();
             component.Fibers = new();
-            component.DNAs = new();
+            component.TouchDNAs = new();
+            component.SolutionDNAs = new();
             component.LastScannedName = string.Empty;
 
             UpdateUserInterface(uid, component);
diff --git a/Content.Server/Forensics/Systems/ForensicsSystem.cs b/Content.Server/Forensics/Systems/ForensicsSystem.cs
index c653fbb0627..b807236f866 100644
--- a/Content.Server/Forensics/Systems/ForensicsSystem.cs
+++ b/Content.Server/Forensics/Systems/ForensicsSystem.cs
@@ -1,11 +1,16 @@
 using Content.Server.Body.Components;
+using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.DoAfter;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Forensics.Components;
 using Content.Server.Popups;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Popups;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.DoAfter;
+using Content.Shared.Fluids.Components;
 using Content.Shared.Forensics;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
@@ -23,6 +28,8 @@ public sealed class ForensicsSystem : EntitySystem
         [Dependency] private readonly InventorySystem _inventory = default!;
         [Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
         [Dependency] private readonly PopupSystem _popupSystem = default!;
+        [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
+
         public override void Initialize()
         {
             SubscribeLocalEvent<FingerprintComponent, ContactInteractionEvent>(OnInteract);
@@ -30,14 +37,27 @@ public override void Initialize()
             SubscribeLocalEvent<FingerprintComponent, MapInitEvent>(OnFingerprintInit);
             SubscribeLocalEvent<DnaComponent, MapInitEvent>(OnDNAInit);
 
-            SubscribeLocalEvent<DnaComponent, BeingGibbedEvent>(OnBeingGibbed);
+            SubscribeLocalEvent<ForensicsComponent, 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);
+            SubscribeLocalEvent<DnaSubstanceTraceComponent, SolutionContainerChangedEvent>(OnSolutionChanged);
             SubscribeLocalEvent<CleansForensicsComponent, GetVerbsEvent<UtilityVerb>>(OnUtilityVerb);
+        }
 
+        private void OnSolutionChanged(Entity<DnaSubstanceTraceComponent> ent, ref SolutionContainerChangedEvent ev)
+        {
+            var soln = GetSolutionsDNA(ev.Solution);
+            if (soln.Count > 0)
+            {
+                var comp = EnsureComp<ForensicsComponent>(ent.Owner);
+                foreach (string dna in soln)
+                {
+                    comp.DNAs.Add(dna);
+                }
+            }
         }
 
         private void OnInteract(EntityUid uid, FingerprintComponent component, ContactInteractionEvent args)
@@ -59,15 +79,26 @@ private void OnFingerprintInit(EntityUid uid, FingerprintComponent component, Ma
 
         private void OnDNAInit(EntityUid uid, DnaComponent component, MapInitEvent args)
         {
-            component.DNA = GenerateDNA();
+            if (component.DNA == String.Empty)
+            {
+                component.DNA = GenerateDNA();
+
+                var ev = new GenerateDnaEvent { Owner = uid, DNA = component.DNA };
+                RaiseLocalEvent(uid, ref ev);
+            }
         }
 
-        private void OnBeingGibbed(EntityUid uid, DnaComponent component, BeingGibbedEvent args)
+        private void OnBeingGibbed(EntityUid uid, ForensicsComponent component, BeingGibbedEvent args)
         {
+            string dna = Loc.GetString("forensics-dna-unknown");
+
+            if (TryComp(uid, out DnaComponent? dnaComp))
+                dna = dnaComp.DNA;
+
             foreach (EntityUid part in args.GibbedParts)
             {
                 var partComp = EnsureComp<ForensicsComponent>(part);
-                partComp.DNAs.Add(component.DNA);
+                partComp.DNAs.Add(dna);
                 partComp.CanDnaBeCleaned = false;
             }
         }
@@ -114,6 +145,34 @@ public void CopyForensicsFrom(ForensicsComponent src, EntityUid target)
             }
         }
 
+        public List<string> GetSolutionsDNA(EntityUid uid)
+        {
+            List<string> list = new();
+            if (TryComp<SolutionContainerManagerComponent>(uid, out var comp))
+            {
+                foreach (var (_, soln) in _solutionContainerSystem.EnumerateSolutions((uid, comp)))
+                {
+                    list.AddRange(GetSolutionsDNA(soln.Comp.Solution));
+                }
+            }
+            return list;
+        }
+
+        public List<string> GetSolutionsDNA(Solution soln)
+        {
+            List<string> list = new();
+            foreach (var reagent in soln.Contents)
+            {
+                foreach (var data in reagent.Reagent.EnsureReagentData())
+                {
+                    if (data is DnaData)
+                    {
+                        list.Add(((DnaData) data).DNA);
+                    }
+                }
+            }
+            return list;
+        }
         private void OnAfterInteract(Entity<CleansForensicsComponent> cleanForensicsEntity, ref AfterInteractEvent args)
         {
             if (args.Handled || !args.CanReach || args.Target == null)
@@ -167,7 +226,6 @@ public bool TryStartCleaning(Entity<CleansForensicsComponent> cleanForensicsEnti
                 var cleanDelay = cleanForensicsEntity.Comp.CleanDelay;
                 var doAfterArgs = new DoAfterArgs(EntityManager, user, cleanDelay, new CleanForensicsDoAfterEvent(), cleanForensicsEntity, target: target, used: cleanForensicsEntity)
                 {
-                    BreakOnHandChange = true,
                     NeedHand = true,
                     BreakOnDamage = true,
                     BreakOnMove = true,
diff --git a/Content.Server/GameTicking/GameTicker.GamePreset.cs b/Content.Server/GameTicking/GameTicker.GamePreset.cs
index 6e297789528..5a2b375dd68 100644
--- a/Content.Server/GameTicking/GameTicker.GamePreset.cs
+++ b/Content.Server/GameTicking/GameTicker.GamePreset.cs
@@ -226,7 +226,7 @@ public bool OnGhostAttempt(EntityUid mindId, bool canReturnGlobal, bool viaComma
                 return false;
             }
 
-            if (HasComp<GhostComponent>(playerEntity))
+            if (TryComp<GhostComponent>(playerEntity, out var comp) && !comp.CanGhostInteract)
                 return false;
 
             if (mind.VisitingEntity != default)
diff --git a/Content.Server/GameTicking/GameTicker.GameRule.cs b/Content.Server/GameTicking/GameTicker.GameRule.cs
index a6d0a4baf0a..c10f3023471 100644
--- a/Content.Server/GameTicking/GameTicker.GameRule.cs
+++ b/Content.Server/GameTicking/GameTicker.GameRule.cs
@@ -1,9 +1,9 @@
 using System.Linq;
 using Content.Server.Administration;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Shared.Administration;
 using Content.Shared.Database;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Prototypes;
 using JetBrains.Annotations;
 using Robust.Shared.Console;
@@ -324,6 +324,13 @@ private void AddGameRuleCommand(IConsoleShell shell, string argstr, string[] arg
 
         foreach (var rule in args)
         {
+            if (!_prototypeManager.HasIndex(rule))
+            {
+                shell.WriteError($"Invalid game rule {rule} was skipped.");
+
+                continue;
+            }
+
             if (shell.Player != null)
             {
                 _adminLogger.Add(LogType.EventStarted, $"{shell.Player} tried to add game rule [{rule}] via command");
diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
index c957e0eb96f..ca087c46ed4 100644
--- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs
+++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
@@ -171,7 +171,7 @@ public IReadOnlyList<EntityUid> LoadGameMap(GameMapPrototype map, MapId targetMa
 
             var gridIds = _map.LoadMap(targetMapId, ev.GameMap.MapPath.ToString(), ev.Options);
 
-            _metaData.SetEntityName(_mapManager.GetMapEntityId(targetMapId), $"station map - {map.MapName}");
+            _metaData.SetEntityName(_mapManager.GetMapEntityId(targetMapId), map.MapName);
 
             var gridUids = gridIds.ToList();
             RaiseLocalEvent(new PostGameMapLoad(map, targetMapId, gridUids, stationName));
diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs
index 5122fe7fd8e..038625ec586 100644
--- a/Content.Server/GameTicking/GameTicker.Spawning.cs
+++ b/Content.Server/GameTicking/GameTicker.Spawning.cs
@@ -7,16 +7,12 @@
 using Content.Server.Spawners.Components;
 using Content.Server.Speech.Components;
 using Content.Server.Station.Components;
-using Content.Server.Access.Components;
 using Content.Shared.Database;
 using Content.Shared.Mind;
 using Content.Shared.Players;
 using Content.Shared.Preferences;
-using Content.Shared.Preferences.Loadouts;
 using Content.Shared.Roles;
 using Content.Shared.Roles.Jobs;
-using Content.Shared.Clothing;
-using Content.Shared.PDA;
 using JetBrains.Annotations;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
@@ -25,13 +21,13 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
+
 namespace Content.Server.GameTicking
 {
     public sealed partial class GameTicker
     {
         [Dependency] private readonly IAdminManager _adminManager = default!;
         [Dependency] private readonly SharedJobSystem _jobs = default!;
-        [Dependency] private readonly IComponentFactory _componentFactory = default!; // DeltaV #1425
 
         [ValidatePrototypeId<EntityPrototype>]
         public const string ObserverPrototypeName = "MobObserver";
@@ -228,30 +224,6 @@ private void SpawnPlayer(ICommonSession player,
 
             var jobPrototype = _prototypeManager.Index<JobPrototype>(jobId);
             var job = new JobComponent {Prototype = jobId};
-            // DeltaV #1425 - Loadout stuff to get Senior ID
-            // Get the PresetIdCardComponent and its VirtualJobName/Icon vars;
-            var jobLoadout = LoadoutSystem.GetJobPrototype(jobPrototype.ID);
-
-            if (_prototypeManager.TryIndex(jobLoadout, out RoleLoadoutPrototype? roleProto))
-            {
-                RoleLoadout? loadout = null;
-                character.Loadouts.TryGetValue(jobLoadout, out loadout);
-
-                // Set to default if not present
-                if (loadout == null)
-                {
-                    loadout = new RoleLoadout(jobLoadout);
-                    loadout.SetDefault(character, player, _prototypeManager);
-                }
-
-                // Get the ID
-                if (GetPresetIdFromLoadout(loadout, roleProto, character, out var presetId))
-                {
-                    job.VirtualJobName = presetId?.VirtualJobName;
-                    job.VirtualJobIcon = presetId?.VirtualJobIcon;
-                }
-            }
-            // End of DeltaV code
             _roles.MindAddRole(newMind, job, silent: silent);
             var jobName = _jobs.MindTryGetJobName(newMind);
 
@@ -265,7 +237,7 @@ private void SpawnPlayer(ICommonSession player,
                 spawnPointType = SpawnPointType.Job;
             }
 
-            var mobMaybe = _stationSpawning.SpawnPlayerCharacterOnStation(station, job, character, spawnPointType: spawnPointType);
+            var mobMaybe = _stationSpawning.SpawnPlayerCharacterOnStation(station, job, character, spawnPointType: spawnPointType); // DeltaV: pass in spawn point type
             DebugTools.AssertNotNull(mobMaybe);
             var mob = mobMaybe!.Value;
 
@@ -330,7 +302,7 @@ private void SpawnPlayer(ICommonSession player,
             PlayersJoinedRoundNormally++;
             var aev = new PlayerSpawnCompleteEvent(mob,
                 player,
-                job, // DeltaV #1425 - Use Job instead of JobId to pass VirtualJobLocalizedName/Icon.
+                jobId,
                 lateJoin,
                 PlayersJoinedRoundNormally,
                 station,
@@ -338,57 +310,6 @@ private void SpawnPlayer(ICommonSession player,
             RaiseLocalEvent(mob, aev, true);
         }
 
-        // DeltaV #1425 - Go through loadout items to find ID card and its attached job
-        private bool GetPresetIdFromLoadout(RoleLoadout loadout, RoleLoadoutPrototype roleProto, HumanoidCharacterProfile character, out PresetIdCardComponent? presetId)
-        {
-            presetId = null;
-            // Use to read job loadout and find an ID card
-            foreach (var group in loadout.SelectedLoadouts.OrderBy(x => roleProto.Groups.FindIndex(e => e == x.Key)))
-            {
-                foreach (var items in group.Value)
-                {
-                    if (!_prototypeManager.TryIndex(items.Prototype, out var loadoutProto))
-                    {
-                        Log.Debug($"Unable to find loadout prototype for {items.Prototype}");
-                        continue;
-                    }
-                    if (!_prototypeManager.TryIndex(loadoutProto.Equipment, out var startingGear))
-                    {
-                        Log.Debug($"Unable to find starting gear {loadoutProto.Equipment} for loadout {loadoutProto}");
-                        continue;
-                    }
-                    var entProtoId = startingGear.GetGear("id");
-                    if (!_prototypeManager.TryIndex<EntityPrototype>(entProtoId, out var idProto))
-                    {
-                        Log.Debug($"Unable to find prototype for {startingGear} for starting gear {loadoutProto.Equipment} for loadout {loadoutProto}");
-                        continue;
-                    }
-                    if (idProto.TryGetComponent<PdaComponent>(out var pdaComponent, _componentFactory) && pdaComponent.IdCard != null)
-                    {
-                        ProtoId<EntityPrototype> idProtoId = pdaComponent.IdCard;
-                        if (!_prototypeManager.TryIndex<EntityPrototype>(idProtoId, out idProto))
-                        {
-                            Log.Warning($"Unable to find an idCard in {idProto}");
-                            return false;
-                        }
-                    }
-
-                    if (!idProto.TryGetComponent<PresetIdCardComponent>(out var idComponent, _componentFactory))
-                    {
-                        Log.Debug($"Unable to find presetIdCard for {idProto}");
-                        continue;
-                    }
-
-                    presetId = idComponent;
-                    Log.Debug($"Successfully outputted {presetId} from {idProto}");
-                    return true;
-                }
-            }
-            Log.Warning($"All other options exhausted");
-            return false;
-        }
-        // End of DeltaV code
-
         public void Respawn(ICommonSession player)
         {
             _mind.WipeMind(player);
@@ -579,7 +500,7 @@ public sealed class PlayerSpawnCompleteEvent : EntityEventArgs
     {
         public EntityUid Mob { get; }
         public ICommonSession Player { get; }
-        public JobComponent? Job { get; } // DeltaV #1425 - Replace JobId with Job to parse VirtualJob
+        public string? JobId { get; }
         public bool LateJoin { get; }
         public EntityUid Station { get; }
         public HumanoidCharacterProfile Profile { get; }
@@ -589,7 +510,7 @@ public sealed class PlayerSpawnCompleteEvent : EntityEventArgs
 
         public PlayerSpawnCompleteEvent(EntityUid mob,
             ICommonSession player,
-            JobComponent? job, // DeltaV #1425
+            string? jobId,
             bool lateJoin,
             int joinOrder,
             EntityUid station,
@@ -597,7 +518,7 @@ public PlayerSpawnCompleteEvent(EntityUid mob,
         {
             Mob = mob;
             Player = player;
-            Job = job; // DeltaV #1425
+            JobId = jobId;
             LateJoin = lateJoin;
             Station = station;
             Profile = profile;
diff --git a/Content.Server/GameTicking/Rules/AntagLoadProfileRuleSystem.cs b/Content.Server/GameTicking/Rules/AntagLoadProfileRuleSystem.cs
index fd3fb6cd655..3527e2a11c2 100644
--- a/Content.Server/GameTicking/Rules/AntagLoadProfileRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/AntagLoadProfileRuleSystem.cs
@@ -30,10 +30,20 @@ private void OnSelectEntity(Entity<AntagLoadProfileRuleComponent> ent, ref Antag
         var profile = args.Session != null
             ? _prefs.GetPreferences(args.Session.UserId).SelectedCharacter as HumanoidCharacterProfile
             : HumanoidCharacterProfile.RandomWithSpecies();
-        if (profile?.Species is not {} speciesId || !_proto.TryIndex<SpeciesPrototype>(speciesId, out var species))
+
+
+        if (profile?.Species is not { } speciesId || !_proto.TryIndex(speciesId, out var species))
+        {
             species = _proto.Index<SpeciesPrototype>(SharedHumanoidAppearanceSystem.DefaultSpecies);
+        }
+
+        if (ent.Comp.SpeciesOverride != null
+            && (ent.Comp.SpeciesOverrideBlacklist?.Contains(new ProtoId<SpeciesPrototype>(species.ID)) ?? false))
+        {
+            species = _proto.Index(ent.Comp.SpeciesOverride.Value);
+        }
 
         args.Entity = Spawn(species.Prototype);
-        _humanoid.LoadProfile(args.Entity.Value, profile);
+        _humanoid.LoadProfile(args.Entity.Value, profile?.WithSpecies(species.ID));
     }
 }
diff --git a/Content.Server/GameTicking/Rules/Components/AntagLoadProfileRuleCOmponent.cs b/Content.Server/GameTicking/Rules/Components/AntagLoadProfileRuleCOmponent.cs
index 5e58fd14fc0..3a4cb5fc75e 100644
--- a/Content.Server/GameTicking/Rules/Components/AntagLoadProfileRuleCOmponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/AntagLoadProfileRuleCOmponent.cs
@@ -1,7 +1,23 @@
+using Content.Shared.Humanoid.Prototypes;
+using Robust.Shared.Prototypes;
+
 namespace Content.Server.GameTicking.Rules.Components;
 
 /// <summary>
 /// Makes this rules antags spawn a humanoid, either from the player's profile or a random one.
 /// </summary>
 [RegisterComponent]
-public sealed partial class AntagLoadProfileRuleComponent : Component;
+public sealed partial class AntagLoadProfileRuleComponent : Component
+{
+    /// <summary>
+    /// If specified, the profile loaded will be made into this species if the chosen species matches the blacklist.
+    /// </summary>
+    [DataField]
+    public ProtoId<SpeciesPrototype>? SpeciesOverride;
+
+    /// <summary>
+    /// List of species that trigger the override
+    /// </summary>
+    [DataField]
+    public HashSet<ProtoId<SpeciesPrototype>>? SpeciesOverrideBlacklist;
+}
diff --git a/Content.Server/GameTicking/Rules/Components/GenericAntagRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/GenericAntagRuleComponent.cs
deleted file mode 100644
index 8d212ebaa3e..00000000000
--- a/Content.Server/GameTicking/Rules/Components/GenericAntagRuleComponent.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Content.Server.GameTicking.Rules;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
-
-namespace Content.Server.GameTicking.Rules.Components;
-
-/// <summary>
-/// Gamerule for simple antagonists that have fixed objectives.
-/// </summary>
-[RegisterComponent, Access(typeof(GenericAntagRuleSystem))]
-public sealed partial class GenericAntagRuleComponent : Component
-{
-    /// <summary>
-    /// All antag minds that are using this rule.
-    /// </summary>
-    [DataField]
-    public List<EntityUid> Minds = new();
-
-    /// <summary>
-    /// Locale id for the name of the antag used by the roundend summary.
-    /// </summary>
-    [DataField(required: true), ViewVariables(VVAccess.ReadWrite)]
-    public string AgentName = string.Empty;
-
-    /// <summary>
-    /// List of objective entity prototypes to add to the antag when a mind is added.
-    /// </summary>
-    [DataField(required: true)]
-    public List<EntProtoId> Objectives = new();
-}
diff --git a/Content.Server/GameTicking/Rules/Components/NinjaRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/NinjaRuleComponent.cs
deleted file mode 100644
index fa352eb320b..00000000000
--- a/Content.Server/GameTicking/Rules/Components/NinjaRuleComponent.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Content.Server.Ninja.Systems;
-using Content.Shared.Communications;
-using Content.Shared.Random;
-using Robust.Shared.Audio;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.GameTicking.Rules.Components;
-
-/// <summary>
-/// Stores some configuration used by the ninja system.
-/// Objectives and roundend summary are handled by <see cref="GenericAntagRuleComponent"/>.
-/// </summary>
-[RegisterComponent, Access(typeof(SpaceNinjaSystem))]
-public sealed partial class NinjaRuleComponent : Component
-{
-    /// <summary>
-    /// List of threats that can be called in. Copied onto <see cref="CommsHackerComponent"/> when gloves are enabled.
-    /// </summary>
-    [DataField(required: true)]
-    public ProtoId<WeightedRandomPrototype> Threats = string.Empty;
-
-    /// <summary>
-    /// Sound played when making the player a ninja via antag control or ghost role
-    /// </summary>
-    [DataField]
-    public SoundSpecifier? GreetingSound = new SoundPathSpecifier("/Audio/Misc/ninja_greeting.ogg");
-}
diff --git a/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs b/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs
index 9e3203d170b..557e44f0952 100644
--- a/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs
@@ -1,12 +1,12 @@
 using System.Linq;
 using Content.Server.Administration.Commands;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.KillTracking;
 using Content.Server.Mind;
 using Content.Server.Points;
 using Content.Server.RoundEnd;
 using Content.Server.Station.Systems;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Points;
 using Content.Shared.Storage;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/GameTicking/Rules/GameRulePrototype.cs b/Content.Server/GameTicking/Rules/GameRulePrototype.cs
deleted file mode 100644
index 47f99184f73..00000000000
--- a/Content.Server/GameTicking/Rules/GameRulePrototype.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-namespace Content.Server.GameTicking.Rules;
-
-/*
-[Prototype("gameRule")]
-public sealed partial class GameRulePrototype : IPrototype
-{
-    [IdDataField]
-    public string ID { get; private set; } = default!;
-
-    [DataField("config", required: true)]
-    public GameRuleConfiguration Configuration { get; private set; } = default!;
-}
-*/
diff --git a/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs b/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs
index 9ac7a6edbb9..5a5eb720cfb 100644
--- a/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs
+++ b/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs
@@ -1,8 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Station.Components;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Random.Helpers;
 using Robust.Server.GameObjects;
 using Robust.Shared.Collections;
diff --git a/Content.Server/GameTicking/Rules/GameRuleSystem.cs b/Content.Server/GameTicking/Rules/GameRuleSystem.cs
index 05374aa1396..730748ce6b9 100644
--- a/Content.Server/GameTicking/Rules/GameRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/GameRuleSystem.cs
@@ -1,6 +1,6 @@
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Chat.Managers;
-using Content.Server.GameTicking.Components;
+using Content.Shared.GameTicking.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
diff --git a/Content.Server/GameTicking/Rules/GenericAntagRuleSystem.cs b/Content.Server/GameTicking/Rules/GenericAntagRuleSystem.cs
deleted file mode 100644
index 0367aa1460c..00000000000
--- a/Content.Server/GameTicking/Rules/GenericAntagRuleSystem.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using Content.Server.GameTicking.Rules.Components;
-using Content.Server.Objectives;
-using Content.Shared.Mind;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-
-namespace Content.Server.GameTicking.Rules;
-
-/// <summary>
-/// Handles round end text for simple antags.
-/// Adding objectives is handled in its own system.
-/// </summary>
-public sealed class GenericAntagRuleSystem : GameRuleSystem<GenericAntagRuleComponent>
-{
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<GenericAntagRuleComponent, ObjectivesTextGetInfoEvent>(OnObjectivesTextGetInfo);
-    }
-
-    /// <summary>
-    /// Start a simple antag's game rule.
-    /// If it is invalid the rule is deleted and null is returned.
-    /// </summary>
-    public bool StartRule(string rule, EntityUid mindId, [NotNullWhen(true)] out EntityUid? ruleId, [NotNullWhen(true)] out GenericAntagRuleComponent? comp)
-    {
-        ruleId = GameTicker.AddGameRule(rule);
-        if (!TryComp<GenericAntagRuleComponent>(ruleId, out comp))
-        {
-            Log.Error($"Simple antag rule prototype {rule} is invalid, deleting it.");
-            Del(ruleId);
-            ruleId = null;
-            return false;
-        }
-
-        if (!GameTicker.StartGameRule(ruleId.Value))
-        {
-            Log.Error($"Simple antag rule prototype {rule} failed to start, deleting it.");
-            Del(ruleId);
-            ruleId = null;
-            comp = null;
-            return false;
-        }
-
-        comp.Minds.Add(mindId);
-        return true;
-    }
-
-    private void OnObjectivesTextGetInfo(EntityUid uid, GenericAntagRuleComponent comp, ref ObjectivesTextGetInfoEvent args)
-    {
-        // just temporary until this is deleted
-        args.Minds = comp.Minds.Select(mindId => (mindId, Comp<MindComponent>(mindId).CharacterName ?? "?")).ToList();
-        args.AgentName = Loc.GetString(comp.AgentName);
-    }
-}
diff --git a/Content.Server/GameTicking/Rules/InactivityTimeRestartRuleSystem.cs b/Content.Server/GameTicking/Rules/InactivityTimeRestartRuleSystem.cs
index 01fa387595c..e56537c4381 100644
--- a/Content.Server/GameTicking/Rules/InactivityTimeRestartRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/InactivityTimeRestartRuleSystem.cs
@@ -1,7 +1,7 @@
 using System.Threading;
 using Content.Server.Chat.Managers;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
+using Content.Shared.GameTicking.Components;
 using Robust.Server.Player;
 using Robust.Shared.Player;
 using Timer = Robust.Shared.Timing.Timer;
diff --git a/Content.Server/GameTicking/Rules/KillCalloutRuleSystem.cs b/Content.Server/GameTicking/Rules/KillCalloutRuleSystem.cs
index 3da55e30c9e..8f706fd2ad3 100644
--- a/Content.Server/GameTicking/Rules/KillCalloutRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/KillCalloutRuleSystem.cs
@@ -1,8 +1,8 @@
 using Content.Server.Chat.Managers;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.KillTracking;
 using Content.Shared.Chat;
+using Content.Shared.GameTicking.Components;
 using Robust.Server.Player;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
diff --git a/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs b/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs
index 1c09d6e86e1..d2686ecdcdd 100644
--- a/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs
@@ -1,6 +1,6 @@
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.GridPreloader;
+using Content.Shared.GameTicking.Components;
 using Robust.Server.GameObjects;
 using Robust.Server.Maps;
 using Robust.Shared.Map;
@@ -13,7 +13,6 @@ public sealed class LoadMapRuleSystem : GameRuleSystem<LoadMapRuleComponent>
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly MapSystem _map = default!;
     [Dependency] private readonly MapLoaderSystem _mapLoader = default!;
-    [Dependency] private readonly MetaDataSystem _metaData = default!;
     [Dependency] private readonly TransformSystem _transform = default!;
     [Dependency] private readonly GridPreloaderSystem _gridPreloader = default!;
 
diff --git a/Content.Server/GameTicking/Rules/MaxTimeRestartRuleSystem.cs b/Content.Server/GameTicking/Rules/MaxTimeRestartRuleSystem.cs
index cae99fee9fc..db9df8a5b00 100644
--- a/Content.Server/GameTicking/Rules/MaxTimeRestartRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/MaxTimeRestartRuleSystem.cs
@@ -1,7 +1,7 @@
 using System.Threading;
 using Content.Server.Chat.Managers;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
+using Content.Shared.GameTicking.Components;
 using Timer = Robust.Shared.Timing.Timer;
 
 namespace Content.Server.GameTicking.Rules;
diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
index 6688bfd980c..5f49557bed8 100644
--- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
@@ -11,6 +11,7 @@
 using Content.Server.Station.Components;
 using Content.Server.Store.Components;
 using Content.Server.Store.Systems;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.NPC.Components;
@@ -24,7 +25,6 @@
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 using System.Linq;
-using Content.Server.GameTicking.Components;
 using Content.Shared.Store.Components;
 
 namespace Content.Server.GameTicking.Rules;
@@ -57,13 +57,12 @@ public override void Initialize()
         SubscribeLocalEvent<NukeOperativeComponent, MobStateChangedEvent>(OnMobStateChanged);
         SubscribeLocalEvent<NukeOperativeComponent, EntityZombifiedEvent>(OnOperativeZombified);
 
-        SubscribeLocalEvent<NukeOpsShuttleComponent, MapInitEvent>(OnMapInit);
-
         SubscribeLocalEvent<ConsoleFTLAttemptEvent>(OnShuttleFTLAttempt);
         SubscribeLocalEvent<WarDeclaredEvent>(OnWarDeclared);
         SubscribeLocalEvent<CommunicationConsoleCallShuttleAttemptEvent>(OnShuttleCallAttempt);
 
         SubscribeLocalEvent<NukeopsRuleComponent, AfterAntagEntitySelectedEvent>(OnAfterAntagEntSelected);
+        SubscribeLocalEvent<NukeopsRuleComponent, RuleLoadedGridsEvent>(OnRuleLoadedGrids);
     }
 
     protected override void Started(EntityUid uid, NukeopsRuleComponent component, GameRuleComponent gameRule,
@@ -256,17 +255,18 @@ private void OnOperativeZombified(EntityUid uid, NukeOperativeComponent componen
         RemCompDeferred(uid, component);
     }
 
-    private void OnMapInit(Entity<NukeOpsShuttleComponent> ent, ref MapInitEvent args)
+    private void OnRuleLoadedGrids(Entity<NukeopsRuleComponent> ent, ref RuleLoadedGridsEvent args)
     {
-        var map = Transform(ent).MapID;
-
-        var rules = EntityQueryEnumerator<NukeopsRuleComponent, RuleGridsComponent>();
-        while (rules.MoveNext(out var uid, out _, out var grids))
+        // Check each nukie shuttle
+        var query = EntityQueryEnumerator<NukeOpsShuttleComponent>();
+        while (query.MoveNext(out var uid, out var shuttle))
         {
-            if (map != grids.Map)
-                continue;
-            ent.Comp.AssociatedRule = uid;
-            break;
+            // Check if the shuttle's mapID is the one that just got loaded for this rule
+            if (Transform(uid).MapID == args.Map)
+            {
+                shuttle.AssociatedRule = ent;
+                break;
+            }
         }
     }
 
@@ -376,7 +376,7 @@ private void DistributeExtraTc(Entity<NukeopsRuleComponent> nukieRule)
             if (Transform(uid).MapID != Transform(outpost).MapID) // Will receive bonus TC only on their start outpost
                 continue;
 
-            _store.TryAddCurrency(new () { { TelecrystalCurrencyPrototype, nukieRule.Comp.WarTcAmountPerNukie } }, uid, component);
+            _store.TryAddCurrency(new() { { TelecrystalCurrencyPrototype, nukieRule.Comp.WarTcAmountPerNukie } }, uid, component);
 
             var msg = Loc.GetString("store-currency-war-boost-given", ("target", uid));
             _popupSystem.PopupEntity(msg, uid);
@@ -483,7 +483,7 @@ private void OnAfterAntagEntSelected(Entity<NukeopsRuleComponent> ent, ref After
         if (!Resolve(ent, ref ent.Comp, false))
             return null;
 
-        return ent.Comp.MapGrids.Where(e => HasComp<StationMemberComponent>(e) && !HasComp<NukeOpsShuttleComponent>(e)).FirstOrNull();
+        return ent.Comp.MapGrids.Where(e => !HasComp<NukeOpsShuttleComponent>(e)).FirstOrNull();
     }
 
     /// <remarks>
diff --git a/Content.Server/GameTicking/Rules/RespawnRuleSystem.cs b/Content.Server/GameTicking/Rules/RespawnRuleSystem.cs
index 3f8d31f622f..38102f1a2e9 100644
--- a/Content.Server/GameTicking/Rules/RespawnRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/RespawnRuleSystem.cs
@@ -1,9 +1,9 @@
 using Content.Server.Chat.Managers;
 using Content.Server.Database.Migrations.Postgres;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Station.Systems;
 using Content.Shared.Chat;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Mind;
 using Content.Shared.Mobs;
diff --git a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
index 58ced962950..c5f88ab6cf1 100644
--- a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
@@ -12,6 +12,7 @@
 using Content.Server.Shuttles.Systems;
 using Content.Server.Station.Systems;
 using Content.Shared.Database;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Humanoid;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Mind;
@@ -27,7 +28,6 @@
 using Content.Shared.Zombies;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
-using Content.Server.GameTicking.Components;
 using Content.Shared.Cuffs.Components;
 
 namespace Content.Server.GameTicking.Rules;
diff --git a/Content.Server/GameTicking/Rules/RoundstartStationVariationRuleSystem.cs b/Content.Server/GameTicking/Rules/RoundstartStationVariationRuleSystem.cs
index f09ed3ebc3c..570889155b3 100644
--- a/Content.Server/GameTicking/Rules/RoundstartStationVariationRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/RoundstartStationVariationRuleSystem.cs
@@ -1,9 +1,9 @@
 using System.Linq;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Shuttles.Systems;
 using Content.Server.Station.Components;
 using Content.Server.Station.Events;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Storage;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
diff --git a/Content.Server/GameTicking/Rules/SandboxRuleSystem.cs b/Content.Server/GameTicking/Rules/SandboxRuleSystem.cs
index c60670a3ad7..23e9ee5a7d2 100644
--- a/Content.Server/GameTicking/Rules/SandboxRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/SandboxRuleSystem.cs
@@ -1,6 +1,6 @@
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Sandbox;
+using Content.Shared.GameTicking.Components;
 
 namespace Content.Server.GameTicking.Rules;
 
diff --git a/Content.Server/GameTicking/Rules/SecretRuleSystem.cs b/Content.Server/GameTicking/Rules/SecretRuleSystem.cs
index d25262b797a..b86d8de9b92 100644
--- a/Content.Server/GameTicking/Rules/SecretRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/SecretRuleSystem.cs
@@ -1,10 +1,10 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.Administration.Logs;
-using Content.Server.GameTicking.Components;
 using Content.Server.Chat.Managers;
 using Content.Server.GameTicking.Presets;
 using Content.Server.GameTicking.Rules.Components;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Random;
 using Content.Shared.CCVar;
 using Content.Shared.Database;
@@ -21,7 +21,6 @@ public sealed class SecretRuleSystem : GameRuleSystem<SecretRuleComponent>
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly IConfigurationManager _configurationManager = default!;
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly IChatManager _chatManager = default!;
     [Dependency] private readonly IComponentFactory _compFact = default!;
 
     private string _ruleCompName = default!;
diff --git a/Content.Server/GameTicking/Rules/SubGamemodesSystem.cs b/Content.Server/GameTicking/Rules/SubGamemodesSystem.cs
index 4486ee40fbb..4fe3827ce5c 100644
--- a/Content.Server/GameTicking/Rules/SubGamemodesSystem.cs
+++ b/Content.Server/GameTicking/Rules/SubGamemodesSystem.cs
@@ -1,5 +1,5 @@
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Storage;
 
 namespace Content.Server.GameTicking.Rules;
diff --git a/Content.Server/GameTicking/Rules/ThiefRuleSystem.cs b/Content.Server/GameTicking/Rules/ThiefRuleSystem.cs
index faec4a9e9ca..074b4c0df7a 100644
--- a/Content.Server/GameTicking/Rules/ThiefRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/ThiefRuleSystem.cs
@@ -12,10 +12,8 @@ namespace Content.Server.GameTicking.Rules;
 
 public sealed class ThiefRuleSystem : GameRuleSystem<ThiefRuleComponent>
 {
-    [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly MindSystem _mindSystem = default!;
     [Dependency] private readonly AntagSelectionSystem _antag = default!;
-    [Dependency] private readonly ObjectivesSystem _objectives = default!;
 
     public override void Initialize()
     {
diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
index 29de85a42e5..9e8a878a2d1 100644
--- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
@@ -5,6 +5,7 @@
 using Content.Server.PDA.Ringer;
 using Content.Server.Roles;
 using Content.Server.Traitor.Uplink;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Mind;
 using Content.Shared.NPC.Systems;
 using Content.Shared.Objectives.Components;
@@ -15,7 +16,6 @@
 using Robust.Shared.Random;
 using System.Linq;
 using System.Text;
-using Content.Server.GameTicking.Components;
 
 namespace Content.Server.GameTicking.Rules;
 
@@ -29,7 +29,6 @@ public sealed class TraitorRuleSystem : GameRuleSystem<TraitorRuleComponent>
     [Dependency] private readonly MindSystem _mindSystem = default!;
     [Dependency] private readonly SharedRoleSystem _roleSystem = default!;
     [Dependency] private readonly SharedJobSystem _jobs = default!;
-    [Dependency] private readonly ObjectivesSystem _objectives = default!;
 
     public override void Initialize()
     {
@@ -43,7 +42,7 @@ public override void Initialize()
     protected override void Added(EntityUid uid, TraitorRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args)
     {
         base.Added(uid, component, gameRule, args);
-        MakeCodewords(component);
+        SetCodewords(component);
     }
 
     private void AfterEntitySelected(Entity<TraitorRuleComponent> ent, ref AfterAntagEntitySelectedEvent args)
@@ -51,17 +50,23 @@ private void AfterEntitySelected(Entity<TraitorRuleComponent> ent, ref AfterAnta
         MakeTraitor(args.EntityUid, ent);
     }
 
-    private void MakeCodewords(TraitorRuleComponent component)
+    private void SetCodewords(TraitorRuleComponent component)
+    {
+        component.Codewords = GenerateTraitorCodewords(component);
+    }
+
+    public string[] GenerateTraitorCodewords(TraitorRuleComponent component)
     {
         var adjectives = _prototypeManager.Index(component.CodewordAdjectives).Values;
         var verbs = _prototypeManager.Index(component.CodewordVerbs).Values;
         var codewordPool = adjectives.Concat(verbs).ToList();
         var finalCodewordCount = Math.Min(component.CodewordCount, codewordPool.Count);
-        component.Codewords = new string[finalCodewordCount];
+        string[] codewords = new string[finalCodewordCount];
         for (var i = 0; i < finalCodewordCount; i++)
         {
-            component.Codewords[i] = _random.PickAndTake(codewordPool);
+            codewords[i] = _random.PickAndTake(codewordPool);
         }
+        return codewords;
     }
 
     public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component, bool giveUplink = true)
@@ -123,9 +128,9 @@ private string GenerateBriefing(string[] codewords, Note[]? uplinkCode, string?
     {
         var sb = new StringBuilder();
         sb.AppendLine(Loc.GetString("traitor-role-greeting", ("corporation", objectiveIssuer ?? Loc.GetString("objective-issuer-unknown"))));
-        sb.AppendLine(Loc.GetString("traitor-role-codewords-short", ("codewords", string.Join(", ", codewords))));
+        sb.AppendLine(Loc.GetString("traitor-role-codewords", ("codewords", string.Join(", ", codewords))));
         if (uplinkCode != null)
-            sb.AppendLine(Loc.GetString("traitor-role-uplink-code-short", ("code", string.Join("-", uplinkCode).Replace("sharp", "#"))));
+            sb.AppendLine(Loc.GetString("traitor-role-uplink-code", ("code", string.Join("-", uplinkCode).Replace("sharp", "#"))));
 
         return sb.ToString();
     }
diff --git a/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs b/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
index 05afe926e47..e91931300e2 100644
--- a/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
@@ -7,6 +7,7 @@
 using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
 using Content.Server.Zombies;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Humanoid;
 using Content.Shared.Mind;
 using Content.Shared.Mobs;
@@ -16,7 +17,6 @@
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
 using System.Globalization;
-using Content.Server.GameTicking.Components;
 
 namespace Content.Server.GameTicking.Rules;
 
diff --git a/Content.Server/GenericAntag/GenericAntagComponent.cs b/Content.Server/GenericAntag/GenericAntagComponent.cs
deleted file mode 100644
index b8ed9cf6ef4..00000000000
--- a/Content.Server/GenericAntag/GenericAntagComponent.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Content.Server.GameTicking.Rules.Components;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Server.GenericAntag;
-
-/// <summary>
-/// Added to a mob to make it a generic antagonist where all its objectives are fixed.
-/// This is unlike say traitor where it gets objectives picked randomly using difficulty.
-/// </summary>
-/// <remarks>
-/// A GenericAntag is not necessarily an antagonist, that depends on the roles you do or do not add after.
-/// </remarks>
-[RegisterComponent, Access(typeof(GenericAntagSystem))]
-public sealed partial class GenericAntagComponent : Component
-{
-    /// <summary>
-    /// Gamerule to start when a mind is added.
-    /// This must have <see cref="GenericAntagRuleComponent"/> or it will not work.
-    /// </summary>
-    [DataField(required: true), ViewVariables(VVAccess.ReadWrite)]
-    public EntProtoId Rule = string.Empty;
-
-    /// <summary>
-    /// The rule that's been spawned.
-    /// Used to prevent spawning multiple rules.
-    /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public EntityUid? RuleEntity;
-}
diff --git a/Content.Server/GenericAntag/GenericAntagSystem.cs b/Content.Server/GenericAntag/GenericAntagSystem.cs
deleted file mode 100644
index 8b7a16a4cb2..00000000000
--- a/Content.Server/GenericAntag/GenericAntagSystem.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using Content.Server.GameTicking.Rules;
-using Content.Shared.Mind;
-using Content.Shared.Mind.Components;
-
-namespace Content.Server.GenericAntag;
-
-/// <summary>
-/// Handles adding objectives to <see cref="GenericAntagComponent"/>s.
-/// Roundend summary is handled by <see cref="GenericAntagRuleSystem"/>.
-/// </summary>
-public sealed class GenericAntagSystem : EntitySystem
-{
-    [Dependency] private readonly SharedMindSystem _mind = default!;
-    [Dependency] private readonly GenericAntagRuleSystem _genericAntagRule = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<GenericAntagComponent, MindAddedMessage>(OnMindAdded);
-    }
-
-    private void OnMindAdded(EntityUid uid, GenericAntagComponent comp, MindAddedMessage args)
-    {
-        if (!TryComp<MindContainerComponent>(uid, out var mindContainer) || mindContainer.Mind == null)
-            return;
-
-        var mindId = mindContainer.Mind.Value;
-        MakeAntag(uid, mindId, comp);
-    }
-
-    /// <summary>
-    /// Turns a player into this antagonist.
-    /// Does the same thing that having a mind added does, use for antag ctrl.
-    /// </summary>
-    public void MakeAntag(EntityUid uid, EntityUid mindId, GenericAntagComponent? comp = null, MindComponent? mind = null)
-    {
-        if (!Resolve(uid, ref comp) || !Resolve(mindId, ref mind))
-            return;
-
-        // only add the rule once
-        if (comp.RuleEntity != null)
-            return;
-
-        // start the rule
-        if (!_genericAntagRule.StartRule(comp.Rule, mindId, out comp.RuleEntity, out var rule))
-            return;
-
-        // let other systems know the antag was created so they can add briefing, roles, etc.
-        // its important that this is before objectives are added since they may depend on roles added here
-        var ev = new GenericAntagCreatedEvent(mindId, mind);
-        RaiseLocalEvent(uid, ref ev);
-
-        // add the objectives from the rule
-        foreach (var id in rule.Objectives)
-        {
-            _mind.TryAddObjective(mindId, mind, id);
-        }
-    }
-
-    /// <summary>
-    /// DeltaV - used by paradox anomaly
-    /// </summary>
-    public void MakeAntag(EntityUid uid, string rule)
-    {
-        AddComp<GenericAntagComponent>(uid).Rule = rule;
-    }
-}
-
-/// <summary>
-/// Event raised on a player's entity after its simple antag rule is started.
-/// Use this to add a briefing, roles, etc.
-/// </summary>
-[ByRefEvent]
-public record struct GenericAntagCreatedEvent(EntityUid MindId, MindComponent Mind);
diff --git a/Content.Server/Geras/GerasComponent.cs b/Content.Server/Geras/GerasComponent.cs
index eaf792502f4..df1fccd7185 100644
--- a/Content.Server/Geras/GerasComponent.cs
+++ b/Content.Server/Geras/GerasComponent.cs
@@ -12,7 +12,7 @@ public sealed partial class GerasComponent : Component
 {
     [DataField] public ProtoId<PolymorphPrototype> GerasPolymorphId = "SlimeMorphGeras";
 
-    [DataField] public ProtoId<EntityPrototype> GerasAction = "ActionMorphGeras";
+    [DataField] public EntProtoId GerasAction = "ActionMorphGeras";
 
     [DataField] public EntityUid? GerasActionEntity;
 }
diff --git a/Content.Server/Ghost/Ghost.cs b/Content.Server/Ghost/GhostCommand.cs
similarity index 96%
rename from Content.Server/Ghost/Ghost.cs
rename to Content.Server/Ghost/GhostCommand.cs
index 69d81d95929..b553d64201a 100644
--- a/Content.Server/Ghost/Ghost.cs
+++ b/Content.Server/Ghost/GhostCommand.cs
@@ -7,7 +7,7 @@
 namespace Content.Server.Ghost
 {
     [AnyCommand]
-    public sealed class Ghost : IConsoleCommand
+    public sealed class GhostCommand : IConsoleCommand
     {
         [Dependency] private readonly IEntityManager _entities = default!;
 
diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs
index dce80a450fd..b68c279b3e5 100644
--- a/Content.Server/Ghost/GhostSystem.cs
+++ b/Content.Server/Ghost/GhostSystem.cs
@@ -128,7 +128,7 @@ private void OnActionPerform(EntityUid uid, GhostComponent component, BooActionE
         private void OnRelayMoveInput(EntityUid uid, GhostOnMoveComponent component, ref MoveInputEvent args)
         {
             // If they haven't actually moved then ignore it.
-            if ((args.Component.HeldMoveButtons &
+            if ((args.Entity.Comp.HeldMoveButtons &
                  (MoveButtons.Down | MoveButtons.Left | MoveButtons.Up | MoveButtons.Right)) == 0x0)
             {
                 return;
diff --git a/Content.Server/Ghost/Roles/GhostRoleSystem.cs b/Content.Server/Ghost/Roles/GhostRoleSystem.cs
index 40e5af78596..eb6560f37f1 100644
--- a/Content.Server/Ghost/Roles/GhostRoleSystem.cs
+++ b/Content.Server/Ghost/Roles/GhostRoleSystem.cs
@@ -3,7 +3,6 @@
 using Content.Server.EUI;
 using Content.Server.Ghost.Roles.Components;
 using Content.Server.Ghost.Roles.Events;
-using Content.Server.Ghost.Roles.Raffles;
 using Content.Shared.Ghost.Roles.Raffles;
 using Content.Server.Ghost.Roles.UI;
 using Content.Server.Mind.Commands;
@@ -31,6 +30,7 @@
 using Content.Server.Popups;
 using Content.Shared.Verbs;
 using Robust.Shared.Collections;
+using Content.Shared.Ghost.Roles.Components;
 
 namespace Content.Server.Ghost.Roles
 {
@@ -81,6 +81,7 @@ public override void Initialize()
             SubscribeLocalEvent<GhostTakeoverAvailableComponent, TakeGhostRoleEvent>(OnTakeoverTakeRole);
             SubscribeLocalEvent<GhostRoleCharacterSpawnerComponent, TakeGhostRoleEvent>(OnSpawnerTakeCharacter); // DeltaV - Character ghost roles, see Content.Server/DeltaV/Ghost/Roles/GhostRoleSystem.Character.cs
             SubscribeLocalEvent<GhostRoleMobSpawnerComponent, GetVerbsEvent<Verb>>(OnVerb);
+            SubscribeLocalEvent<GhostRoleMobSpawnerComponent, GhostRoleRadioMessage>(OnGhostRoleRadioMessage);
             _playerManager.PlayerStatusChanged += PlayerStatusChanged;
         }
 
@@ -787,6 +788,21 @@ public void SetMode(EntityUid uid, GhostRolePrototype prototype, string verbText
                 _popupSystem.PopupEntity(msg, uid, userUid.Value);
             }
         }
+
+        public void OnGhostRoleRadioMessage(Entity<GhostRoleMobSpawnerComponent> entity, ref GhostRoleRadioMessage args)
+        {
+            if (!_prototype.TryIndex(args.ProtoId, out var ghostRoleProto))
+                return;
+
+            // if the prototype chosen isn't actually part of the selectable options, ignore it
+            foreach (var selectableProto in entity.Comp.SelectablePrototypes)
+            {
+                if (selectableProto == ghostRoleProto.EntityPrototype.Id)
+                    return;
+            }
+
+            SetMode(entity.Owner, ghostRoleProto, ghostRoleProto.Name, entity.Comp);
+        }
     }
 
     [AnyCommand]
diff --git a/Content.Server/Ghost/Roles/ToggleableGhostRoleSystem.cs b/Content.Server/Ghost/Roles/ToggleableGhostRoleSystem.cs
index 9bab229c001..88c65034e6c 100644
--- a/Content.Server/Ghost/Roles/ToggleableGhostRoleSystem.cs
+++ b/Content.Server/Ghost/Roles/ToggleableGhostRoleSystem.cs
@@ -95,7 +95,7 @@ private void UpdateAppearance(EntityUid uid, ToggleableGhostRoleStatus status)
 
     private void AddWipeVerb(EntityUid uid, ToggleableGhostRoleComponent component, GetVerbsEvent<ActivationVerb> args)
     {
-        if (!args.CanAccess || !args.CanInteract)
+        if (args.Hands == null || !args.CanAccess || !args.CanInteract)
             return;
 
         if (TryComp<MindContainerComponent>(uid, out var mind) && mind.HasMind)
diff --git a/Content.Server/Guardian/GuardianSystem.cs b/Content.Server/Guardian/GuardianSystem.cs
index 203882ed9ef..ae4d0ca2b8c 100644
--- a/Content.Server/Guardian/GuardianSystem.cs
+++ b/Content.Server/Guardian/GuardianSystem.cs
@@ -325,7 +325,7 @@ private void CheckGuardianMove(
             if (!guardianComponent.GuardianLoose)
                 return;
 
-            if (!guardianXform.Coordinates.InRange(EntityManager, _transform, hostXform.Coordinates, guardianComponent.DistanceAllowed))
+            if (!_transform.InRange(guardianXform.Coordinates, hostXform.Coordinates, guardianComponent.DistanceAllowed))
                 RetractGuardian(hostUid, hostComponent, guardianUid, guardianComponent);
         }
 
diff --git a/Content.Server/Hands/Systems/HandsSystem.cs b/Content.Server/Hands/Systems/HandsSystem.cs
index feae130ce8e..903fd1ff3f7 100644
--- a/Content.Server/Hands/Systems/HandsSystem.cs
+++ b/Content.Server/Hands/Systems/HandsSystem.cs
@@ -170,7 +170,7 @@ private void HandlePullStopped(EntityUid uid, HandsComponent component, PullStop
 
         private bool HandleThrowItem(ICommonSession? playerSession, EntityCoordinates coordinates, EntityUid entity)
         {
-            if (playerSession?.AttachedEntity is not {Valid: true} player || !Exists(player))
+            if (playerSession?.AttachedEntity is not {Valid: true} player || !Exists(player) || !coordinates.IsValid(EntityManager))
                 return false;
 
             return ThrowHeldItem(player, coordinates);
@@ -201,19 +201,19 @@ hands.ActiveHandEntity is not { } throwEnt ||
                 throwEnt = splitStack.Value;
             }
 
-            var direction = coordinates.ToMapPos(EntityManager, _transformSystem) - Transform(player).WorldPosition;
+            var direction = _transformSystem.ToMapCoordinates(coordinates).Position - _transformSystem.GetWorldPosition(player);
             if (direction == Vector2.Zero)
                 return true;
 
             var length = direction.Length();
             var distance = Math.Clamp(length, minDistance, hands.ThrowRange);
-            direction *= distance/length;
+            direction *= distance / length;
 
-            var throwStrength = hands.ThrowForceMultiplier;
+            var throwSpeed = hands.BaseThrowspeed;
 
             // Let other systems change the thrown entity (useful for virtual items)
             // or the throw strength.
-            var ev = new BeforeThrowEvent(throwEnt, direction, throwStrength, player);
+            var ev = new BeforeThrowEvent(throwEnt, direction, throwSpeed, player);
             RaiseLocalEvent(player, ref ev);
 
             if (ev.Cancelled)
@@ -223,7 +223,7 @@ hands.ActiveHandEntity is not { } throwEnt ||
             if (IsHolding(player, throwEnt, out _, hands) && !TryDrop(player, throwEnt, handsComp: hands))
                 return false;
 
-            _throwingSystem.TryThrow(ev.ItemUid, ev.Direction, ev.ThrowStrength, ev.PlayerUid);
+            _throwingSystem.TryThrow(ev.ItemUid, ev.Direction, ev.ThrowSpeed, ev.PlayerUid, compensateFriction: !HasComp<LandAtCursorComponent>(ev.ItemUid));
 
             return true;
         }
diff --git a/Content.Server/Holiday/Christmas/RandomGiftSystem.cs b/Content.Server/Holiday/Christmas/RandomGiftSystem.cs
index ee542572d7e..4603f45ed81 100644
--- a/Content.Server/Holiday/Christmas/RandomGiftSystem.cs
+++ b/Content.Server/Holiday/Christmas/RandomGiftSystem.cs
@@ -95,7 +95,7 @@ private void BuildIndex()
 
         foreach (var proto in _prototype.EnumeratePrototypes<EntityPrototype>())
         {
-            if (proto.Abstract || proto.NoSpawn || proto.Components.ContainsKey(mapGridCompName) || !proto.Components.ContainsKey(physicsCompName))
+            if (proto.Abstract || proto.HideSpawnMenu || proto.Components.ContainsKey(mapGridCompName) || !proto.Components.ContainsKey(physicsCompName))
                 continue;
 
             _possibleGiftsUnsafe.Add(proto.ID);
diff --git a/Content.Server/Humanoid/Systems/RandomHumanoidSystem.cs b/Content.Server/Humanoid/Systems/RandomHumanoidSystem.cs
index 872df8eae89..fc0e47b033d 100644
--- a/Content.Server/Humanoid/Systems/RandomHumanoidSystem.cs
+++ b/Content.Server/Humanoid/Systems/RandomHumanoidSystem.cs
@@ -50,8 +50,7 @@ public EntityUid SpawnRandomHumanoid(string prototypeId, EntityCoordinates coord
         {
             foreach (var entry in prototype.Components.Values)
             {
-                var comp = (Component) _serialization.CreateCopy(entry.Component, notNullableOverride: true);
-                comp.Owner = humanoid; // This .owner must survive for now.
+                var comp = (Component)_serialization.CreateCopy(entry.Component, notNullableOverride: true);
                 EntityManager.RemoveComponent(humanoid, comp.GetType());
                 EntityManager.AddComponent(humanoid, comp);
             }
diff --git a/Content.Server/IconSmoothing/RandomIconSmoothSystem.cs b/Content.Server/IconSmoothing/RandomIconSmoothSystem.cs
new file mode 100644
index 00000000000..4ddfb17ac84
--- /dev/null
+++ b/Content.Server/IconSmoothing/RandomIconSmoothSystem.cs
@@ -0,0 +1,26 @@
+using Content.Shared.IconSmoothing;
+using Robust.Shared.Random;
+
+namespace Content.Server.IconSmoothing;
+
+public sealed partial class RandomIconSmoothSystem : SharedRandomIconSmoothSystem
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<RandomIconSmoothComponent, MapInitEvent>(OnMapInit);
+    }
+
+    private void OnMapInit(Entity<RandomIconSmoothComponent> ent, ref MapInitEvent args)
+    {
+        if (ent.Comp.RandomStates.Count == 0)
+            return;
+
+        var state = _random.Pick(ent.Comp.RandomStates);
+        _appearance.SetData(ent, RandomIconSmoothState.State, state);
+    }
+}
diff --git a/Content.Server/IgnitionSource/IgnitionEvent.cs b/Content.Server/IgnitionSource/IgnitionEvent.cs
new file mode 100644
index 00000000000..b86bf52b2d4
--- /dev/null
+++ b/Content.Server/IgnitionSource/IgnitionEvent.cs
@@ -0,0 +1,7 @@
+namespace Content.Server.IgnitionSource;
+
+/// <summary>
+///     Raised in order to toggle the ignitionSourceComponent on an entity on or off
+/// </summary>
+[ByRefEvent]
+public readonly record struct IgnitionEvent(bool Ignite = false);
diff --git a/Content.Server/IgnitionSource/IgnitionSourceSystem.cs b/Content.Server/IgnitionSource/IgnitionSourceSystem.cs
index c20e5207a41..3925cc86b5a 100644
--- a/Content.Server/IgnitionSource/IgnitionSourceSystem.cs
+++ b/Content.Server/IgnitionSource/IgnitionSourceSystem.cs
@@ -19,18 +19,25 @@ public override void Initialize()
 
         SubscribeLocalEvent<IgnitionSourceComponent, IsHotEvent>(OnIsHot);
         SubscribeLocalEvent<ItemToggleHotComponent, ItemToggledEvent>(OnItemToggle);
+        SubscribeLocalEvent<IgnitionSourceComponent, IgnitionEvent>(OnIgnitionEvent);
     }
 
     private void OnIsHot(Entity<IgnitionSourceComponent> ent, ref IsHotEvent args)
     {
-        SetIgnited((ent.Owner, ent.Comp), args.IsHot);
+        args.IsHot = ent.Comp.Ignited;
     }
+
     private void OnItemToggle(Entity<ItemToggleHotComponent> ent, ref ItemToggledEvent args)
     {
         if (TryComp<IgnitionSourceComponent>(ent, out var comp))
             SetIgnited((ent.Owner, comp), args.Activated);
     }
 
+    private void OnIgnitionEvent(Entity<IgnitionSourceComponent> ent, ref IgnitionEvent args)
+    {
+        SetIgnited((ent.Owner, ent.Comp), args.Ignite);
+    }
+
     /// <summary>
     /// Simply sets the ignited field to the ignited param.
     /// </summary>
diff --git a/Content.Server/Implants/SubdermalImplantSystem.cs b/Content.Server/Implants/SubdermalImplantSystem.cs
index 88c5fb94592..7c69ec8ea54 100644
--- a/Content.Server/Implants/SubdermalImplantSystem.cs
+++ b/Content.Server/Implants/SubdermalImplantSystem.cs
@@ -1,10 +1,11 @@
-using Content.Server.Cuffs;
+using Content.Server.Cuffs;
 using Content.Server.Forensics;
 using Content.Server.Humanoid;
 using Content.Server.Implants.Components;
 using Content.Server.Store.Components;
 using Content.Server.Store.Systems;
 using Content.Shared.Cuffs.Components;
+using Content.Shared.Forensics;
 using Content.Shared.Humanoid;
 using Content.Shared.Implants;
 using Content.Shared.Implants.Components;
@@ -212,6 +213,9 @@ private void OnDnaScramblerImplant(EntityUid uid, SubdermalImplantComponent comp
             if (TryComp<DnaComponent>(ent, out var dna))
             {
                 dna.DNA = _forensicsSystem.GenerateDNA();
+
+                var ev = new GenerateDnaEvent { Owner = ent, DNA = dna.DNA };
+                RaiseLocalEvent(ent, ref ev);
             }
             if (TryComp<FingerprintComponent>(ent, out var fingerprint))
             {
diff --git a/Content.Server/Instruments/InstrumentSystem.cs b/Content.Server/Instruments/InstrumentSystem.cs
index 582bf7fa67b..f74dd7fb131 100644
--- a/Content.Server/Instruments/InstrumentSystem.cs
+++ b/Content.Server/Instruments/InstrumentSystem.cs
@@ -30,7 +30,6 @@ public sealed partial class InstrumentSystem : SharedInstrumentSystem
     [Dependency] private readonly UserInterfaceSystem _bui = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly TransformSystem _transform = default!;
-    [Dependency] private readonly InteractionSystem _interactions = default!;
     [Dependency] private readonly ExamineSystemShared _examineSystem = default!;
 
     private const float MaxInstrumentBandRange = 10f;
@@ -402,7 +401,8 @@ public override void Update(float frameTime)
 
                 var trans = transformQuery.GetComponent(uid);
                 var masterTrans = transformQuery.GetComponent(master);
-                if (!masterTrans.Coordinates.InRange(EntityManager, _transform, trans.Coordinates, 10f))
+                if (!_transform.InRange(masterTrans.Coordinates, trans.Coordinates, 10f)
+)
                 {
                     Clean(uid, instrument);
                 }
diff --git a/Content.Server/Item/ItemToggle/Components/ItemToggleDisarmMalusComponent.cs b/Content.Server/Item/ItemToggle/Components/ItemToggleDisarmMalusComponent.cs
deleted file mode 100644
index 30fa84ed90b..00000000000
--- a/Content.Server/Item/ItemToggle/Components/ItemToggleDisarmMalusComponent.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace Content.Server.Item;
-
-/// <summary>
-/// Handles whether this item applies a disarm malus when active.
-/// </summary>
-[RegisterComponent]
-public sealed partial class ItemToggleDisarmMalusComponent : Component
-{
-    /// <summary>
-    ///     Item has this modifier to the chance to disarm when activated.
-    ///     If null, the value will be inferred from the current malus just before the malus is first deactivated.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadOnly), DataField]
-    public float? ActivatedDisarmMalus = null;
-
-    /// <summary>
-    ///     Item has this modifier to the chance to disarm when deactivated. If none is mentioned, it uses the item's default disarm modifier.
-    ///     If null, the value will be inferred from the current malus just before the malus is first activated.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadOnly), DataField]
-    public float? DeactivatedDisarmMalus = null;
-}
diff --git a/Content.Server/Item/ItemToggle/Components/ItemToggleSharpComponent.cs b/Content.Server/Item/ItemToggle/Components/ItemToggleSharpComponent.cs
deleted file mode 100644
index 227491b16c2..00000000000
--- a/Content.Server/Item/ItemToggle/Components/ItemToggleSharpComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Content.Server.Item;
-
-/// <summary>
-/// Handles whether this item is sharp when toggled on.
-/// </summary>
-[RegisterComponent]
-public sealed partial class ItemToggleSharpComponent : Component
-{
-}
diff --git a/Content.Server/Item/ItemToggle/ItemToggleSystem.cs b/Content.Server/Item/ItemToggle/ItemToggleSystem.cs
deleted file mode 100644
index f98415eb08f..00000000000
--- a/Content.Server/Item/ItemToggle/ItemToggleSystem.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using Content.Server.CombatMode.Disarm;
-using Content.Server.Kitchen.Components;
-using Content.Shared.Item.ItemToggle;
-using Content.Shared.Item.ItemToggle.Components;
-
-namespace Content.Server.Item;
-
-public sealed class ItemToggleSystem : SharedItemToggleSystem
-{
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<ItemToggleSharpComponent, ItemToggledEvent>(ToggleSharp);
-        SubscribeLocalEvent<ItemToggleDisarmMalusComponent, ItemToggledEvent>(ToggleMalus);
-    }
-
-    private void ToggleSharp(Entity<ItemToggleSharpComponent> ent, ref ItemToggledEvent args)
-    {
-        // TODO generalize this into a  "ToggleComponentComponent", though probably with a better name
-        if (args.Activated)
-            EnsureComp<SharpComponent>(ent);
-        else
-            RemCompDeferred<SharpComponent>(ent);
-    }
-
-    private void ToggleMalus(Entity<ItemToggleDisarmMalusComponent> ent, ref ItemToggledEvent args)
-    {
-        if (!TryComp<DisarmMalusComponent>(ent, out var malus))
-            return;
-
-        if (args.Activated)
-        {
-            ent.Comp.DeactivatedDisarmMalus ??= malus.Malus;
-            if (ent.Comp.ActivatedDisarmMalus is {} activatedMalus)
-                malus.Malus = activatedMalus;
-            return;
-        }
-
-        ent.Comp.ActivatedDisarmMalus ??= malus.Malus;
-        if (ent.Comp.DeactivatedDisarmMalus is {} deactivatedMalus)
-            malus.Malus = deactivatedMalus;
-    }
-}
diff --git a/Content.Server/Jobs/AddComponentSpecial.cs b/Content.Server/Jobs/AddComponentSpecial.cs
index c57d7343543..3bac923656c 100644
--- a/Content.Server/Jobs/AddComponentSpecial.cs
+++ b/Content.Server/Jobs/AddComponentSpecial.cs
@@ -1,35 +1,22 @@
 using Content.Shared.Roles;
-using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.Manager;
 
-namespace Content.Server.Jobs
-{
-    [UsedImplicitly]
-    public sealed partial class AddComponentSpecial : JobSpecial
-    {
-        [DataField("components")]
-        [AlwaysPushInheritance]
-        public ComponentRegistry Components { get; private set; } = new();
+namespace Content.Server.Jobs;
 
-        public override void AfterEquip(EntityUid mob)
-        {
-            // now its a registry of components, still throws i bet.
-            // TODO: This is hot garbage and probably needs an engine change to not be a POS.
-            var factory = IoCManager.Resolve<IComponentFactory>();
-            var entityManager = IoCManager.Resolve<IEntityManager>();
-            var serializationManager = IoCManager.Resolve<ISerializationManager>();
+public sealed partial class AddComponentSpecial : JobSpecial
+{
+    [DataField(required: true)]
+    public ComponentRegistry Components { get; private set; } = new();
 
-            foreach (var (name, data) in Components)
-            {
-                var component = (Component) factory.GetComponent(name);
-                component.Owner = mob;
+    /// <summary>
+    /// If this is true then existing components will be removed and replaced with these ones.
+    /// </summary>
+    [DataField]
+    public bool RemoveExisting = true;
 
-                var temp = (object) component;
-                serializationManager.CopyTo(data.Component, ref temp);
-                entityManager.RemoveComponent(mob, temp!.GetType());
-                entityManager.AddComponent(mob, (Component) temp);
-            }
-        }
+    public override void AfterEquip(EntityUid mob)
+    {
+        var entMan = IoCManager.Resolve<IEntityManager>();
+        entMan.AddComponents(mob, Components, removeExisting: RemoveExisting);
     }
 }
diff --git a/Content.Server/Jobs/RemoveComponentSpecial.cs b/Content.Server/Jobs/RemoveComponentSpecial.cs
new file mode 100644
index 00000000000..7a9b03b3ba0
--- /dev/null
+++ b/Content.Server/Jobs/RemoveComponentSpecial.cs
@@ -0,0 +1,16 @@
+using Content.Shared.Roles;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Jobs;
+
+public sealed partial class RemoveComponentSpecial : JobSpecial
+{
+    [DataField(required: true)]
+    public ComponentRegistry Components { get; private set; } = new();
+
+    public override void AfterEquip(EntityUid mob)
+    {
+        var entMan = IoCManager.Resolve<IEntityManager>();
+        entMan.RemoveComponents(mob, Components);
+    }
+}
diff --git a/Content.Server/Kitchen/Components/MicrowaveComponent.cs b/Content.Server/Kitchen/Components/MicrowaveComponent.cs
index 1d26f68cae8..5337d80fd17 100644
--- a/Content.Server/Kitchen/Components/MicrowaveComponent.cs
+++ b/Content.Server/Kitchen/Components/MicrowaveComponent.cs
@@ -79,6 +79,9 @@ public sealed partial class MicrowaveComponent : Component
 
         public Container Storage = default!;
 
+        [DataField]
+        public string ContainerId = "microwave_entity_container";
+
         [DataField, ViewVariables(VVAccess.ReadWrite)]
         public int Capacity = 10;
 
diff --git a/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs b/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs
index b145bec0148..d89af7e94f9 100644
--- a/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs
@@ -259,7 +259,8 @@ public bool TrySpike(EntityUid uid, EntityUid userUid, EntityUid victimUid, Kitc
             {
                 BreakOnDamage = true,
                 BreakOnMove = true,
-                NeedHand = true
+                NeedHand = true,
+                BreakOnDropItem = false,
             };
 
             _doAfter.TryStartDoAfter(doAfterArgs);
diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
index eefa539149b..98c875e7735 100644
--- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
@@ -79,6 +79,7 @@ public override void Initialize()
             SubscribeLocalEvent<MicrowaveComponent, EntInsertedIntoContainerMessage>(OnContentUpdate);
             SubscribeLocalEvent<MicrowaveComponent, EntRemovedFromContainerMessage>(OnContentUpdate);
             SubscribeLocalEvent<MicrowaveComponent, InteractUsingEvent>(OnInteractUsing, after: new[] { typeof(AnchorableSystem) });
+            SubscribeLocalEvent<MicrowaveComponent, ContainerIsInsertingAttemptEvent>(OnInsertAttempt);
             SubscribeLocalEvent<MicrowaveComponent, BreakageEventArgs>(OnBreak);
             SubscribeLocalEvent<MicrowaveComponent, PowerChangedEvent>(OnPowerChanged);
             SubscribeLocalEvent<MicrowaveComponent, AnchorStateChangedEvent>(OnAnchorChanged);
@@ -251,7 +252,7 @@ private void SubtractContents(MicrowaveComponent component, FoodRecipePrototype
         private void OnInit(Entity<MicrowaveComponent> ent, ref ComponentInit args)
         {
             // this really does have to be in ComponentInit
-            ent.Comp.Storage = _container.EnsureContainer<Container>(ent, "microwave_entity_container");
+            ent.Comp.Storage = _container.EnsureContainer<Container>(ent, ent.Comp.ContainerId);
         }
 
         private void OnMapInit(Entity<MicrowaveComponent> ent, ref MapInitEvent args)
@@ -309,6 +310,35 @@ private void OnContentUpdate(EntityUid uid, MicrowaveComponent component, Contai
             UpdateUserInterfaceState(uid, component);
         }
 
+        private void OnInsertAttempt(Entity<MicrowaveComponent> ent, ref ContainerIsInsertingAttemptEvent args)
+        {
+            if (args.Container.ID != ent.Comp.ContainerId)
+                return;
+
+            if (ent.Comp.Broken)
+            {
+                args.Cancel();
+                return;
+            }
+
+            if (TryComp<ItemComponent>(args.EntityUid, out var item))
+            {
+                if (_item.GetSizePrototype(item.Size) > _item.GetSizePrototype(ent.Comp.MaxItemSize))
+                {
+                    args.Cancel();
+                    return;
+                }
+            }
+            else
+            {
+                args.Cancel();
+                return;
+            }
+
+            if (ent.Comp.Storage.Count >= ent.Comp.Capacity)
+                args.Cancel();
+        }
+
         private void OnInteractUsing(Entity<MicrowaveComponent> ent, ref InteractUsingEvent args)
         {
             if (args.Handled)
diff --git a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
index 81001f0932e..b4023bbdb9f 100644
--- a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
@@ -157,7 +157,7 @@ private void OnContainerModified(EntityUid uid, ReagentGrinderComponent reagentG
             var outputContainer = _itemSlotsSystem.GetItemOrNull(uid, SharedReagentGrinder.BeakerSlotId);
             _appearanceSystem.SetData(uid, ReagentGrinderVisualState.BeakerAttached, outputContainer.HasValue);
 
-            if (reagentGrinder.AutoMode != GrinderAutoMode.Off && !HasComp<ActiveReagentGrinderComponent>(uid))
+            if (reagentGrinder.AutoMode != GrinderAutoMode.Off && !HasComp<ActiveReagentGrinderComponent>(uid) && this.IsPowered(uid, EntityManager))
             {
                 var program = reagentGrinder.AutoMode == GrinderAutoMode.Grind ? GrinderProgram.Grind : GrinderProgram.Juice;
                 DoWork(uid, reagentGrinder, program);
diff --git a/Content.Server/Kitchen/EntitySystems/SharpSystem.cs b/Content.Server/Kitchen/EntitySystems/SharpSystem.cs
index b7966877214..99ea516f74d 100644
--- a/Content.Server/Kitchen/EntitySystems/SharpSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/SharpSystem.cs
@@ -77,7 +77,7 @@ private bool TryStartButcherDoafter(EntityUid knife, EntityUid target, EntityUid
             {
                 BreakOnDamage = true,
                 BreakOnMove = true,
-                NeedHand = true
+                NeedHand = true,
             };
         _doAfterSystem.TryStartDoAfter(doAfter);
         return true;
diff --git a/Content.Server/Labels/Label/LabelSystem.cs b/Content.Server/Labels/Label/LabelSystem.cs
index bfd2a8df161..f4c46ceeef1 100644
--- a/Content.Server/Labels/Label/LabelSystem.cs
+++ b/Content.Server/Labels/Label/LabelSystem.cs
@@ -1,12 +1,11 @@
 using Content.Server.Labels.Components;
-using Content.Server.Paper;
 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.NameModifier.EntitySystems;
-using Content.Shared.Tag;
+using Content.Shared.Paper;
+using Content.Shared.Tag; // DeltaV
 using JetBrains.Annotations;
 using Robust.Shared.Containers;
 
@@ -20,11 +19,11 @@ public sealed class LabelSystem : SharedLabelSystem
     {
         [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!;
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-        [Dependency] private readonly TagSystem _tagSystem = default!;
+        [Dependency] private readonly TagSystem _tag = default!; // DeltaV
 
         public const string ContainerName = "paper_label";
         [ValidatePrototypeId<TagPrototype>]
-        private const string PreventTag = "PreventLabel";
+        private const string PreventTag = "PreventLabel"; // DeltaV - no labelling felenids
 
         public override void Initialize()
         {
@@ -46,7 +45,7 @@ public override void Initialize()
         /// <param name="metadata">metadata component for resolve</param>
         public override void Label(EntityUid uid, string? text, MetaDataComponent? metadata = null, LabelComponent? label = null)
         {
-            if (_tagSystem.HasTag(uid, PreventTag)) // DeltaV - Prevent labels on certain items
+            if (_tag.HasTag(uid, PreventTag)) // DeltaV - Prevent labels on certain items
                 return;
             if (!Resolve(uid, ref label, false))
                 label = EnsureComp<LabelComponent>(uid);
diff --git a/Content.Server/Lathe/LatheSystem.cs b/Content.Server/Lathe/LatheSystem.cs
index 7448a9b84dd..f6e5903bbe2 100644
--- a/Content.Server/Lathe/LatheSystem.cs
+++ b/Content.Server/Lathe/LatheSystem.cs
@@ -1,23 +1,29 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.Administration.Logs;
-using Content.Server.Atmos;
 using Content.Server.Atmos.EntitySystems;
+using Content.Server.Fluids.EntitySystems;
 using Content.Server.Lathe.Components;
 using Content.Server.Materials;
+using Content.Server.Popups;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Stack;
 using Content.Shared.Atmos;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
 using Content.Shared.UserInterface;
 using Content.Shared.Database;
 using Content.Shared.Emag.Components;
+using Content.Shared.Examine;
 using Content.Shared.Lathe;
 using Content.Shared.Materials;
 using Content.Shared.ReagentSpeed;
 using Content.Shared.Research.Components;
 using Content.Shared.Research.Prototypes;
 using JetBrains.Annotations;
+using Robust.Server.Containers;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Prototypes;
@@ -34,9 +40,13 @@ public sealed class LatheSystem : SharedLatheSystem
         [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
+        [Dependency] private readonly ContainerSystem _container = default!;
         [Dependency] private readonly UserInterfaceSystem _uiSys = default!;
         [Dependency] private readonly MaterialStorageSystem _materialStorage = default!;
+        [Dependency] private readonly PopupSystem _popup = default!;
+        [Dependency] private readonly PuddleSystem _puddle = default!;
         [Dependency] private readonly ReagentSpeedSystem _reagentSpeed = default!;
+        [Dependency] private readonly SharedSolutionContainerSystem _solution = default!;
         [Dependency] private readonly StackSystem _stack = default!;
         [Dependency] private readonly TransformSystem _transform = default!;
 
@@ -63,7 +73,6 @@ public override void Initialize()
             SubscribeLocalEvent<EmagLatheRecipesComponent, LatheGetRecipesEvent>(GetEmagLatheRecipes);
             SubscribeLocalEvent<LatheHeatProducingComponent, LatheStartPrintingEvent>(OnHeatStartPrinting);
         }
-
         public override void Update(float frameTime)
         {
             var query = EntityQueryEnumerator<LatheProducingComponent, LatheComponent>();
@@ -119,7 +128,7 @@ private void OnGetWhitelist(EntityUid uid, LatheComponent component, ref GetMate
             {
                 if (!_proto.TryIndex(id, out var proto))
                     continue;
-                foreach (var (mat, _) in proto.RequiredMaterials)
+                foreach (var (mat, _) in proto.Materials)
                 {
                     if (!materialWhitelist.Contains(mat))
                     {
@@ -165,7 +174,7 @@ public bool TryAddToQueue(EntityUid uid, LatheRecipePrototype recipe, LatheCompo
             if (!CanProduce(uid, recipe, 1, component))
                 return false;
 
-            foreach (var (mat, amount) in recipe.RequiredMaterials)
+            foreach (var (mat, amount) in recipe.Materials)
             {
                 var adjustedAmount = recipe.ApplyMaterialDiscount
                     ? (int) (-amount * component.MaterialUseMultiplier)
@@ -211,8 +220,31 @@ public void FinishProducing(EntityUid uid, LatheComponent? comp = null, LathePro
 
             if (comp.CurrentRecipe != null)
             {
-                var result = Spawn(comp.CurrentRecipe.Result, Transform(uid).Coordinates);
-                _stack.TryMergeToContacts(result);
+                if (comp.CurrentRecipe.Result is { } resultProto)
+                {
+                    var result = Spawn(resultProto, Transform(uid).Coordinates);
+                    _stack.TryMergeToContacts(result);
+                }
+
+                if (comp.CurrentRecipe.ResultReagents is { } resultReagents &&
+                    comp.ReagentOutputSlotId is { } slotId)
+                {
+                    var toAdd = new Solution(
+                        resultReagents.Select(p => new ReagentQuantity(p.Key.Id, p.Value, null)));
+
+                    // dispense it in the container if we have it and dump it if we don't
+                    if (_container.TryGetContainer(uid, slotId, out var container) &&
+                        container.ContainedEntities.Count == 1 &&
+                        _solution.TryGetFitsInDispenser(container.ContainedEntities.First(), out var solution, out _))
+                    {
+                        _solution.AddSolution(solution.Value, toAdd);
+                    }
+                    else
+                    {
+                        _popup.PopupEntity(Loc.GetString("lathe-reagent-dispense-no-container", ("name", uid)), uid);
+                        _puddle.TrySpillAt(uid, toAdd, out _);
+                    }
+                }
             }
 
             comp.CurrentRecipe = null;
@@ -327,6 +359,7 @@ protected override bool HasRecipe(EntityUid uid, LatheRecipePrototype recipe, La
         {
             return GetAvailableRecipes(uid, component).Contains(recipe.ID);
         }
+
         #region UI Messages
 
         private void OnLatheQueueRecipeMessage(EntityUid uid, LatheComponent component, LatheQueueRecipeMessage args)
@@ -343,8 +376,9 @@ private void OnLatheQueueRecipeMessage(EntityUid uid, LatheComponent component,
                 }
                 if (count > 0)
                 {
-                    _adminLogger.Add(LogType.Action, LogImpact.Low,
-                        $"{ToPrettyString(args.Actor):player} queued {count} {recipe.Name} at {ToPrettyString(uid):lathe}");
+                    _adminLogger.Add(LogType.Action,
+                        LogImpact.Low,
+                        $"{ToPrettyString(args.Actor):player} queued {count} {GetRecipeName(recipe)} at {ToPrettyString(uid):lathe}");
                 }
             }
             TryStartProducing(uid, component);
diff --git a/Content.Server/Light/Components/PoweredLightComponent.cs b/Content.Server/Light/Components/PoweredLightComponent.cs
index 489a49eec22..1a6f610516e 100644
--- a/Content.Server/Light/Components/PoweredLightComponent.cs
+++ b/Content.Server/Light/Components/PoweredLightComponent.cs
@@ -30,10 +30,6 @@ public sealed partial class PoweredLightComponent : Component
         [DataField("on")]
         public bool On = true;
 
-        [DataField("damage", required: true)]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public DamageSpecifier Damage = default!;
-
         [DataField("ignoreGhostsBoo")]
         public bool IgnoreGhostsBoo;
 
diff --git a/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs b/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
index f2c4c7dcc59..b6810aa33be 100644
--- a/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
+++ b/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
@@ -3,11 +3,11 @@
 using Content.Server.Light.Components;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
-using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
 using Content.Shared.Examine;
 using Content.Shared.Light;
 using Content.Shared.Light.Components;
+using Content.Shared.Station.Components;
 using Robust.Server.GameObjects;
 using Color = Robust.Shared.Maths.Color;
 
@@ -70,7 +70,7 @@ private void OnEmergencyExamine(EntityUid uid, EmergencyLightComponent component
             args.PushMarkup(
                 Loc.GetString("emergency-light-component-on-examine-alert",
                     ("color", color.ToHex()),
-                    ("level", name)));
+                    ("level", Loc.GetString($"alert-level-{name.ToString().ToLower()}"))));
         }
     }
 
@@ -234,6 +234,6 @@ private void TurnOn(Entity<EmergencyLightComponent> entity, Color color)
         _pointLight.SetColor(entity.Owner, color);
         _appearance.SetData(entity.Owner, EmergencyLightVisuals.Color, color);
         _appearance.SetData(entity.Owner, EmergencyLightVisuals.On, true);
-        _ambient.SetAmbience(entity.Owner, true); 
+        _ambient.SetAmbience(entity.Owner, true);
     }
 }
diff --git a/Content.Server/Light/EntitySystems/ExpendableLightSystem.cs b/Content.Server/Light/EntitySystems/ExpendableLightSystem.cs
index 571c23c5dbd..ba44b42ead1 100644
--- a/Content.Server/Light/EntitySystems/ExpendableLightSystem.cs
+++ b/Content.Server/Light/EntitySystems/ExpendableLightSystem.cs
@@ -1,3 +1,4 @@
+using Content.Server.IgnitionSource;
 using Content.Server.Light.Components;
 using Content.Shared.Clothing.Components;
 using Content.Shared.Clothing.EntitySystems;
@@ -99,8 +100,8 @@ public bool TryActivate(Entity<ExpendableLightComponent> ent)
                     _item.SetHeldPrefix(ent, "lit", component: item);
                 }
 
-                var isHotEvent = new IsHotEvent() {IsHot = true};
-                RaiseLocalEvent(ent, isHotEvent);
+                var ignite = new IgnitionEvent(true);
+                RaiseLocalEvent(ent, ref ignite);
 
                 component.CurrentState = ExpendableLightState.Lit;
                 component.StateExpiryTime = component.GlowDuration;
@@ -134,8 +135,8 @@ private void UpdateVisualizer(Entity<ExpendableLightComponent> ent, AppearanceCo
 
                 case ExpendableLightState.Dead:
                     _appearance.SetData(ent, ExpendableLightVisuals.Behavior, string.Empty, appearance);
-                    var isHotEvent = new IsHotEvent() {IsHot = true};
-                    RaiseLocalEvent(ent, isHotEvent);
+                    var ignite = new IgnitionEvent(false);
+                    RaiseLocalEvent(ent, ref ignite);
                     break;
             }
         }
diff --git a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs
index 8aa432c21ea..33b7ce0782f 100644
--- a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs
+++ b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs
@@ -1,5 +1,4 @@
 using Content.Server.Administration.Logs;
-using Content.Server.Clothing.Components;
 using Content.Server.DeviceLinking.Events;
 using Content.Server.DeviceLinking.Systems;
 using Content.Server.DeviceNetwork;
@@ -24,6 +23,8 @@
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
 using Robust.Shared.Audio.Systems;
+using Content.Shared.Damage.Systems;
+using Content.Shared.Damage.Components;
 
 namespace Content.Server.Light.EntitySystems
 {
@@ -33,11 +34,8 @@ namespace Content.Server.Light.EntitySystems
     public sealed class PoweredLightSystem : EntitySystem
     {
         [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly DamageableSystem _damageableSystem = default!;
         [Dependency] private readonly SharedAmbientSoundSystem _ambientSystem = default!;
         [Dependency] private readonly LightBulbSystem _bulbSystem = default!;
-        [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
-        [Dependency] private readonly IAdminLogManager _adminLogger= default!;
         [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
         [Dependency] private readonly DeviceLinkSystem _signalSystem = default!;
         [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
@@ -45,7 +43,7 @@ public sealed class PoweredLightSystem : EntitySystem
         [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly PointLightSystem _pointLight = default!;
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-        [Dependency] private readonly InventorySystem _inventory = default!;
+        [Dependency] private readonly DamageOnInteractSystem _damageOnInteractSystem = default!;
 
         private static readonly TimeSpan ThunkDelay = TimeSpan.FromSeconds(2);
         public const string LightBulbContainer = "light_bulb";
@@ -106,40 +104,7 @@ private void OnInteractHand(EntityUid uid, PoweredLightComponent light, Interact
             if (bulbUid == null)
                 return;
 
-            // check if it's possible to apply burn damage to user
             var userUid = args.User;
-            if (EntityManager.TryGetComponent(bulbUid.Value, out LightBulbComponent? lightBulb))
-            {
-                // get users heat resistance
-                var res = int.MinValue;
-                if (_inventory.TryGetSlotEntity(userUid, "gloves", out var slotEntity) &&
-                    TryComp<GloveHeatResistanceComponent>(slotEntity, out var gloves))
-                {
-                    res = gloves.HeatResistance;
-                }
-
-                // check heat resistance against user
-                var burnedHand = light.CurrentLit && res < lightBulb.BurningTemperature;
-                if (burnedHand)
-                {
-                    var damage = _damageableSystem.TryChangeDamage(userUid, light.Damage, origin: userUid);
-
-                    // If damage is null then the entity could not take heat damage so they did not get burned.
-                    if (damage != null)
-                    {
-
-                        var burnMsg = Loc.GetString("powered-light-component-burn-hand");
-                        _popupSystem.PopupEntity(burnMsg, uid, userUid);
-                        _adminLogger.Add(LogType.Damaged, $"{ToPrettyString(args.User):user} burned their hand on {ToPrettyString(args.Target):target} and received {damage.GetTotal():damage} damage");
-                        _audio.PlayEntity(light.BurnHandSound, Filter.Pvs(uid), uid, true);
-
-                        args.Handled = true;
-                        return;
-                    }
-                }
-            }
-
-
             //removing a broken/burned bulb, so allow instant removal
             if(TryComp<LightBulbComponent>(bulbUid.Value, out var bulb) && bulb.State != LightBulbState.Normal)
             {
@@ -435,6 +400,10 @@ private void SetLight(EntityUid uid, bool value, Color? color = null, PoweredLig
                 if (softness != null)
                     _pointLight.SetSoftness(uid, (float) softness, pointLight);
             }
+
+            // light bulbs burn your hands!
+            if (TryComp<DamageOnInteractComponent>(uid, out var damageOnInteractComp))
+                _damageOnInteractSystem.SetIsDamageActiveTo((uid, damageOnInteractComp), value);
         }
 
         public void ToggleLight(EntityUid uid, PoweredLightComponent? light = null)
diff --git a/Content.Server/Lightning/LightningSystem.cs b/Content.Server/Lightning/LightningSystem.cs
index 2147ac80f2e..8b0a18afb35 100644
--- a/Content.Server/Lightning/LightningSystem.cs
+++ b/Content.Server/Lightning/LightningSystem.cs
@@ -71,14 +71,14 @@ public void ShootLightning(EntityUid user, EntityUid target, string lightningPro
     /// <param name="triggerLightningEvents">if the lightnings being fired should trigger lightning events.</param>
     public void ShootRandomLightnings(EntityUid user, float range, int boltCount, string lightningPrototype = "Lightning", int arcDepth = 0, bool triggerLightningEvents = true)
     {
-        //To Do: add support to different priority target tablem for different lightning types
-        //To Do: Remove Hardcode LightningTargetComponent (this should be a parameter of the SharedLightningComponent)
-        //To Do: This is still pretty bad for perf but better than before and at least it doesn't re-allocate
+        //TODO: add support to different priority target tablem for different lightning types
+        //TODO: Remove Hardcode LightningTargetComponent (this should be a parameter of the SharedLightningComponent)
+        //TODO: This is still pretty bad for perf but better than before and at least it doesn't re-allocate
         // several hashsets every time
 
-        var targets = _lookup.GetComponentsInRange<LightningTargetComponent>(_transform.GetMapCoordinates(user), range).ToList();
+        var targets = _lookup.GetEntitiesInRange<LightningTargetComponent>(_transform.GetMapCoordinates(user), range).ToList();
         _random.Shuffle(targets);
-        targets.Sort((x, y) => y.Priority.CompareTo(x.Priority));
+        targets.Sort((x, y) => y.Comp.Priority.CompareTo(x.Comp.Priority));
 
         int shootedCount = 0;
         int count = -1;
@@ -89,13 +89,13 @@ public void ShootRandomLightnings(EntityUid user, float range, int boltCount, st
             if (count >= targets.Count) { break; }
 
             var curTarget = targets[count];
-            if (!_random.Prob(curTarget.HitProbability)) //Chance to ignore target
+            if (!_random.Prob(curTarget.Comp.HitProbability)) //Chance to ignore target
                 continue;
 
             ShootLightning(user, targets[count].Owner, lightningPrototype, triggerLightningEvents);
-            if (arcDepth - targets[count].LightningResistance > 0)
+            if (arcDepth - targets[count].Comp.LightningResistance > 0)
             {
-                ShootRandomLightnings(targets[count].Owner, range, 1, lightningPrototype, arcDepth - targets[count].LightningResistance, triggerLightningEvents);
+                ShootRandomLightnings(targets[count].Owner, range, 1, lightningPrototype, arcDepth - targets[count].Comp.LightningResistance, triggerLightningEvents);
             }
             shootedCount++;
         }
diff --git a/Content.Server/Lightning/LightningTargetSystem.cs b/Content.Server/Lightning/LightningTargetSystem.cs
index bc99def9742..4a0ee23c5b7 100644
--- a/Content.Server/Lightning/LightningTargetSystem.cs
+++ b/Content.Server/Lightning/LightningTargetSystem.cs
@@ -35,6 +35,7 @@ private void OnHitByLightning(Entity<LightningTargetComponent> uid, ref HitByLig
                 uid.Comp.ExplosionPrototype,
                 uid.Comp.TotalIntensity, uid.Comp.Dropoff,
                 uid.Comp.MaxTileIntensity,
+                uid,
                 canCreateVacuum: false);
         }
     }
diff --git a/Content.Server/Lube/LubedSystem.cs b/Content.Server/Lube/LubedSystem.cs
index c2d15c8a284..3c536dcceb2 100644
--- a/Content.Server/Lube/LubedSystem.cs
+++ b/Content.Server/Lube/LubedSystem.cs
@@ -43,7 +43,7 @@ private void OnHandPickUp(EntityUid uid, LubedComponent component, ContainerGett
         var user = args.Container.Owner;
         _transform.SetCoordinates(uid, Transform(user).Coordinates);
         _transform.AttachToGridOrMap(uid);
-        _throwing.TryThrow(uid, _random.NextVector2(), strength: component.SlipStrength);
+        _throwing.TryThrow(uid, _random.NextVector2(), baseThrowSpeed: component.SlipStrength);
         _popup.PopupEntity(Loc.GetString("lube-slip", ("target", Identity.Entity(uid, EntityManager))), user, user, PopupType.MediumCaution);
     }
 
diff --git a/Content.Server/MagicMirror/MagicMirrorSystem.cs b/Content.Server/MagicMirror/MagicMirrorSystem.cs
index 8d8a6bfa3b4..082fc81bd2b 100644
--- a/Content.Server/MagicMirror/MagicMirrorSystem.cs
+++ b/Content.Server/MagicMirror/MagicMirrorSystem.cs
@@ -4,8 +4,12 @@
 using Content.Shared.DoAfter;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
+using Content.Shared.Inventory;
 using Content.Shared.MagicMirror;
+using Content.Shared.Popups;
+using Content.Shared.Tag;
 using Robust.Shared.Audio.Systems;
 
 namespace Content.Server.MagicMirror;
@@ -19,6 +23,9 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem
     [Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
     [Dependency] private readonly MarkingManager _markings = default!;
     [Dependency] private readonly HumanoidAppearanceSystem _humanoid = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly InventorySystem _inventory = default!;
+    [Dependency] private readonly TagSystem _tagSystem = default!;
 
     public override void Initialize()
     {
@@ -46,9 +53,26 @@ private void OnMagicMirrorSelect(EntityUid uid, MagicMirrorComponent component,
         if (component.Target is not { } target)
             return;
 
+        // Check if the target getting their hair altered has any clothes that hides their hair
+        if (CheckHeadSlotOrClothes(message.Actor, component.Target.Value))
+        {
+            _popup.PopupEntity(
+                component.Target == message.Actor
+                    ? Loc.GetString("magic-mirror-blocked-by-hat-self")
+                    : Loc.GetString("magic-mirror-blocked-by-hat-self-target"),
+                message.Actor,
+                message.Actor,
+                PopupType.Medium);
+            return;
+        }
+
         _doAfterSystem.Cancel(component.DoAfter);
         component.DoAfter = null;
 
+        var doafterTime = component.SelectSlotTime;
+        if (component.Target == message.Actor)
+            doafterTime /= 3;
+
         var doAfter = new MagicMirrorSelectDoAfterEvent()
         {
             Category = message.Category,
@@ -56,16 +80,24 @@ private void OnMagicMirrorSelect(EntityUid uid, MagicMirrorComponent component,
             Marking = message.Marking,
         };
 
-        _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, message.Actor, component.SelectSlotTime, doAfter, uid, target: target, used: uid)
+        _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, message.Actor, doafterTime, doAfter, uid, target: target, used: uid)
         {
             DistanceThreshold = SharedInteractionSystem.InteractionRange,
             BreakOnDamage = true,
             BreakOnMove = true,
-            BreakOnHandChange = false,
-            NeedHand = true
+            NeedHand = true,
         },
             out var doAfterId);
 
+        if (component.Target == message.Actor)
+        {
+            _popup.PopupEntity(Loc.GetString("magic-mirror-change-slot-self"), component.Target.Value, component.Target.Value, PopupType.Medium);
+        }
+        else
+        {
+            _popup.PopupEntity(Loc.GetString("magic-mirror-change-slot-target", ("user", Identity.Name(message.Actor, EntityManager))), component.Target.Value, component.Target.Value, PopupType.Medium);
+        }
+
         component.DoAfter = doAfterId;
         _audio.PlayPvs(component.ChangeHairSound, uid);
     }
@@ -102,9 +134,26 @@ private void OnTryMagicMirrorChangeColor(EntityUid uid, MagicMirrorComponent com
         if (component.Target is not { } target)
             return;
 
+                // Check if the target getting their hair altered has any clothes that hides their hair
+        if (CheckHeadSlotOrClothes(message.Actor, component.Target.Value))
+        {
+            _popup.PopupEntity(
+                component.Target == message.Actor
+                    ? Loc.GetString("magic-mirror-blocked-by-hat-self")
+                    : Loc.GetString("magic-mirror-blocked-by-hat-self-target"),
+                message.Actor,
+                message.Actor,
+                PopupType.Medium);
+            return;
+        }
+
         _doAfterSystem.Cancel(component.DoAfter);
         component.DoAfter = null;
 
+        var doafterTime = component.ChangeSlotTime;
+        if (component.Target == message.Actor)
+            doafterTime /= 3;
+
         var doAfter = new MagicMirrorChangeColorDoAfterEvent()
         {
             Category = message.Category,
@@ -112,15 +161,23 @@ private void OnTryMagicMirrorChangeColor(EntityUid uid, MagicMirrorComponent com
             Colors = message.Colors,
         };
 
-        _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, message.Actor, component.ChangeSlotTime, doAfter, uid, target: target, used: uid)
+        _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, message.Actor, doafterTime, doAfter, uid, target: target, used: uid)
         {
             BreakOnDamage = true,
             BreakOnMove = true,
-            BreakOnHandChange = false,
             NeedHand = true
         },
             out var doAfterId);
 
+        if (component.Target == message.Actor)
+        {
+            _popup.PopupEntity(Loc.GetString("magic-mirror-change-color-self"), component.Target.Value, component.Target.Value, PopupType.Medium);
+        }
+        else
+        {
+            _popup.PopupEntity(Loc.GetString("magic-mirror-change-color-target", ("user", Identity.Name(message.Actor, EntityManager))), component.Target.Value, component.Target.Value, PopupType.Medium);
+        }
+
         component.DoAfter = doAfterId;
     }
     private void OnChangeColorDoAfter(EntityUid uid, MagicMirrorComponent component, MagicMirrorChangeColorDoAfterEvent args)
@@ -156,24 +213,49 @@ private void OnTryMagicMirrorRemoveSlot(EntityUid uid, MagicMirrorComponent comp
         if (component.Target is not { } target)
             return;
 
+        // Check if the target getting their hair altered has any clothes that hides their hair
+        if (CheckHeadSlotOrClothes(message.Actor, component.Target.Value))
+        {
+            _popup.PopupEntity(
+                component.Target == message.Actor
+                    ? Loc.GetString("magic-mirror-blocked-by-hat-self")
+                    : Loc.GetString("magic-mirror-blocked-by-hat-self-target"),
+                message.Actor,
+                message.Actor,
+                PopupType.Medium);
+            return;
+        }
+
         _doAfterSystem.Cancel(component.DoAfter);
         component.DoAfter = null;
 
+        var doafterTime = component.RemoveSlotTime;
+        if (component.Target == message.Actor)
+            doafterTime /= 3;
+
         var doAfter = new MagicMirrorRemoveSlotDoAfterEvent()
         {
             Category = message.Category,
             Slot = message.Slot,
         };
 
-        _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, message.Actor, component.RemoveSlotTime, doAfter, uid, target: target, used: uid)
+        _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, message.Actor, doafterTime, doAfter, uid, target: target, used: uid)
         {
             DistanceThreshold = SharedInteractionSystem.InteractionRange,
             BreakOnDamage = true,
-            BreakOnHandChange = false,
             NeedHand = true
         },
             out var doAfterId);
 
+        if (component.Target == message.Actor)
+        {
+            _popup.PopupEntity(Loc.GetString("magic-mirror-remove-slot-self"), component.Target.Value, component.Target.Value, PopupType.Medium);
+        }
+        else
+        {
+            _popup.PopupEntity(Loc.GetString("magic-mirror-remove-slot-target", ("user", Identity.Name(message.Actor, EntityManager))), component.Target.Value, component.Target.Value, PopupType.Medium);
+        }
+
         component.DoAfter = doAfterId;
         _audio.PlayPvs(component.ChangeHairSound, uid);
     }
@@ -210,23 +292,48 @@ private void OnTryMagicMirrorAddSlot(EntityUid uid, MagicMirrorComponent compone
         if (component.Target == null)
             return;
 
+        // Check if the target getting their hair altered has any clothes that hides their hair
+        if (CheckHeadSlotOrClothes(message.Actor, component.Target.Value))
+        {
+            _popup.PopupEntity(
+                component.Target == message.Actor
+                    ? Loc.GetString("magic-mirror-blocked-by-hat-self")
+                    : Loc.GetString("magic-mirror-blocked-by-hat-self-target"),
+                message.Actor,
+                message.Actor,
+                PopupType.Medium);
+            return;
+        }
+
         _doAfterSystem.Cancel(component.DoAfter);
         component.DoAfter = null;
 
+        var doafterTime = component.AddSlotTime;
+        if (component.Target == message.Actor)
+            doafterTime /= 3;
+
         var doAfter = new MagicMirrorAddSlotDoAfterEvent()
         {
             Category = message.Category,
         };
 
-        _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, message.Actor, component.AddSlotTime, doAfter, uid, target: component.Target.Value, used: uid)
+        _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, message.Actor, doafterTime, doAfter, uid, target: component.Target.Value, used: uid)
         {
             BreakOnDamage = true,
             BreakOnMove = true,
-            BreakOnHandChange = false,
-            NeedHand = true
+            NeedHand = true,
         },
             out var doAfterId);
 
+        if (component.Target == message.Actor)
+        {
+            _popup.PopupEntity(Loc.GetString("magic-mirror-add-slot-self"), component.Target.Value, component.Target.Value, PopupType.Medium);
+        }
+        else
+        {
+            _popup.PopupEntity(Loc.GetString("magic-mirror-add-slot-target", ("user", Identity.Name(message.Actor, EntityManager))), component.Target.Value, component.Target.Value, PopupType.Medium);
+        }
+
         component.DoAfter = doAfterId;
         _audio.PlayPvs(component.ChangeHairSound, uid);
     }
@@ -265,4 +372,32 @@ private void OnUiClosed(Entity<MagicMirrorComponent> ent, ref BoundUIClosedEvent
         ent.Comp.Target = null;
         Dirty(ent);
     }
+
+    /// <summary>
+    /// Helper function that checks if the wearer has anything on their head
+    /// Or if they have any clothes that hides their hair
+    /// </summary>
+    private bool CheckHeadSlotOrClothes(EntityUid user, EntityUid target)
+    {
+        if (TryComp<InventoryComponent>(target, out var inventoryComp))
+        {
+            // any hat whatsoever will block haircutting
+            if (_inventory.TryGetSlotEntity(target, "head", out var hat, inventoryComp))
+            {
+                return true;
+            }
+
+            // maybe there's some kind of armor that has the HidesHair tag as well, so check every slot for it
+            var slots = _inventory.GetSlotEnumerator((target, inventoryComp), SlotFlags.WITHOUT_POCKET);
+            while (slots.MoveNext(out var slot))
+            {
+                if (slot.ContainedEntity != null && _tagSystem.HasTag(slot.ContainedEntity.Value, "HidesHair"))
+                {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
 }
diff --git a/Content.Server/Maps/GridDraggingSystem.cs b/Content.Server/Maps/GridDraggingSystem.cs
index 76b2e29dea0..cf71e012f48 100644
--- a/Content.Server/Maps/GridDraggingSystem.cs
+++ b/Content.Server/Maps/GridDraggingSystem.cs
@@ -12,6 +12,7 @@ public sealed class GridDraggingSystem : SharedGridDraggingSystem
 {
     [Dependency] private readonly IConGroupController _admin = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+    [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
 
     private readonly HashSet<ICommonSession> _draggers = new();
 
@@ -76,8 +77,6 @@ private void OnRequestDrag(GridDragRequestPosition msg, EntitySessionEventArgs a
             return;
         }
 
-        var gridXform = Transform(grid);
-
-        gridXform.WorldPosition = msg.WorldPosition;
+        _transformSystem.SetWorldPosition(grid, msg.WorldPosition);
     }
 }
diff --git a/Content.Server/MassMedia/Systems/NewsSystem.cs b/Content.Server/MassMedia/Systems/NewsSystem.cs
index 0fb5d423949..9f917d6dbfa 100644
--- a/Content.Server/MassMedia/Systems/NewsSystem.cs
+++ b/Content.Server/MassMedia/Systems/NewsSystem.cs
@@ -20,6 +20,7 @@
 using Content.Shared.Popups;
 using Content.Shared.StationRecords;
 using Robust.Shared.Audio.Systems;
+using Content.Server.Chat.Managers;
 
 namespace Content.Server.MassMedia.Systems;
 
@@ -35,6 +36,7 @@ public sealed class NewsSystem : SharedNewsSystem
     [Dependency] private readonly GameTicker _ticker = default!;
     [Dependency] private readonly AccessReaderSystem _accessReader = default!;
     [Dependency] private readonly IdCardSystem _idCardSystem = default!;
+    [Dependency] private readonly IChatManager _chatManager = default!;
 
     public override void Initialize()
     {
@@ -161,6 +163,12 @@ private void OnWriteUiPublishMessage(Entity<NewsWriterComponent> ent, ref NewsWr
             $"{ToPrettyString(msg.Actor):actor} created news article {article.Title} by {article.Author}: {article.Content}"
             );
 
+        _chatManager.SendAdminAnnouncement(Loc.GetString("news-publish-admin-announcement",
+            ("actor", msg.Actor),
+            ("title", article.Title),
+            ("author", article.Author ?? Loc.GetString("news-read-ui-no-author"))
+            ));
+
         articles.Add(article);
 
         var args = new NewsArticlePublishedEvent(article);
diff --git a/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs b/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs
index c5c44056b96..aa28a8063c0 100644
--- a/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs
+++ b/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Server.Interaction;
 using Content.Server.Mech.Equipment.Components;
 using Content.Server.Mech.Systems;
@@ -85,7 +85,7 @@ public void RemoveItem(EntityUid uid, EntityUid mech, EntityUid toRemove, MechGr
         var (mechPos, mechRot) = _transform.GetWorldPositionRotation(mechxform);
 
         var offset = mechPos + mechRot.RotateVec(component.DepositOffset);
-        _transform.SetWorldPositionRotation(xform, offset, Angle.Zero);
+        _transform.SetWorldPositionRotation(toRemove, offset, Angle.Zero);
         _mech.UpdateUserInterface(mech);
     }
 
diff --git a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
index a6285294c94..5be93f7fbc4 100644
--- a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
+++ b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
@@ -169,7 +169,7 @@ private void OnAfterInteractUsing(Entity<BiomassReclaimerComponent> reclaimer, r
             _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, delay, new ReclaimerDoAfterEvent(), reclaimer, target: args.Target, used: args.Used)
             {
                 NeedHand = true,
-                BreakOnMove = true
+                BreakOnMove = true,
             });
         }
 
diff --git a/Content.Server/Medical/Components/HealthAnalyzerComponent.cs b/Content.Server/Medical/Components/HealthAnalyzerComponent.cs
index 6380b71c8a0..de40e98e182 100644
--- a/Content.Server/Medical/Components/HealthAnalyzerComponent.cs
+++ b/Content.Server/Medical/Components/HealthAnalyzerComponent.cs
@@ -6,6 +6,9 @@ namespace Content.Server.Medical.Components;
 /// <summary>
 /// After scanning, retrieves the target Uid to use with its related UI.
 /// </summary>
+/// <remarks>
+/// Requires <c>ItemToggleComponent</c>.
+/// </remarks>
 [RegisterComponent, AutoGenerateComponentPause]
 [Access(typeof(HealthAnalyzerSystem), typeof(CryoPodSystem))]
 public sealed partial class HealthAnalyzerComponent : Component
diff --git a/Content.Server/Medical/CrewMonitoring/CrewMonitoringServerSystem.cs b/Content.Server/Medical/CrewMonitoring/CrewMonitoringServerSystem.cs
index 864ce2c55ec..d7b8cc67a50 100644
--- a/Content.Server/Medical/CrewMonitoring/CrewMonitoringServerSystem.cs
+++ b/Content.Server/Medical/CrewMonitoring/CrewMonitoringServerSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.DeviceNetwork;
+using Content.Server.DeviceNetwork;
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.Medical.SuitSensors;
diff --git a/Content.Server/Medical/DefibrillatorSystem.cs b/Content.Server/Medical/DefibrillatorSystem.cs
index 4373532f018..c9cb6cc58dc 100644
--- a/Content.Server/Medical/DefibrillatorSystem.cs
+++ b/Content.Server/Medical/DefibrillatorSystem.cs
@@ -12,6 +12,7 @@
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Components;
 using Content.Shared.Interaction.Events;
+using Content.Shared.Item.ItemToggle;
 using Content.Shared.Medical;
 using Content.Shared.Mind;
 using Content.Shared.Mobs;
@@ -37,6 +38,7 @@ public sealed class DefibrillatorSystem : EntitySystem
     [Dependency] private readonly DoAfterSystem _doAfter = default!;
     [Dependency] private readonly ElectrocutionSystem _electrocution = default!;
     [Dependency] private readonly EuiManager _euiManager = default!;
+    [Dependency] private readonly ItemToggleSystem _toggle = default!;
     [Dependency] private readonly RottingSystem _rotting = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
     [Dependency] private readonly MobThresholdSystem _mobThreshold = default!;
@@ -44,36 +46,15 @@ public sealed class DefibrillatorSystem : EntitySystem
     [Dependency] private readonly PowerCellSystem _powerCell = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly UseDelaySystem _useDelay = default!;
     [Dependency] private readonly SharedMindSystem _mind = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
     {
-        SubscribeLocalEvent<DefibrillatorComponent, UseInHandEvent>(OnUseInHand);
-        SubscribeLocalEvent<DefibrillatorComponent, PowerCellSlotEmptyEvent>(OnPowerCellSlotEmpty);
         SubscribeLocalEvent<DefibrillatorComponent, AfterInteractEvent>(OnAfterInteract);
         SubscribeLocalEvent<DefibrillatorComponent, DefibrillatorZapDoAfterEvent>(OnDoAfter);
     }
 
-    private void OnUseInHand(EntityUid uid, DefibrillatorComponent component, UseInHandEvent args)
-    {
-        if (args.Handled || !TryComp(uid, out UseDelayComponent? useDelay) || _useDelay.IsDelayed((uid, useDelay)))
-            return;
-
-        if (!TryToggle(uid, component, args.User))
-            return;
-
-        args.Handled = true;
-        _useDelay.TryResetDelay((uid, useDelay));
-    }
-
-    private void OnPowerCellSlotEmpty(EntityUid uid, DefibrillatorComponent component, ref PowerCellSlotEmptyEvent args)
-    {
-        if (!TerminatingOrDeleted(uid))
-            TryDisable(uid, component);
-    }
-
     private void OnAfterInteract(EntityUid uid, DefibrillatorComponent component, AfterInteractEvent args)
     {
         if (args.Handled || args.Target is not { } target)
@@ -96,54 +77,12 @@ private void OnDoAfter(EntityUid uid, DefibrillatorComponent component, Defibril
         Zap(uid, target, args.User, component);
     }
 
-    public bool TryToggle(EntityUid uid, DefibrillatorComponent? component = null, EntityUid? user = null)
-    {
-        if (!Resolve(uid, ref component))
-            return false;
-
-        return component.Enabled
-            ? TryDisable(uid, component)
-            : TryEnable(uid, component, user);
-    }
-
-    public bool TryEnable(EntityUid uid, DefibrillatorComponent? component = null, EntityUid? user = null)
-    {
-        if (!Resolve(uid, ref component))
-            return false;
-
-        if (component.Enabled)
-            return false;
-
-        if (!_powerCell.HasActivatableCharge(uid))
-            return false;
-
-        component.Enabled = true;
-        _appearance.SetData(uid, ToggleVisuals.Toggled, true);
-        _audio.PlayPvs(component.PowerOnSound, uid);
-        return true;
-    }
-
-    public bool TryDisable(EntityUid uid, DefibrillatorComponent? component = null)
-    {
-        if (!Resolve(uid, ref component))
-            return false;
-
-        if (!component.Enabled)
-            return false;
-
-        component.Enabled = false;
-        _appearance.SetData(uid, ToggleVisuals.Toggled, false);
-
-        _audio.PlayPvs(component.PowerOffSound, uid);
-        return true;
-    }
-
     public bool CanZap(EntityUid uid, EntityUid target, EntityUid? user = null, DefibrillatorComponent? component = null)
     {
         if (!Resolve(uid, ref component))
             return false;
 
-        if (!component.Enabled)
+        if (!_toggle.IsActivated(uid))
         {
             if (user != null)
                 _popup.PopupEntity(Loc.GetString("defibrillator-not-on"), uid, user.Value);
@@ -180,8 +119,6 @@ public bool TryStartZap(EntityUid uid, EntityUid target, EntityUid user, Defibri
         return _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, component.DoAfterDuration, new DefibrillatorZapDoAfterEvent(),
             uid, target, uid)
             {
-                BlockDuplicate = true,
-                BreakOnHandChange = true,
                 NeedHand = true,
                 BreakOnMove = !component.AllowDoAfterMovement
             });
@@ -257,7 +194,7 @@ public void Zap(EntityUid uid, EntityUid target, EntityUid user, DefibrillatorCo
 
         // if we don't have enough power left for another shot, turn it off
         if (!_powerCell.HasActivatableCharge(uid))
-            TryDisable(uid, component);
+            _toggle.TryDeactivate(uid);
 
         // TODO clean up this clown show above
         var ev = new TargetDefibrillatedEvent(user, (uid, component));
diff --git a/Content.Server/Medical/HealingSystem.cs b/Content.Server/Medical/HealingSystem.cs
index b89710cc5f2..ab31066cf8a 100644
--- a/Content.Server/Medical/HealingSystem.cs
+++ b/Content.Server/Medical/HealingSystem.cs
@@ -10,12 +10,14 @@
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
 using Content.Shared.FixedPoint;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Medical;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
+using Content.Shared.Popups;
 using Content.Shared.Stacks;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Random;
@@ -188,6 +190,12 @@ targetDamage.DamageContainerID is not null &&
 
         var isNotSelf = user != target;
 
+        if (isNotSelf)
+        {
+            var msg = Loc.GetString("medical-item-popup-target", ("user", Identity.Entity(user, EntityManager)), ("item", uid));
+            _popupSystem.PopupEntity(msg, target, target, PopupType.Medium);
+        }
+
         var delay = isNotSelf
             ? component.Delay
             : component.Delay * GetScaledHealingPenalty(user, component);
diff --git a/Content.Server/Medical/HealthAnalyzerSystem.cs b/Content.Server/Medical/HealthAnalyzerSystem.cs
index 7282ea197c9..dadfa433e10 100644
--- a/Content.Server/Medical/HealthAnalyzerSystem.cs
+++ b/Content.Server/Medical/HealthAnalyzerSystem.cs
@@ -5,10 +5,14 @@
 using Content.Server.Temperature.Components;
 using Content.Shared.Damage;
 using Content.Shared.DoAfter;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
+using Content.Shared.Item.ItemToggle;
+using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.MedicalScanner;
 using Content.Shared.Mobs.Components;
+using Content.Shared.Popups;
 using Content.Shared.PowerCell;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
@@ -24,16 +28,18 @@ public sealed class HealthAnalyzerSystem : EntitySystem
     [Dependency] private readonly PowerCellSystem _cell = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
+    [Dependency] private readonly ItemToggleSystem _toggle = default!;
     [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
     [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
     [Dependency] private readonly TransformSystem _transformSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
 
     public override void Initialize()
     {
         SubscribeLocalEvent<HealthAnalyzerComponent, AfterInteractEvent>(OnAfterInteract);
         SubscribeLocalEvent<HealthAnalyzerComponent, HealthAnalyzerDoAfterEvent>(OnDoAfter);
         SubscribeLocalEvent<HealthAnalyzerComponent, EntGotInsertedIntoContainerMessage>(OnInsertedIntoContainer);
-        SubscribeLocalEvent<HealthAnalyzerComponent, PowerCellSlotEmptyEvent>(OnPowerCellSlotEmpty);
+        SubscribeLocalEvent<HealthAnalyzerComponent, ItemToggledEvent>(OnToggled);
         SubscribeLocalEvent<HealthAnalyzerComponent, DroppedEvent>(OnDropped);
     }
 
@@ -59,7 +65,7 @@ public override void Update(float frameTime)
 
             //Get distance between health analyzer and the scanned entity
             var patientCoordinates = Transform(patient).Coordinates;
-            if (!patientCoordinates.InRange(EntityManager, _transformSystem, transform.Coordinates, component.MaxScanRange))
+            if (!_transformSystem.InRange(patientCoordinates, transform.Coordinates, component.MaxScanRange))
             {
                 //Range too far, disable updates
                 StopAnalyzingEntity((uid, component), patient);
@@ -80,11 +86,17 @@ private void OnAfterInteract(Entity<HealthAnalyzerComponent> uid, ref AfterInter
 
         _audio.PlayPvs(uid.Comp.ScanningBeginSound, uid);
 
-        _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, uid.Comp.ScanDelay, new HealthAnalyzerDoAfterEvent(), uid, target: args.Target, used: uid)
+        var doAfterCancelled = !_doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, uid.Comp.ScanDelay, new HealthAnalyzerDoAfterEvent(), uid, target: args.Target, used: uid)
         {
             NeedHand = true,
-            BreakOnMove = true
+            BreakOnMove = true,
         });
+        
+        if (args.Target == args.User || doAfterCancelled)
+            return;
+
+        var msg = Loc.GetString("health-analyzer-popup-scan-target", ("user", Identity.Entity(args.User, EntityManager)));
+        _popupSystem.PopupEntity(msg, args.Target.Value, args.Target.Value, PopupType.Medium);
     }
 
     private void OnDoAfter(Entity<HealthAnalyzerComponent> uid, ref HealthAnalyzerDoAfterEvent args)
@@ -105,16 +117,16 @@ private void OnDoAfter(Entity<HealthAnalyzerComponent> uid, ref HealthAnalyzerDo
     private void OnInsertedIntoContainer(Entity<HealthAnalyzerComponent> uid, ref EntGotInsertedIntoContainerMessage args)
     {
         if (uid.Comp.ScannedEntity is { } patient)
-            StopAnalyzingEntity(uid, patient);
+            _toggle.TryDeactivate(uid.Owner);
     }
 
     /// <summary>
-    /// Disable continuous updates once battery is dead
+    /// Disable continuous updates once turned off
     /// </summary>
-    private void OnPowerCellSlotEmpty(Entity<HealthAnalyzerComponent> uid, ref PowerCellSlotEmptyEvent args)
+    private void OnToggled(Entity<HealthAnalyzerComponent> ent, ref ItemToggledEvent args)
     {
-        if (uid.Comp.ScannedEntity is { } patient)
-            StopAnalyzingEntity(uid, patient);
+        if (!args.Activated && ent.Comp.ScannedEntity is { } patient)
+            StopAnalyzingEntity(ent, patient);
     }
 
     /// <summary>
@@ -123,7 +135,7 @@ private void OnPowerCellSlotEmpty(Entity<HealthAnalyzerComponent> uid, ref Power
     private void OnDropped(Entity<HealthAnalyzerComponent> uid, ref DroppedEvent args)
     {
         if (uid.Comp.ScannedEntity is { } patient)
-            StopAnalyzingEntity(uid, patient);
+            _toggle.TryDeactivate(uid.Owner);
     }
 
     private void OpenUserInterface(EntityUid user, EntityUid analyzer)
@@ -144,7 +156,7 @@ private void BeginAnalyzingEntity(Entity<HealthAnalyzerComponent> healthAnalyzer
         //Link the health analyzer to the scanned entity
         healthAnalyzer.Comp.ScannedEntity = target;
 
-        _cell.SetPowerCellDrawEnabled(healthAnalyzer, true);
+        _toggle.TryActivate(healthAnalyzer.Owner);
 
         UpdateScannedUser(healthAnalyzer, target, true);
     }
@@ -159,7 +171,7 @@ private void StopAnalyzingEntity(Entity<HealthAnalyzerComponent> healthAnalyzer,
         //Unlink the analyzer
         healthAnalyzer.Comp.ScannedEntity = null;
 
-        _cell.SetPowerCellDrawEnabled(target, false);
+        _toggle.TryDeactivate(healthAnalyzer.Owner);
 
         UpdateScannedUser(healthAnalyzer, target, false);
     }
diff --git a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
index e0917f32a84..dc1bb1124de 100644
--- a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
+++ b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
@@ -323,8 +323,7 @@ public void SetSensor(EntityUid uid, SuitSensorMode mode, EntityUid? userUid = n
                 userName = card.Comp.FullName;
             if (card.Comp.JobTitle != null)
                 userJob = card.Comp.JobTitle;
-            if (card.Comp.JobIcon != null)
-                userJobIcon = card.Comp.JobIcon;
+            userJobIcon = card.Comp.JobIcon;
 
             foreach (var department in card.Comp.JobDepartments)
                 userJobDepartments.Add(Loc.GetString(department));
diff --git a/Content.Server/Medical/VomitSystem.cs b/Content.Server/Medical/VomitSystem.cs
index 8c3b15aed33..4cc4e538cee 100644
--- a/Content.Server/Medical/VomitSystem.cs
+++ b/Content.Server/Medical/VomitSystem.cs
@@ -1,11 +1,12 @@
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
-using Content.Server.Chemistry.Containers.EntitySystems;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Forensics;
 using Content.Server.Popups;
 using Content.Server.Stunnable;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Reagent;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;
@@ -24,10 +25,11 @@ public sealed class VomitSystem : EntitySystem
         [Dependency] private readonly HungerSystem _hunger = default!;
         [Dependency] private readonly PopupSystem _popup = default!;
         [Dependency] private readonly PuddleSystem _puddle = default!;
-        [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!;
+        [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
         [Dependency] private readonly StunSystem _stun = default!;
         [Dependency] private readonly ThirstSystem _thirst = default!;
         [Dependency] private readonly ForensicsSystem _forensics = default!;
+        [Dependency] private readonly BloodstreamSystem _bloodstream = default!;
 
         /// <summary>
         /// Make an entity vomit, if they have a stomach.
@@ -35,7 +37,7 @@ public sealed class VomitSystem : EntitySystem
         public void Vomit(EntityUid uid, float thirstAdded = -40f, float hungerAdded = -40f)
         {
             // Main requirement: You have a stomach
-            var stomachList = _body.GetBodyOrganComponents<StomachComponent>(uid);
+            var stomachList = _body.GetBodyOrganEntityComps<StomachComponent>(uid);
             if (stomachList.Count == 0)
                 return;
 
@@ -58,11 +60,11 @@ public void Vomit(EntityUid uid, float thirstAdded = -40f, float hungerAdded = -
             // Empty the stomach out into it
             foreach (var stomach in stomachList)
             {
-                if (_solutionContainer.ResolveSolution(stomach.Comp.Owner, StomachSystem.DefaultSolutionName, ref stomach.Comp.Solution, out var sol))
+                if (_solutionContainer.ResolveSolution(stomach.Owner, StomachSystem.DefaultSolutionName, ref stomach.Comp1.Solution, out var sol))
                 {
                     solution.AddSolution(sol, _proto);
                     sol.RemoveAllSolution();
-                    _solutionContainer.UpdateChemicals(stomach.Comp.Solution.Value);
+                    _solutionContainer.UpdateChemicals(stomach.Comp1.Solution.Value);
                 }
             }
             // Adds a tiny amount of the chem stream from earlier along with vomit
@@ -79,11 +81,11 @@ public void Vomit(EntityUid uid, float thirstAdded = -40f, float hungerAdded = -
                     vomitChemstreamAmount.ScaleSolution(chemMultiplier);
                     solution.AddSolution(vomitChemstreamAmount, _proto);
 
-                    vomitAmount -= (float) vomitChemstreamAmount.Volume;
+                    vomitAmount -= (float)vomitChemstreamAmount.Volume;
                 }
 
                 // Makes a vomit solution the size of 90% of the chemicals removed from the chemstream
-                solution.AddReagent("Vomit", vomitAmount); // TODO: Dehardcode vomit prototype
+                solution.AddReagent(new ReagentId("Vomit", _bloodstream.GetEntityBloodData(uid)), vomitAmount); // TODO: Dehardcode vomit prototype
             }
 
             if (_puddle.TrySpillAt(uid, solution, out var puddle, false))
diff --git a/Content.Server/Movement/StressTestMovementSystem.cs b/Content.Server/Movement/StressTestMovementSystem.cs
index 81ea6840e31..51916204da4 100644
--- a/Content.Server/Movement/StressTestMovementSystem.cs
+++ b/Content.Server/Movement/StressTestMovementSystem.cs
@@ -39,7 +39,7 @@ public override void Update(float frameTime)
             var x = MathF.Sin(stressTest.Progress * MathHelper.TwoPi);
             var y = MathF.Cos(stressTest.Progress * MathHelper.TwoPi);
 
-            _transform.SetWorldPosition(transform, stressTest.Origin + new Vector2(x, y) * 5);
+            _transform.SetWorldPosition((uid, transform), stressTest.Origin + new Vector2(x, y) * 5);
         }
     }
 }
diff --git a/Content.Server/Movement/Systems/PullController.cs b/Content.Server/Movement/Systems/PullController.cs
index 340dc5654e8..4bd4b603714 100644
--- a/Content.Server/Movement/Systems/PullController.cs
+++ b/Content.Server/Movement/Systems/PullController.cs
@@ -58,6 +58,7 @@ public sealed class PullController : VirtualController
     [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
     [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly SharedGravitySystem _gravity = default!;
+    [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
 
     /// <summary>
     ///     If distance between puller and pulled entity lower that this threshold,
@@ -133,8 +134,8 @@ private bool OnRequestMovePulledObject(ICommonSession? session, EntityCoordinate
         var range = 2f;
         var fromUserCoords = coords.WithEntityId(player, EntityManager);
         var userCoords = new EntityCoordinates(player, Vector2.Zero);
-
-        if (!coords.InRange(EntityManager, TransformSystem, userCoords, range))
+        
+        if (!_transformSystem.InRange(coords, userCoords, range))
         {
             var direction = fromUserCoords.Position - userCoords.Position;
 
diff --git a/Content.Server/NPC/HTN/HTNCompoundPrototype.cs b/Content.Server/NPC/HTN/HTNCompoundPrototype.cs
index 29cfb96f977..69f84419736 100644
--- a/Content.Server/NPC/HTN/HTNCompoundPrototype.cs
+++ b/Content.Server/NPC/HTN/HTNCompoundPrototype.cs
@@ -12,4 +12,10 @@ public sealed partial class HTNCompoundPrototype : IPrototype
 
     [DataField("branches", required: true)]
     public List<HTNBranch> Branches = new();
+
+    /// <summary>
+    /// Exclude this compound task from the CompoundRecursion integration test.
+    /// </summary>
+    [DataField]
+    public bool AllowRecursion = false;
 }
diff --git a/Content.Server/NPC/HTN/HTNPlanJob.cs b/Content.Server/NPC/HTN/HTNPlanJob.cs
index d6d10ad311f..9c62f5840a7 100644
--- a/Content.Server/NPC/HTN/HTNPlanJob.cs
+++ b/Content.Server/NPC/HTN/HTNPlanJob.cs
@@ -63,8 +63,13 @@ public HTNPlanJob(
         // How many primitive tasks we've added since last record.
         var primitiveCount = 0;
 
+        int tasksProcessed = 0;
+
         while (tasksToProcess.TryDequeue(out var currentTask))
         {
+            if (tasksProcessed++ > _rootTask.MaximumTasks)
+                throw new Exception("HTN Planner exceeded maximum tasks");
+
             switch (currentTask)
             {
                 case HTNCompoundTask compound:
@@ -160,9 +165,9 @@ private bool TryFindSatisfiedMethod(HTNCompoundTask compoundId, Queue<HTNTask> t
     {
         var compound = _protoManager.Index<HTNCompoundPrototype>(compoundId.Task);
 
-        for (var i = mtrIndex; i < compound.Branches.Count; i++)
+        for (; mtrIndex < compound.Branches.Count; mtrIndex++)
         {
-            var branch = compound.Branches[i];
+            var branch = compound.Branches[mtrIndex];
             var isValid = true;
 
             foreach (var con in branch.Preconditions)
diff --git a/Content.Server/NPC/HTN/HTNTask.cs b/Content.Server/NPC/HTN/HTNTask.cs
index 0f7c0a377ea..c09849d079f 100644
--- a/Content.Server/NPC/HTN/HTNTask.cs
+++ b/Content.Server/NPC/HTN/HTNTask.cs
@@ -3,4 +3,10 @@ namespace Content.Server.NPC.HTN;
 [ImplicitDataDefinitionForInheritors]
 public abstract partial class HTNTask
 {
+    /// <summary>
+    /// Limit the amount of tasks the planner considers. Exceeding this value sleeps the NPC and throws an exception.
+    /// The expected way to hit this limit is with badly written recursive tasks.
+    /// </summary>
+    [DataField]
+    public int MaximumTasks = 1000;
 }
diff --git a/Content.Server/NPC/HTN/Preconditions/CoordinatesInRangePrecondition.cs b/Content.Server/NPC/HTN/Preconditions/CoordinatesInRangePrecondition.cs
index 3485bd2a18c..452bf327f25 100644
--- a/Content.Server/NPC/HTN/Preconditions/CoordinatesInRangePrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/CoordinatesInRangePrecondition.cs
@@ -8,12 +8,19 @@ namespace Content.Server.NPC.HTN.Preconditions;
 public sealed partial class CoordinatesInRangePrecondition : HTNPrecondition
 {
     [Dependency] private readonly IEntityManager _entManager = default!;
+    private SharedTransformSystem _transformSystem = default!;
 
     [DataField("targetKey", required: true)] public string TargetKey = default!;
 
     [DataField("rangeKey", required: true)]
     public string RangeKey = default!;
 
+    public override void Initialize(IEntitySystemManager sysManager)
+    {
+        base.Initialize(sysManager);
+        _transformSystem = sysManager.GetEntitySystem<SharedTransformSystem>();
+    }
+
     public override bool IsMet(NPCBlackboard blackboard)
     {
         if (!blackboard.TryGetValue<EntityCoordinates>(NPCBlackboard.OwnerCoordinates, out var coordinates, _entManager))
@@ -22,6 +29,6 @@ public override bool IsMet(NPCBlackboard blackboard)
         if (!blackboard.TryGetValue<EntityCoordinates>(TargetKey, out var target, _entManager))
             return false;
 
-        return coordinates.InRange(_entManager, _entManager.System<SharedTransformSystem>(), target, blackboard.GetValueOrDefault<float>(RangeKey, _entManager));
+        return _transformSystem.InRange(coordinates, target, blackboard.GetValueOrDefault<float>(RangeKey, _entManager));
     }
 }
diff --git a/Content.Server/NPC/HTN/Preconditions/CoordinatesNotInRangePrecondition.cs b/Content.Server/NPC/HTN/Preconditions/CoordinatesNotInRangePrecondition.cs
index 9d000ca2eb8..901831679e8 100644
--- a/Content.Server/NPC/HTN/Preconditions/CoordinatesNotInRangePrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/CoordinatesNotInRangePrecondition.cs
@@ -8,12 +8,19 @@ namespace Content.Server.NPC.HTN.Preconditions;
 public sealed partial class CoordinatesNotInRangePrecondition : HTNPrecondition
 {
     [Dependency] private readonly IEntityManager _entManager = default!;
+    private SharedTransformSystem _transformSystem = default!;
 
     [DataField("targetKey", required: true)] public string TargetKey = default!;
 
     [DataField("rangeKey", required: true)]
     public string RangeKey = default!;
 
+    public override void Initialize(IEntitySystemManager sysManager)
+    {
+        base.Initialize(sysManager);
+        _transformSystem = sysManager.GetEntitySystem<SharedTransformSystem>();
+    }
+
     public override bool IsMet(NPCBlackboard blackboard)
     {
         if (!blackboard.TryGetValue<EntityCoordinates>(NPCBlackboard.OwnerCoordinates, out var coordinates, _entManager))
@@ -22,7 +29,7 @@ public override bool IsMet(NPCBlackboard blackboard)
         if (!blackboard.TryGetValue<EntityCoordinates>(TargetKey, out var target, _entManager))
             return false;
 
-        return !coordinates.InRange(_entManager, _entManager.System<SharedTransformSystem>(), target, blackboard.GetValueOrDefault<float>(RangeKey, _entManager));
+        return !_transformSystem.InRange(coordinates, target, blackboard.GetValueOrDefault<float>(RangeKey, _entManager));
     }
 }
 
diff --git a/Content.Server/NPC/HTN/Preconditions/HandcuffedPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/HandcuffedPrecondition.cs
new file mode 100644
index 00000000000..4a56eeb9539
--- /dev/null
+++ b/Content.Server/NPC/HTN/Preconditions/HandcuffedPrecondition.cs
@@ -0,0 +1,26 @@
+using Content.Server.Cuffs;
+using Content.Shared.Cuffs.Components;
+
+namespace Content.Server.NPC.HTN.Preconditions;
+
+public sealed partial class HandcuffedPrecondition : HTNPrecondition
+{
+    [Dependency] private readonly IEntityManager _entManager = default!;
+
+    [DataField]
+    public bool ReactOnlyWhenFullyCuffed = true;
+
+    public override bool IsMet(NPCBlackboard blackboard)
+    {
+        var cuffable = _entManager.System<CuffableSystem>();
+        var owner = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
+
+        if (!_entManager.TryGetComponent<CuffableComponent>(owner, out var cuffComp))
+            return false;
+
+        var target = (owner, cuffComp);
+
+        return cuffable.IsCuffed(target, ReactOnlyWhenFullyCuffed);
+    }
+
+}
diff --git a/Content.Server/NPC/HTN/Preconditions/TargetInRangePrecondition.cs b/Content.Server/NPC/HTN/Preconditions/TargetInRangePrecondition.cs
index aaccb426d71..921b5ffa226 100644
--- a/Content.Server/NPC/HTN/Preconditions/TargetInRangePrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/TargetInRangePrecondition.cs
@@ -8,11 +8,17 @@ namespace Content.Server.NPC.HTN.Preconditions;
 public sealed partial class TargetInRangePrecondition : HTNPrecondition
 {
     [Dependency] private readonly IEntityManager _entManager = default!;
+    private SharedTransformSystem _transformSystem = default!;
 
     [DataField("targetKey", required: true)] public string TargetKey = default!;
 
     [DataField("rangeKey", required: true)]
     public string RangeKey = default!;
+    public override void Initialize(IEntitySystemManager sysManager)
+    {
+        base.Initialize(sysManager);
+        _transformSystem = sysManager.GetEntitySystem<SharedTransformSystem>();
+    }
 
     public override bool IsMet(NPCBlackboard blackboard)
     {
@@ -23,6 +29,7 @@ public override bool IsMet(NPCBlackboard blackboard)
             !_entManager.TryGetComponent<TransformComponent>(target, out var targetXform))
             return false;
 
-        return coordinates.InRange(_entManager, _entManager.System<SharedTransformSystem>(), targetXform.Coordinates, blackboard.GetValueOrDefault<float>(RangeKey, _entManager));
+        var transformSystem = _entManager.System<SharedTransformSystem>;
+        return _transformSystem.InRange(coordinates, targetXform.Coordinates, blackboard.GetValueOrDefault<float>(RangeKey, _entManager));
     }
 }
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/Melee/MeleeOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/Melee/MeleeOperator.cs
index 32be027ec43..5a02b86201b 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/Melee/MeleeOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/Melee/MeleeOperator.cs
@@ -89,7 +89,8 @@ public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTi
         HTNOperatorStatus status;
 
         if (_entManager.TryGetComponent<NPCMeleeCombatComponent>(owner, out var combat) &&
-            blackboard.TryGetValue<EntityUid>(TargetKey, out var target, _entManager))
+            blackboard.TryGetValue<EntityUid>(TargetKey, out var target, _entManager) &&
+            target != EntityUid.Invalid)
         {
             combat.Target = target;
 
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/UnPullOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/UnPullOperator.cs
index 54f422fe67d..467ac0d4142 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/UnPullOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/UnPullOperator.cs
@@ -1,4 +1,5 @@
-using Content.Shared.Movement.Pulling.Components;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Movement.Pulling.Components;
 using Content.Shared.Movement.Pulling.Systems;
 
 namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Combat;
@@ -7,6 +8,7 @@ public sealed partial class UnPullOperator : HTNOperator
 {
     [Dependency] private readonly IEntityManager _entManager = default!;
     private PullingSystem _pulling = default!;
+    private ActionBlockerSystem _actionBlocker = default!;
 
     private EntityQuery<PullableComponent> _pullableQuery;
 
@@ -16,6 +18,7 @@ public sealed partial class UnPullOperator : HTNOperator
     public override void Initialize(IEntitySystemManager sysManager)
     {
         base.Initialize(sysManager);
+        _actionBlocker = sysManager.GetEntitySystem<ActionBlockerSystem>();
         _pulling = sysManager.GetEntitySystem<PullingSystem>();
         _pullableQuery = _entManager.GetEntityQuery<PullableComponent>();
     }
@@ -25,7 +28,8 @@ public override void Startup(NPCBlackboard blackboard)
         base.Startup(blackboard);
         var owner = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
 
-        _pulling.TryStopPull(owner, _pullableQuery.GetComponent(owner), owner);
+        if (_actionBlocker.CanInteract(owner, owner)) //prevents handcuffed monkeys from pulling etc.
+            _pulling.TryStopPull(owner, _pullableQuery.GetComponent(owner), owner);
     }
 
     public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTime)
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/UnbuckleOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/UnbuckleOperator.cs
index 116e8fe7c7f..b242575a12f 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/UnbuckleOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/UnbuckleOperator.cs
@@ -1,4 +1,4 @@
-using Content.Server.Buckle.Systems;
+using Content.Server.Buckle.Systems;
 
 namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Combat;
 
@@ -19,7 +19,7 @@ public override void Startup(NPCBlackboard blackboard)
     {
         base.Startup(blackboard);
         var owner = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
-        _buckle.Unbuckle(owner, null);
+        _buckle.TryUnbuckle(owner, owner, false);
     }
 
     public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTime)
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/InteractWithOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/InteractWithOperator.cs
index 8e3ab5238a3..7d6f0005730 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/InteractWithOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/InteractWithOperator.cs
@@ -1,5 +1,6 @@
 using Content.Server.Interaction;
 using Content.Shared.CombatMode;
+using Content.Shared.DoAfter;
 using Content.Shared.Timing;
 
 namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Interactions;
@@ -7,6 +8,13 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Interactions;
 public sealed partial class InteractWithOperator : HTNOperator
 {
     [Dependency] private readonly IEntityManager _entManager = default!;
+    private SharedDoAfterSystem _doAfterSystem = default!;
+
+    public override void Initialize(IEntitySystemManager sysManager)
+    {
+        base.Initialize(sysManager);
+        _doAfterSystem = sysManager.GetEntitySystem<SharedDoAfterSystem>();
+    }
 
     /// <summary>
     /// Key that contains the target entity.
@@ -14,10 +22,53 @@ public sealed partial class InteractWithOperator : HTNOperator
     [DataField(required: true)]
     public string TargetKey = default!;
 
+    /// <summary>
+    /// Exit with failure if doafter wasn't raised
+    /// </summary>
+    [DataField]
+    public bool ExpectDoAfter = false;
+
+    public string CurrentDoAfter = "CurrentInteractWithDoAfter";
+
+
+    // Ensure that CurrentDoAfter doesn't exist as we enter this operator,
+    // the code currently relies on the result of a TryGetValue
+    public override void Startup(NPCBlackboard blackboard)
+    {
+        blackboard.Remove<ushort>(CurrentDoAfter);
+
+    }
+
+    // Not really sure if we should clean it up, I guess some operator could use it
+    public override void TaskShutdown(NPCBlackboard blackboard, HTNOperatorStatus status)
+    {
+        blackboard.Remove<ushort>(CurrentDoAfter);
+    }
+
     public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTime)
     {
         var owner = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
 
+        // Handle ongoing doAfter, and store the doAfter.nextId so we can detect if we started one
+        ushort nextId = 0;
+        if (_entManager.TryGetComponent<DoAfterComponent>(owner, out var doAfter))
+        {
+            // if CurrentDoAfter contains something, we have an active doAfter
+            if (blackboard.TryGetValue<ushort>(CurrentDoAfter, out var doAfterId, _entManager))
+            {
+                var status = _doAfterSystem.GetStatus(owner, doAfterId, null);
+                return status switch
+                {
+                    DoAfterStatus.Running => HTNOperatorStatus.Continuing,
+                    DoAfterStatus.Finished => HTNOperatorStatus.Finished,
+                    _ => HTNOperatorStatus.Failed
+                };
+            }
+
+            nextId = doAfter.NextId;
+        }
+
+
         if (_entManager.TryGetComponent<UseDelayComponent>(owner, out var useDelay) && _entManager.System<UseDelaySystem>().IsDelayed((owner, useDelay)) ||
             !blackboard.TryGetValue<EntityUid>(TargetKey, out var moveTarget, _entManager) ||
             !_entManager.TryGetComponent<TransformComponent>(moveTarget, out var targetXform))
@@ -31,6 +82,18 @@ public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTi
         }
 
         _entManager.System<InteractionSystem>().UserInteraction(owner, targetXform.Coordinates, moveTarget);
+
+        // Detect doAfter, save it, and don't exit from this operator
+        if (doAfter != null && nextId != doAfter.NextId)
+        {
+            blackboard.SetValue(CurrentDoAfter, nextId);
+            return HTNOperatorStatus.Continuing;
+        }
+
+        // We shouldn't arrive here if we start a doafter, so fail if we expected a doafter
+        if(ExpectDoAfter)
+            return HTNOperatorStatus.Failed;
+
         return HTNOperatorStatus.Finished;
     }
 }
diff --git a/Content.Server/NPC/Pathfinding/PathfindingSystem.Breadth.cs b/Content.Server/NPC/Pathfinding/PathfindingSystem.Breadth.cs
new file mode 100644
index 00000000000..ee8eaa9ad1a
--- /dev/null
+++ b/Content.Server/NPC/Pathfinding/PathfindingSystem.Breadth.cs
@@ -0,0 +1,123 @@
+namespace Content.Server.NPC.Pathfinding;
+
+public sealed partial class PathfindingSystem
+{
+    /*
+     * Handle BFS searches from Start->End. Doesn't consider NPC pathfinding.
+     */
+
+    /// <summary>
+    /// Pathfinding args for a 1-many path.
+    /// </summary>
+    public record struct BreadthPathArgs()
+    {
+        public Vector2i Start;
+        public List<Vector2i> Ends;
+
+        public bool Diagonals = false;
+
+        public Func<Vector2i, float>? TileCost;
+
+        public int Limit = 10000;
+    }
+
+    /// <summary>
+    /// Gets a BFS path from start to any end. Can also supply an optional tile-cost for tiles.
+    /// </summary>
+    public SimplePathResult GetBreadthPath(BreadthPathArgs args)
+    {
+        var cameFrom = new Dictionary<Vector2i, Vector2i>();
+        var costSoFar = new Dictionary<Vector2i, float>();
+        var frontier = new PriorityQueue<Vector2i, float>();
+
+        costSoFar[args.Start] = 0f;
+        frontier.Enqueue(args.Start, 0f);
+        var count = 0;
+
+        while (frontier.TryDequeue(out var node, out _) && count < args.Limit)
+        {
+            count++;
+
+            if (args.Ends.Contains(node))
+            {
+                // Found target
+                var path = ReconstructPath(node, cameFrom);
+
+                return new SimplePathResult()
+                {
+                    CameFrom = cameFrom,
+                    Path = path,
+                };
+            }
+
+            var gCost = costSoFar[node];
+
+            if (args.Diagonals)
+            {
+                for (var x = -1; x <= 1; x++)
+                {
+                    for (var y = -1; y <= 1; y++)
+                    {
+                        var neighbor = node + new Vector2i(x, y);
+                        var neighborCost = OctileDistance(node, neighbor) * args.TileCost?.Invoke(neighbor) ?? 1f;
+
+                        if (neighborCost.Equals(0f))
+                        {
+                            continue;
+                        }
+
+                        // f = g + h
+                        // gScore is distance to the start node
+                        // hScore is distance to the end node
+                        var gScore = gCost + neighborCost;
+
+                        // Slower to get here so just ignore it.
+                        if (costSoFar.TryGetValue(neighbor, out var nextValue) && gScore >= nextValue)
+                        {
+                            continue;
+                        }
+
+                        cameFrom[neighbor] = node;
+                        costSoFar[neighbor] = gScore;
+                        // pFactor is tie-breaker where the fscore is otherwise equal.
+                        // See http://theory.stanford.edu/~amitp/GameProgramming/Heuristics.html#breaking-ties
+                        // There's other ways to do it but future consideration
+                        // The closer the fScore is to the actual distance then the better the pathfinder will be
+                        // (i.e. somewhere between 1 and infinite)
+                        // Can use hierarchical pathfinder or whatever to improve the heuristic but this is fine for now.
+                        frontier.Enqueue(neighbor, gScore);
+                    }
+                }
+            }
+            else
+            {
+                for (var x = -1; x <= 1; x++)
+                {
+                    for (var y = -1; y <= 1; y++)
+                    {
+                        if (x != 0 && y != 0)
+                            continue;
+
+                        var neighbor = node + new Vector2i(x, y);
+                        var neighborCost = ManhattanDistance(node, neighbor) * args.TileCost?.Invoke(neighbor) ?? 1f;
+
+                        if (neighborCost.Equals(0f))
+                            continue;
+
+                        var gScore = gCost + neighborCost;
+
+                        if (costSoFar.TryGetValue(neighbor, out var nextValue) && gScore >= nextValue)
+                            continue;
+
+                        cameFrom[neighbor] = node;
+                        costSoFar[neighbor] = gScore;
+
+                        frontier.Enqueue(neighbor, gScore);
+                    }
+                }
+            }
+        }
+
+        return SimplePathResult.NoPath;
+    }
+}
diff --git a/Content.Server/NPC/Pathfinding/PathfindingSystem.Line.cs b/Content.Server/NPC/Pathfinding/PathfindingSystem.Line.cs
new file mode 100644
index 00000000000..479d5ad77f6
--- /dev/null
+++ b/Content.Server/NPC/Pathfinding/PathfindingSystem.Line.cs
@@ -0,0 +1,74 @@
+namespace Content.Server.NPC.Pathfinding;
+
+public sealed partial class PathfindingSystem
+{
+    public void GridCast(Vector2i start, Vector2i end, Vector2iCallback callback)
+    {
+        // https://gist.github.com/Pyr3z/46884d67641094d6cf353358566db566
+        // declare all locals at the top so it's obvious how big the footprint is
+        int dx, dy, xinc, yinc, side, i, error;
+
+        // starting cell is always returned
+        if (!callback(start))
+            return;
+
+        xinc  = (end.X < start.X) ? -1 : 1;
+        yinc  = (end.Y < start.Y) ? -1 : 1;
+        dx    = xinc * (end.X - start.X);
+        dy    = yinc * (end.Y - start.Y);
+        var ax = start.X;
+        var ay = start.Y;
+
+        if (dx == dy) // Handle perfect diagonals
+        {
+            // I include this "optimization" for more aesthetic reasons, actually.
+            // While Bresenham's Line can handle perfect diagonals just fine, it adds
+            // additional cells to the line that make it not a perfect diagonal
+            // anymore. So, while this branch is ~twice as fast as the next branch,
+            // the real reason it is here is for style.
+
+            // Also, there *is* the reason of performance. If used for cell-based
+            // raycasts, for example, then perfect diagonals will check half as many
+            // cells.
+
+            while (dx --> 0)
+            {
+                ax += xinc;
+                ay += yinc;
+                if (!callback(new Vector2i(ax, ay)))
+                    return;
+            }
+
+            return;
+        }
+
+        // Handle all other lines
+
+        side = -1 * ((dx == 0 ? yinc : xinc) - 1);
+
+        i     = dx + dy;
+        error = dx - dy;
+
+        dx *= 2;
+        dy *= 2;
+
+        while (i --> 0)
+        {
+            if (error > 0 || error == side)
+            {
+                ax    += xinc;
+                error -= dy;
+            }
+            else
+            {
+                ay    += yinc;
+                error += dx;
+            }
+
+            if (!callback(new Vector2i(ax, ay)))
+                return;
+        }
+    }
+
+    public delegate bool Vector2iCallback(Vector2i index);
+}
diff --git a/Content.Server/NPC/Pathfinding/PathfindingSystem.Simple.cs b/Content.Server/NPC/Pathfinding/PathfindingSystem.Simple.cs
new file mode 100644
index 00000000000..7afd3d78df1
--- /dev/null
+++ b/Content.Server/NPC/Pathfinding/PathfindingSystem.Simple.cs
@@ -0,0 +1,154 @@
+namespace Content.Server.NPC.Pathfinding;
+
+public sealed partial class PathfindingSystem
+{
+    /// <summary>
+    /// Pathfinding args for a 1-1 path.
+    /// </summary>
+    public record struct SimplePathArgs()
+    {
+        public Vector2i Start;
+        public Vector2i End;
+
+        public bool Diagonals = false;
+
+        public int Limit = 10000;
+
+        /// <summary>
+        /// Custom tile-costs if applicable.
+        /// </summary>
+        public Func<Vector2i, float>? TileCost;
+    }
+
+    public record struct SimplePathResult
+    {
+        public static SimplePathResult NoPath = new();
+
+        public List<Vector2i> Path;
+        public Dictionary<Vector2i, Vector2i> CameFrom;
+    }
+
+    /// <summary>
+    /// Gets simple A* path from start to end. Can also supply an optional tile-cost for tiles.
+    /// </summary>
+    public SimplePathResult GetPath(SimplePathArgs args)
+    {
+        var cameFrom = new Dictionary<Vector2i, Vector2i>();
+        var costSoFar = new Dictionary<Vector2i, float>();
+        var frontier = new PriorityQueue<Vector2i, float>();
+
+        costSoFar[args.Start] = 0f;
+        frontier.Enqueue(args.Start, 0f);
+        var count = 0;
+
+        while (frontier.TryDequeue(out var node, out _) && count < args.Limit)
+        {
+            count++;
+
+            if (node == args.End)
+            {
+                // Found target
+                var path = ReconstructPath(args.End, cameFrom);
+
+                return new SimplePathResult()
+                {
+                    CameFrom = cameFrom,
+                    Path = path,
+                };
+            }
+
+            var gCost = costSoFar[node];
+
+            if (args.Diagonals)
+            {
+                for (var x = -1; x <= 1; x++)
+                {
+                    for (var y = -1; y <= 1; y++)
+                    {
+                        var neighbor = node + new Vector2i(x, y);
+                        var neighborCost = OctileDistance(node, neighbor) * args.TileCost?.Invoke(neighbor) ?? 1f;
+
+                        if (neighborCost.Equals(0f))
+                        {
+                            continue;
+                        }
+
+                        // f = g + h
+                        // gScore is distance to the start node
+                        // hScore is distance to the end node
+                        var gScore = gCost + neighborCost;
+
+                        // Slower to get here so just ignore it.
+                        if (costSoFar.TryGetValue(neighbor, out var nextValue) && gScore >= nextValue)
+                        {
+                            continue;
+                        }
+
+                        cameFrom[neighbor] = node;
+                        costSoFar[neighbor] = gScore;
+                        // pFactor is tie-breaker where the fscore is otherwise equal.
+                        // See http://theory.stanford.edu/~amitp/GameProgramming/Heuristics.html#breaking-ties
+                        // There's other ways to do it but future consideration
+                        // The closer the fScore is to the actual distance then the better the pathfinder will be
+                        // (i.e. somewhere between 1 and infinite)
+                        // Can use hierarchical pathfinder or whatever to improve the heuristic but this is fine for now.
+                        var hScore = OctileDistance(args.End, neighbor) * (1.0f + 1.0f / 1000.0f);
+                        var fScore = gScore + hScore;
+                        frontier.Enqueue(neighbor, fScore);
+                    }
+                }
+            }
+            else
+            {
+                for (var x = -1; x <= 1; x++)
+                {
+                    for (var y = -1; y <= 1; y++)
+                    {
+                        if (x != 0 && y != 0)
+                            continue;
+
+                        var neighbor = node + new Vector2i(x, y);
+                        var neighborCost = ManhattanDistance(node, neighbor) * args.TileCost?.Invoke(neighbor) ?? 1f;
+
+                        if (neighborCost.Equals(0f))
+                            continue;
+
+                        var gScore = gCost + neighborCost;
+
+                        if (costSoFar.TryGetValue(neighbor, out var nextValue) && gScore >= nextValue)
+                            continue;
+
+                        cameFrom[neighbor] = node;
+                        costSoFar[neighbor] = gScore;
+
+                        // Still use octile even for manhattan distance.
+                        var hScore = OctileDistance(args.End, neighbor) * 1.001f;
+                        var fScore = gScore + hScore;
+                        frontier.Enqueue(neighbor, fScore);
+                    }
+                }
+            }
+        }
+
+        return SimplePathResult.NoPath;
+    }
+
+    private List<Vector2i> ReconstructPath(Vector2i end, Dictionary<Vector2i, Vector2i> cameFrom)
+    {
+        var path = new List<Vector2i>()
+        {
+            end,
+        };
+        var node = end;
+
+        while (cameFrom.TryGetValue(node, out var source))
+        {
+            path.Add(source);
+            node = source;
+        }
+
+        path.Reverse();
+
+        return path;
+    }
+}
diff --git a/Content.Server/NPC/Pathfinding/PathfindingSystem.Splines.cs b/Content.Server/NPC/Pathfinding/PathfindingSystem.Splines.cs
new file mode 100644
index 00000000000..9979755f995
--- /dev/null
+++ b/Content.Server/NPC/Pathfinding/PathfindingSystem.Splines.cs
@@ -0,0 +1,180 @@
+using Robust.Shared.Collections;
+using Robust.Shared.Random;
+
+namespace Content.Server.NPC.Pathfinding;
+
+public sealed partial class PathfindingSystem
+{
+    public record struct SimplifyPathArgs
+    {
+        public Vector2i Start;
+        public Vector2i End;
+        public List<Vector2i> Path;
+    }
+
+    public record struct SplinePathResult()
+    {
+        public static SplinePathResult NoPath = new();
+
+        public List<Vector2i> Points = new();
+
+        public List<Vector2i> Path = new();
+        public Dictionary<Vector2i, Vector2i> CameFrom;
+    }
+
+    public record struct SplinePathArgs(SimplePathArgs Args)
+    {
+        public SimplePathArgs Args = Args;
+
+        public float MaxRatio = 0.25f;
+
+        /// <summary>
+        /// Minimum distance between subdivisions.
+        /// </summary>
+        public int Distance = 20;
+    }
+
+    /// <summary>
+    /// Gets a spline path from start to end.
+    /// </summary>
+    public SplinePathResult GetSplinePath(SplinePathArgs args, Random random)
+    {
+        var start = args.Args.Start;
+        var end = args.Args.End;
+
+        var path = new List<Vector2i>();
+
+        var pairs = new ValueList<(Vector2i Start, Vector2i End)> { (start, end) };
+        var subdivided = true;
+
+        // Sub-divide recursively
+        while (subdivided)
+        {
+            // Sometimes we might inadvertantly get 2 nodes too close together so better to just check each one as it comes up instead.
+            var i = 0;
+            subdivided = false;
+
+            while (i < pairs.Count)
+            {
+                var pointA = pairs[i].Start;
+                var pointB = pairs[i].End;
+                var vector = pointB - pointA;
+
+                var halfway = vector / 2f;
+
+                // Finding the point
+                var adj = halfway.Length();
+
+                // Should we even subdivide.
+                if (adj <= args.Distance)
+                {
+                    // Just check the next entry no double skip.
+                    i++;
+                    continue;
+                }
+
+                subdivided = true;
+                var opposite = args.MaxRatio * adj;
+                var hypotenuse = MathF.Sqrt(MathF.Pow(adj, 2) + MathF.Pow(opposite, 2));
+
+                // Okay so essentially we have 2 points and no poly
+                // We add 2 other points to form a diamond and want some point halfway between randomly offset.
+                var angle = new Angle(MathF.Atan(opposite / adj));
+                var pointAPerp = pointA + angle.RotateVec(halfway).Normalized() * hypotenuse;
+                var pointBPerp = pointA + (-angle).RotateVec(halfway).Normalized() * hypotenuse;
+
+                var perpLine = pointBPerp - pointAPerp;
+                var perpHalfway = perpLine.Length() / 2f;
+
+                var splinePoint = (pointAPerp + perpLine.Normalized() * random.NextFloat(-args.MaxRatio, args.MaxRatio) * perpHalfway).Floored();
+
+                // We essentially take (A, B) and turn it into (A, C) & (C, B)
+                pairs[i] = (pointA, splinePoint);
+                pairs.Insert(i + 1, (splinePoint, pointB));
+
+                i+= 2;
+            }
+        }
+
+        var spline = new ValueList<Vector2i>(pairs.Count - 1)
+        {
+            start
+        };
+
+        foreach (var pair in pairs)
+        {
+            spline.Add(pair.End);
+        }
+
+        // Now we need to pathfind between each node on the spline.
+
+        // TODO: Add rotation version or straight-line version for pathfinder config
+        // Move the worm pathfinder to here I think.
+        var cameFrom = new Dictionary<Vector2i, Vector2i>();
+
+        // TODO: Need to get rid of the branch bullshit.
+        var points = new List<Vector2i>();
+
+        for (var i = 0; i < spline.Count - 1; i++)
+        {
+            var point = spline[i];
+            var target = spline[i + 1];
+            points.Add(point);
+            var aStarArgs = args.Args with { Start = point, End = target };
+
+            var aStarResult = GetPath(aStarArgs);
+
+            if (aStarResult == SimplePathResult.NoPath)
+                return SplinePathResult.NoPath;
+
+            path.AddRange(aStarResult.Path[0..]);
+
+            foreach (var a in aStarResult.CameFrom)
+            {
+                cameFrom[a.Key] = a.Value;
+            }
+        }
+
+        points.Add(spline[^1]);
+
+        var simple = SimplifyPath(new SimplifyPathArgs()
+        {
+            Start = args.Args.Start,
+            End = args.Args.End,
+            Path = path,
+        });
+
+        return new SplinePathResult()
+        {
+            Path = simple,
+            CameFrom = cameFrom,
+            Points = points,
+        };
+    }
+
+    /// <summary>
+    /// Does a simpler pathfinder over the nodes to prune unnecessary branches.
+    /// </summary>
+    public List<Vector2i> SimplifyPath(SimplifyPathArgs args)
+    {
+        var nodes = new HashSet<Vector2i>(args.Path);
+
+        var result = GetBreadthPath(new BreadthPathArgs()
+        {
+            Start = args.Start,
+            Ends = new List<Vector2i>()
+            {
+                args.End,
+            },
+            TileCost = node =>
+            {
+                if (!nodes.Contains(node))
+                    return 0f;
+
+                return 1f;
+            }
+        });
+
+        return result.Path;
+    }
+}
diff --git a/Content.Server/NPC/Pathfinding/PathfindingSystem.Widen.cs b/Content.Server/NPC/Pathfinding/PathfindingSystem.Widen.cs
new file mode 100644
index 00000000000..f7bcd019f5f
--- /dev/null
+++ b/Content.Server/NPC/Pathfinding/PathfindingSystem.Widen.cs
@@ -0,0 +1,89 @@
+using System.Numerics;
+using Robust.Shared.Random;
+
+namespace Content.Server.NPC.Pathfinding;
+
+public sealed partial class PathfindingSystem
+{
+    /// <summary>
+    /// Widens the path by the specified amount.
+    /// </summary>
+    public HashSet<Vector2i> GetWiden(WidenArgs args, Random random)
+    {
+        var tiles = new HashSet<Vector2i>(args.Path.Count * 2);
+        var variance = (args.MaxWiden - args.MinWiden) / 2f + args.MinWiden;
+        var counter = 0;
+
+        foreach (var tile in args.Path)
+        {
+            counter++;
+
+            if (counter != args.TileSkip)
+                continue;
+
+            counter = 0;
+
+            var center = new Vector2(tile.X + 0.5f, tile.Y + 0.5f);
+
+            if (args.Square)
+            {
+                for (var x = -variance; x <= variance; x++)
+                {
+                    for (var y = -variance; y <= variance; y++)
+                    {
+                        var neighbor = center + new Vector2(x, y);
+
+                        tiles.Add(neighbor.Floored());
+                    }
+                }
+            }
+            else
+            {
+                for (var x = -variance; x <= variance; x++)
+                {
+                    for (var y = -variance; y <= variance; y++)
+                    {
+                        var offset = new Vector2(x, y);
+
+                        if (offset.Length() > variance)
+                            continue;
+
+                        var neighbor = center + offset;
+
+                        tiles.Add(neighbor.Floored());
+                    }
+                }
+            }
+
+            variance += random.NextFloat(-args.Variance * args.TileSkip, args.Variance * args.TileSkip);
+            variance = Math.Clamp(variance, args.MinWiden, args.MaxWiden);
+        }
+
+        return tiles;
+    }
+
+    public record struct WidenArgs()
+    {
+        public bool Square = false;
+
+        /// <summary>
+        /// How many tiles to skip between iterations., 1-in-n
+        /// </summary>
+        public int TileSkip = 3;
+
+        /// <summary>
+        /// Maximum amount to vary per tile.
+        /// </summary>
+        public float Variance = 0.25f;
+
+        /// <summary>
+        /// Minimum width.
+        /// </summary>
+        public float MinWiden = 2f;
+
+
+        public float MaxWiden = 7f;
+
+        public List<Vector2i> Path;
+    }
+}
diff --git a/Content.Server/NPC/Queries/Considerations/TargetHealthCon.cs b/Content.Server/NPC/Queries/Considerations/TargetHealthCon.cs
index d4e8a277ea6..cc9c6df83f3 100644
--- a/Content.Server/NPC/Queries/Considerations/TargetHealthCon.cs
+++ b/Content.Server/NPC/Queries/Considerations/TargetHealthCon.cs
@@ -1,6 +1,16 @@
+using Content.Shared.Mobs;
+
 namespace Content.Server.NPC.Queries.Considerations;
 
+/// <summary>
+/// Goes linearly from 1f to 0f, with 0 damage returning 1f and <see cref=TargetState> damage returning 0f
+/// </summary>
 public sealed partial class TargetHealthCon : UtilityConsideration
 {
 
+    /// <summary>
+    /// Which MobState the consideration returns 0f at, defaults to choosing earliest incapacitating MobState
+    /// </summary>
+    [DataField("targetState")]
+    public MobState TargetState = MobState.Invalid;
 }
diff --git a/Content.Server/NPC/Queries/Queries/RemoveAnchored.cs b/Content.Server/NPC/Queries/Queries/RemoveAnchored.cs
new file mode 100644
index 00000000000..ef9fa2057f6
--- /dev/null
+++ b/Content.Server/NPC/Queries/Queries/RemoveAnchored.cs
@@ -0,0 +1,11 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.NPC.Queries.Queries;
+
+/// <summary>
+/// Remove anchored entities from the query
+/// </summary>
+public sealed partial class RemoveAnchoredFilter : UtilityQueryFilter
+{
+
+}
diff --git a/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs b/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs
index 10ec54c8954..d7196ea73c7 100644
--- a/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs
+++ b/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs
@@ -1,7 +1,6 @@
 using Content.Server.NPC.Components;
 using Content.Shared.CombatMode;
 using Content.Shared.Interaction;
-using Content.Shared.Physics;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
 using Robust.Shared.Map;
@@ -134,7 +133,7 @@ private void UpdateRanged(float frameTime)
             {
                 comp.LOSAccumulator += UnoccludedCooldown;
                 // For consistency with NPC steering.
-                comp.TargetInLOS = _interaction.InRangeUnobstructed(uid, Transform(comp.Target).Coordinates, distance + 0.1f);
+                comp.TargetInLOS = _interaction.InRangeUnobstructed(uid, comp.Target, distance + 0.1f);
             }
 
             if (!comp.TargetInLOS)
diff --git a/Content.Server/NPC/Systems/NPCJukeSystem.cs b/Content.Server/NPC/Systems/NPCJukeSystem.cs
index da9fa1f7615..94a30feb0cb 100644
--- a/Content.Server/NPC/Systems/NPCJukeSystem.cs
+++ b/Content.Server/NPC/Systems/NPCJukeSystem.cs
@@ -143,6 +143,9 @@ private void OnJukeSteering(EntityUid uid, NPCJukeComponent component, ref NPCSt
                 if (!_melee.TryGetWeapon(uid, out var weaponUid, out var weapon))
                     return;
 
+                if (!HasComp<TransformComponent>(melee.Target))
+                    return;
+
                 var cdRemaining = weapon.NextAttack - _timing.CurTime;
                 var attackCooldown = TimeSpan.FromSeconds(1f / _melee.GetAttackRate(weaponUid, uid, weapon));
 
diff --git a/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs b/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
index 5f871a6ecfa..e0bcb97a112 100644
--- a/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
+++ b/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
@@ -142,6 +142,13 @@ private bool TrySeek(
 
         // Grab the target position, either the next path node or our end goal..
         var targetCoordinates = GetTargetCoordinates(steering);
+
+        if (!targetCoordinates.IsValid(EntityManager))
+        {
+            steering.Status = SteeringStatus.NoPath;
+            return false;
+        }
+
         var needsPath = false;
 
         // If the next node is invalid then get new ones
@@ -243,6 +250,14 @@ private bool TrySeek(
                 // Alright just adjust slightly and grab the next node so we don't stop moving for a tick.
                 // TODO: If it's the last node just grab the target instead.
                 targetCoordinates = GetTargetCoordinates(steering);
+
+                if (!targetCoordinates.IsValid(EntityManager))
+                {
+                    SetDirection(mover, steering, Vector2.Zero);
+                    steering.Status = SteeringStatus.NoPath;
+                    return false;
+                }
+
                 targetMap = targetCoordinates.ToMap(EntityManager, _transform);
 
                 // Can't make it again.
diff --git a/Content.Server/NPC/Systems/NPCUtilitySystem.cs b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
index ca74d713357..5e1823227a8 100644
--- a/Content.Server/NPC/Systems/NPCUtilitySystem.cs
+++ b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
@@ -7,10 +7,13 @@
 using Content.Server.Nutrition.Components;
 using Content.Server.Nutrition.EntitySystems;
 using Content.Server.Storage.Components;
+using Content.Shared.Damage;
 using Content.Shared.Examine;
 using Content.Shared.Fluids.Components;
 using Content.Shared.Hands.Components;
 using Content.Shared.Inventory;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.NPC.Systems;
 using Content.Shared.Nutrition.Components;
@@ -48,6 +51,7 @@ public sealed class NPCUtilitySystem : EntitySystem
     [Dependency] private readonly WeldableSystem _weldable = default!;
     [Dependency] private readonly ExamineSystemShared _examine = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+    [Dependency] private readonly MobThresholdSystem _thresholdSystem = default!;
 
     private EntityQuery<PuddleComponent> _puddleQuery;
     private EntityQuery<TransformComponent> _xformQuery;
@@ -293,8 +297,14 @@ private float GetScore(NPCBlackboard blackboard, EntityUid targetUid, UtilityCon
 
                 return (float) ev.Count / ev.Capacity;
             }
-            case TargetHealthCon:
+            case TargetHealthCon con:
             {
+                if (!TryComp(targetUid, out DamageableComponent? damage))
+                    return 0f;
+                if (con.TargetState != MobState.Invalid && _thresholdSystem.TryGetPercentageForState(targetUid, con.TargetState, damage.TotalDamage, out var percentage))
+                    return Math.Clamp((float)(1 - percentage), 0f, 1f);
+                if (_thresholdSystem.TryGetIncapPercentage(targetUid, damage.TotalDamage, out var incapPercentage))
+                    return Math.Clamp((float)(1 - incapPercentage), 0f, 1f);
                 return 0f;
             }
             case TargetInLOSCon:
@@ -489,6 +499,26 @@ private void Filter(NPCBlackboard blackboard, HashSet<EntityUid> entities, Utili
 
                 break;
             }
+            case RemoveAnchoredFilter:
+            {
+                _entityList.Clear();
+
+                foreach (var ent in entities)
+                {
+                    if (!TryComp(ent, out TransformComponent? xform))
+                        continue;
+
+                    if (xform.Anchored)
+                        _entityList.Add(ent);
+                }
+
+                foreach (var ent in _entityList)
+                {
+                    entities.Remove(ent);
+                }
+
+                break;
+            }
             case PuddleFilter:
             {
                 _entityList.Clear();
diff --git a/Content.Server/Ninja/Events/BatteryChangedEvent.cs b/Content.Server/Ninja/Events/BatteryChangedEvent.cs
index 45bfedfee76..1848e881868 100644
--- a/Content.Server/Ninja/Events/BatteryChangedEvent.cs
+++ b/Content.Server/Ninja/Events/BatteryChangedEvent.cs
@@ -1,7 +1,7 @@
 namespace Content.Server.Ninja.Events;
 
 /// <summary>
-/// Raised on the ninja when the suit has its powercell changed.
+/// Raised on the ninja and suit when the suit has its powercell changed.
 /// </summary>
 [ByRefEvent]
 public record struct NinjaBatteryChangedEvent(EntityUid Battery, EntityUid BatteryHolder);
diff --git a/Content.Server/Ninja/Systems/BatteryDrainerSystem.cs b/Content.Server/Ninja/Systems/BatteryDrainerSystem.cs
index 59dec556fa0..4baf0913cec 100644
--- a/Content.Server/Ninja/Systems/BatteryDrainerSystem.cs
+++ b/Content.Server/Ninja/Systems/BatteryDrainerSystem.cs
@@ -33,16 +33,17 @@ public override void Initialize()
     /// Start do after for draining a power source.
     /// Can't predict PNBC existing so only done on server.
     /// </summary>
-    private void OnBeforeInteractHand(EntityUid uid, BatteryDrainerComponent comp, BeforeInteractHandEvent args)
+    private void OnBeforeInteractHand(Entity<BatteryDrainerComponent> ent, ref BeforeInteractHandEvent args)
     {
+        var (uid, comp) = ent;
         var target = args.Target;
-        if (args.Handled || comp.BatteryUid == null || !HasComp<PowerNetworkBatteryComponent>(target))
+        if (args.Handled || comp.BatteryUid is not {} battery || !HasComp<PowerNetworkBatteryComponent>(target))
             return;
 
         // handles even if battery is full so you can actually see the poup
         args.Handled = true;
 
-        if (_battery.IsFull(comp.BatteryUid.Value))
+        if (_battery.IsFull(battery))
         {
             _popup.PopupEntity(Loc.GetString("battery-drainer-full"), uid, uid, PopupType.Medium);
             return;
@@ -59,23 +60,24 @@ private void OnBeforeInteractHand(EntityUid uid, BatteryDrainerComponent comp, B
         _doAfter.TryStartDoAfter(doAfterArgs);
     }
 
-    private void OnBatteryChanged(EntityUid uid, BatteryDrainerComponent comp, ref NinjaBatteryChangedEvent args)
+    private void OnBatteryChanged(Entity<BatteryDrainerComponent> ent, ref NinjaBatteryChangedEvent args)
     {
-        SetBattery(uid, args.Battery, comp);
+        SetBattery((ent, ent.Comp), args.Battery);
     }
 
     /// <inheritdoc/>
-    protected override void OnDoAfterAttempt(EntityUid uid, BatteryDrainerComponent comp, DoAfterAttemptEvent<DrainDoAfterEvent> args)
+    protected override void OnDoAfterAttempt(Entity<BatteryDrainerComponent> ent, ref DoAfterAttemptEvent<DrainDoAfterEvent> args)
     {
-        base.OnDoAfterAttempt(uid, comp, args);
+        base.OnDoAfterAttempt(ent, ref args);
 
-        if (comp.BatteryUid == null || _battery.IsFull(comp.BatteryUid.Value))
+        if (ent.Comp.BatteryUid is not {} battery || _battery.IsFull(battery))
             args.Cancel();
     }
 
     /// <inheritdoc/>
-    protected override bool TryDrainPower(EntityUid uid, BatteryDrainerComponent comp, EntityUid target)
+    protected override bool TryDrainPower(Entity<BatteryDrainerComponent> ent, EntityUid target)
     {
+        var (uid, comp) = ent;
         if (comp.BatteryUid == null || !TryComp<BatteryComponent>(comp.BatteryUid.Value, out var battery))
             return false;
 
@@ -98,6 +100,7 @@ protected override bool TryDrainPower(EntityUid uid, BatteryDrainerComponent com
 
         var output = input * comp.DrainEfficiency;
         _battery.SetCharge(comp.BatteryUid.Value, battery.CurrentCharge + output, battery);
+        // TODO: create effect message or something
         Spawn("EffectSparks", Transform(target).Coordinates);
         _audio.PlayPvs(comp.SparkSound, target);
         _popup.PopupEntity(Loc.GetString("battery-drainer-success", ("battery", target)), uid, uid);
diff --git a/Content.Server/Ninja/Systems/ItemCreatorSystem.cs b/Content.Server/Ninja/Systems/ItemCreatorSystem.cs
new file mode 100644
index 00000000000..d7a7be995db
--- /dev/null
+++ b/Content.Server/Ninja/Systems/ItemCreatorSystem.cs
@@ -0,0 +1,57 @@
+using Content.Server.Ninja.Events;
+using Content.Server.Power.EntitySystems;
+using Content.Shared.Hands.EntitySystems;
+using Content.Shared.Ninja.Components;
+using Content.Shared.Ninja.Systems;
+using Content.Shared.Popups;
+
+namespace Content.Server.Ninja.Systems;
+
+public sealed class ItemCreatorSystem : SharedItemCreatorSystem
+{
+    [Dependency] private readonly BatterySystem _battery = default!;
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ItemCreatorComponent, CreateItemEvent>(OnCreateItem);
+        SubscribeLocalEvent<ItemCreatorComponent, NinjaBatteryChangedEvent>(OnBatteryChanged);
+    }
+
+    private void OnCreateItem(Entity<ItemCreatorComponent> ent, ref CreateItemEvent args)
+    {
+        var (uid, comp) = ent;
+        if (comp.Battery is not {} battery)
+            return;
+
+        args.Handled = true;
+
+        var user = args.Performer;
+        if (!_battery.TryUseCharge(battery, comp.Charge))
+        {
+            _popup.PopupEntity(Loc.GetString(comp.NoPowerPopup), user, user);
+            return;
+        }
+
+        var ev = new CreateItemAttemptEvent(user);
+        RaiseLocalEvent(uid, ref ev);
+        if (ev.Cancelled)
+            return;
+
+        // try to put throwing star in hand, otherwise it goes on the ground
+        var star = Spawn(comp.SpawnedPrototype, Transform(user).Coordinates);
+        _hands.TryPickupAnyHand(user, star);
+    }
+
+    private void OnBatteryChanged(Entity<ItemCreatorComponent> ent, ref NinjaBatteryChangedEvent args)
+    {
+        if (ent.Comp.Battery == args.Battery)
+            return;
+
+        ent.Comp.Battery = args.Battery;
+        Dirty(ent, ent.Comp);
+    }
+}
diff --git a/Content.Server/Ninja/Systems/NinjaGlovesSystem.cs b/Content.Server/Ninja/Systems/NinjaGlovesSystem.cs
index ac76ae6b771..3aaf7c5d58e 100644
--- a/Content.Server/Ninja/Systems/NinjaGlovesSystem.cs
+++ b/Content.Server/Ninja/Systems/NinjaGlovesSystem.cs
@@ -1,13 +1,8 @@
-using Content.Server.Communications;
-using Content.Server.Mind;
 using Content.Server.Ninja.Events;
-using Content.Server.Objectives.Systems;
-using Content.Shared.Communications;
-using Content.Shared.CriminalRecords.Components;
+using Content.Shared.Mind;
+using Content.Shared.Objectives.Systems;
 using Content.Shared.Ninja.Components;
 using Content.Shared.Ninja.Systems;
-using Content.Shared.Research.Components;
-using Content.Shared.Toggleable;
 
 namespace Content.Server.Ninja.Systems;
 
@@ -16,89 +11,44 @@ namespace Content.Server.Ninja.Systems;
 /// </summary>
 public sealed class NinjaGlovesSystem : SharedNinjaGlovesSystem
 {
-    [Dependency] private readonly EmagProviderSystem _emagProvider = default!;
-    [Dependency] private readonly CodeConditionSystem _codeCondition = default!;
-    [Dependency] private readonly CommsHackerSystem _commsHacker = default!;
-    [Dependency] private readonly SharedStunProviderSystem _stunProvider = default!;
+    [Dependency] private readonly SharedMindSystem _mind = default!;
+    [Dependency] private readonly SharedObjectivesSystem _objectives = default!;
     [Dependency] private readonly SpaceNinjaSystem _ninja = default!;
 
-    public override void Initialize()
+    protected override void EnableGloves(Entity<NinjaGlovesComponent> ent, Entity<SpaceNinjaComponent> user)
     {
-        base.Initialize();
+        base.EnableGloves(ent, user);
 
-        SubscribeLocalEvent<NinjaGlovesComponent, ToggleActionEvent>(OnToggleAction);
-    }
-
-    /// <summary>
-    /// Toggle gloves, if the user is a ninja wearing a ninja suit.
-    /// </summary>
-    private void OnToggleAction(EntityUid uid, NinjaGlovesComponent comp, ToggleActionEvent args)
-    {
-        if (args.Handled)
+        // can't use abilities if suit is not equipped, this is checked elsewhere but just making sure to satisfy nullability
+        if (user.Comp.Suit is not {} suit)
             return;
 
-        args.Handled = true;
-
-        var user = args.Performer;
-        // need to wear suit to enable gloves
-        if (!TryComp<SpaceNinjaComponent>(user, out var ninja)
-            || ninja.Suit == null
-            || !HasComp<NinjaSuitComponent>(ninja.Suit.Value))
-        {
-            Popup.PopupEntity(Loc.GetString("ninja-gloves-not-wearing-suit"), user, user);
+        if (!_mind.TryGetMind(user, out var mindId, out var mind))
             return;
-        }
-
-        // show its state to the user
-        var enabling = comp.User == null;
-        Appearance.SetData(uid, ToggleVisuals.Toggled, enabling);
-        var message = Loc.GetString(enabling ? "ninja-gloves-on" : "ninja-gloves-off");
-        Popup.PopupEntity(message, user, user);
 
-        if (enabling)
+        foreach (var ability in ent.Comp.Abilities)
         {
-            EnableGloves(uid, comp, user, ninja);
+            // non-objective abilities are added in shared already
+            if (ability.Objective is not {} objId)
+                continue;
+
+            // prevent doing an objective multiple times by toggling gloves after doing them
+            // if it's not tied to an objective always add them anyway
+            if (!_mind.TryFindObjective((mindId, mind), objId, out var obj))
+            {
+                Log.Error($"Ninja glove ability of {ent} referenced missing objective {ability.Objective} of {_mind.MindOwnerLoggingString(mind)}");
+                continue;
+            }
+
+            if (!_objectives.IsCompleted(obj.Value, (mindId, mind)))
+                EntityManager.AddComponents(user, ability.Components);
         }
-        else
-        {
-            DisableGloves(uid, comp);
-        }
-    }
 
-    private void EnableGloves(EntityUid uid, NinjaGlovesComponent comp, EntityUid user, SpaceNinjaComponent ninja)
-    {
-        // can't use abilities if suit is not equipped, this is checked elsewhere but just making sure to satisfy nullability
-        if (ninja.Suit == null)
-            return;
-
-        comp.User = user;
-        Dirty(uid, comp);
-        _ninja.AssignGloves(user, uid, ninja);
-
-        var drainer = EnsureComp<BatteryDrainerComponent>(user);
-        var stun = EnsureComp<StunProviderComponent>(user);
-        _stunProvider.SetNoPowerPopup(user, "ninja-no-power", stun);
+        // let abilities that use battery power work
         if (_ninja.GetNinjaBattery(user, out var battery, out var _))
         {
-            var ev = new NinjaBatteryChangedEvent(battery.Value, ninja.Suit.Value);
+            var ev = new NinjaBatteryChangedEvent(battery.Value, suit);
             RaiseLocalEvent(user, ref ev);
         }
-
-        var emag = EnsureComp<EmagProviderComponent>(user);
-        _emagProvider.SetWhitelist(user, comp.DoorjackWhitelist, emag);
-
-        EnsureComp<ResearchStealerComponent>(user);
-        // prevent calling in multiple threats by toggling gloves after
-        if (!_codeCondition.IsCompleted(user, ninja.TerrorObjective))
-        {
-            var hacker = EnsureComp<CommsHackerComponent>(user);
-            var rule = _ninja.NinjaRule(user);
-            if (rule != null)
-                _commsHacker.SetThreats(user, rule.Threats, hacker);
-        }
-        if (!_codeCondition.IsCompleted(user, ninja.MassArrestObjective))
-        {
-            EnsureComp<CriminalRecordsHackerComponent>(user);
-        }
     }
 }
diff --git a/Content.Server/Ninja/Systems/NinjaSuitSystem.cs b/Content.Server/Ninja/Systems/NinjaSuitSystem.cs
index 04095b549c6..63054eaad50 100644
--- a/Content.Server/Ninja/Systems/NinjaSuitSystem.cs
+++ b/Content.Server/Ninja/Systems/NinjaSuitSystem.cs
@@ -2,7 +2,6 @@
 using Content.Server.Ninja.Events;
 using Content.Server.Power.Components;
 using Content.Server.PowerCell;
-using Content.Shared.Clothing.EntitySystems;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Ninja.Components;
 using Content.Shared.Ninja.Systems;
@@ -29,15 +28,13 @@ public override void Initialize()
 
         SubscribeLocalEvent<NinjaSuitComponent, ContainerIsInsertingAttemptEvent>(OnSuitInsertAttempt);
         SubscribeLocalEvent<NinjaSuitComponent, EmpAttemptEvent>(OnEmpAttempt);
-        SubscribeLocalEvent<NinjaSuitComponent, AttemptStealthEvent>(OnAttemptStealth);
-        SubscribeLocalEvent<NinjaSuitComponent, CreateThrowingStarEvent>(OnCreateThrowingStar);
         SubscribeLocalEvent<NinjaSuitComponent, RecallKatanaEvent>(OnRecallKatana);
         SubscribeLocalEvent<NinjaSuitComponent, NinjaEmpEvent>(OnEmp);
     }
 
-    protected override void NinjaEquippedSuit(EntityUid uid, NinjaSuitComponent comp, EntityUid user, SpaceNinjaComponent ninja)
+    protected override void NinjaEquipped(Entity<NinjaSuitComponent> ent, Entity<SpaceNinjaComponent> user)
     {
-        base.NinjaEquippedSuit(uid, comp, user, ninja);
+        base.NinjaEquipped(ent, user);
 
         _ninja.SetSuitPowerAlert(user);
     }
@@ -57,16 +54,15 @@ private void OnSuitInsertAttempt(EntityUid uid, NinjaSuitComponent comp, Contain
 
         // can only upgrade power cell, not swap to recharge instantly otherwise ninja could just swap batteries with flashlights in maints for easy power
         if (!TryComp<BatteryComponent>(args.EntityUid, out var inserting) || inserting.MaxCharge <= battery.MaxCharge)
-        {
             args.Cancel();
-        }
 
         // tell ninja abilities that use battery to update it so they don't use charge from the old one
         var user = Transform(uid).ParentUid;
-        if (!HasComp<SpaceNinjaComponent>(user))
+        if (!_ninja.IsNinja(user))
             return;
 
         var ev = new NinjaBatteryChangedEvent(args.EntityUid, uid);
+        RaiseLocalEvent(uid, ref ev);
         RaiseLocalEvent(user, ref ev);
     }
 
@@ -77,64 +73,22 @@ private void OnEmpAttempt(EntityUid uid, NinjaSuitComponent comp, EmpAttemptEven
         args.Cancel();
     }
 
-    protected override void UserUnequippedSuit(EntityUid uid, NinjaSuitComponent comp, EntityUid user)
+    protected override void UserUnequippedSuit(Entity<NinjaSuitComponent> ent, Entity<SpaceNinjaComponent> user)
     {
-        base.UserUnequippedSuit(uid, comp, user);
+        base.UserUnequippedSuit(ent, user);
 
         // remove power indicator
         _ninja.SetSuitPowerAlert(user);
     }
 
-    private void OnAttemptStealth(EntityUid uid, NinjaSuitComponent comp, AttemptStealthEvent args)
+    private void OnRecallKatana(Entity<NinjaSuitComponent> ent, ref RecallKatanaEvent args)
     {
-        var user = args.User;
-        // need 1 second of charge to turn on stealth
-        var chargeNeeded = SuitWattage(uid, comp);
-        // being attacked while cloaked gives no power message since it overloads the power supply or something
-        if (!_ninja.GetNinjaBattery(user, out _, out var battery) || battery.CurrentCharge < chargeNeeded)
-        {
-            Popup.PopupEntity(Loc.GetString("ninja-no-power"), user, user);
-            args.Cancel();
-            return;
-        }
-
-        if (comp.DisableCooldown > GameTiming.CurTime)
-        {
-            Popup.PopupEntity(Loc.GetString("ninja-suit-cooldown"), user, user, PopupType.Medium);
-            args.Cancel();
-            return;
-        }
-
-        StealthClothing.SetEnabled(uid, user, true);
-    }
-
-    private void OnCreateThrowingStar(EntityUid uid, NinjaSuitComponent comp, CreateThrowingStarEvent args)
-    {
-        args.Handled = true;
+        var (uid, comp) = ent;
         var user = args.Performer;
-        if (!_ninja.TryUseCharge(user, comp.ThrowingStarCharge))
-        {
-            Popup.PopupEntity(Loc.GetString("ninja-no-power"), user, user);
+        if (!_ninja.NinjaQuery.TryComp(user, out var ninja) || ninja.Katana == null)
             return;
-        }
-
-        if (comp.DisableCooldown > GameTiming.CurTime)
-        {
-            Popup.PopupEntity(Loc.GetString("ninja-suit-cooldown"), user, user, PopupType.Medium);
-            return;
-        }
-
-        // try to put throwing star in hand, otherwise it goes on the ground
-        var star = Spawn(comp.ThrowingStarPrototype, Transform(user).Coordinates);
-        _hands.TryPickupAnyHand(user, star);
-    }
 
-    private void OnRecallKatana(EntityUid uid, NinjaSuitComponent comp, RecallKatanaEvent args)
-    {
         args.Handled = true;
-        var user = args.Performer;
-        if (!TryComp<SpaceNinjaComponent>(user, out var ninja) || ninja.Katana == null)
-            return;
 
         var katana = ninja.Katana.Value;
         var coords = _transform.GetWorldPosition(katana);
@@ -146,11 +100,8 @@ private void OnRecallKatana(EntityUid uid, NinjaSuitComponent comp, RecallKatana
             return;
         }
 
-        if (comp.DisableCooldown > GameTiming.CurTime)
-        {
-            Popup.PopupEntity(Loc.GetString("ninja-suit-cooldown"), user, user, PopupType.Medium);
+        if (CheckDisabled(ent, user))
             return;
-        }
 
         // TODO: teleporting into belt slot
         var message = _hands.TryPickupAnyHand(user, katana)
@@ -159,9 +110,11 @@ private void OnRecallKatana(EntityUid uid, NinjaSuitComponent comp, RecallKatana
         Popup.PopupEntity(Loc.GetString(message), user, user);
     }
 
-    private void OnEmp(EntityUid uid, NinjaSuitComponent comp, NinjaEmpEvent args)
+    private void OnEmp(Entity<NinjaSuitComponent> ent, ref NinjaEmpEvent args)
     {
+        var (uid, comp) = ent;
         args.Handled = true;
+
         var user = args.Performer;
         if (!_ninja.TryUseCharge(user, comp.EmpCharge))
         {
@@ -169,13 +122,9 @@ private void OnEmp(EntityUid uid, NinjaSuitComponent comp, NinjaEmpEvent args)
             return;
         }
 
-        if (comp.DisableCooldown > GameTiming.CurTime)
-        {
-            Popup.PopupEntity(Loc.GetString("ninja-suit-cooldown"), user, user, PopupType.Medium);
+        if (CheckDisabled(ent, user))
             return;
-        }
 
-        // I don't think this affects the suit battery, but if it ever does in the future add a blacklist for it
         var coords = _transform.GetMapCoordinates(user);
         _emp.EmpPulse(coords, comp.EmpRange, comp.EmpConsumption, comp.EmpDuration);
     }
diff --git a/Content.Server/Ninja/Systems/SpaceNinjaSystem.cs b/Content.Server/Ninja/Systems/SpaceNinjaSystem.cs
index 0c1e88653fa..1ece045774c 100644
--- a/Content.Server/Ninja/Systems/SpaceNinjaSystem.cs
+++ b/Content.Server/Ninja/Systems/SpaceNinjaSystem.cs
@@ -2,7 +2,6 @@
 using Content.Server.Chat.Managers;
 using Content.Server.CriminalRecords.Systems;
 using Content.Server.GameTicking.Rules.Components;
-using Content.Server.GenericAntag;
 using Content.Server.Objectives.Components;
 using Content.Server.Objectives.Systems;
 using Content.Server.Power.Components;
@@ -11,7 +10,6 @@
 using Content.Server.Research.Systems;
 using Content.Server.Roles;
 using Content.Shared.Alert;
-using Content.Shared.Clothing.EntitySystems;
 using Content.Shared.Doors.Components;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Mind;
@@ -26,11 +24,6 @@
 
 namespace Content.Server.Ninja.Systems;
 
-// TODO: when syndiborgs are a thing have a borg converter with 6 second doafter
-// engi -> saboteur
-// medi -> idk reskin it
-// other -> assault
-
 /// <summary>
 /// Main ninja system that handles ninja setup, provides helper methods for the rest of the code to use.
 /// </summary>
@@ -39,18 +32,13 @@ public sealed class SpaceNinjaSystem : SharedSpaceNinjaSystem
     [Dependency] private readonly AlertsSystem _alerts = default!;
     [Dependency] private readonly BatterySystem _battery = default!;
     [Dependency] private readonly CodeConditionSystem _codeCondition = default!;
-    [Dependency] private readonly IChatManager _chatMan = default!;
     [Dependency] private readonly PowerCellSystem _powerCell = default!;
-    [Dependency] private readonly RoleSystem _role = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedMindSystem _mind = default!;
-    [Dependency] private readonly StealthClothingSystem _stealthClothing = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<SpaceNinjaComponent, GenericAntagCreatedEvent>(OnNinjaCreated);
         SubscribeLocalEvent<SpaceNinjaComponent, EmaggedSomethingEvent>(OnDoorjack);
         SubscribeLocalEvent<SpaceNinjaComponent, ResearchStolenEvent>(OnResearchStolen);
         SubscribeLocalEvent<SpaceNinjaComponent, ThreatCalledInEvent>(OnThreatCalledIn);
@@ -62,7 +50,7 @@ public override void Update(float frameTime)
         var query = EntityQueryEnumerator<SpaceNinjaComponent>();
         while (query.MoveNext(out var uid, out var ninja))
         {
-            UpdateNinja(uid, ninja, frameTime);
+            SetSuitPowerAlert((uid, ninja));
         }
     }
 
@@ -80,31 +68,13 @@ private int Download(EntityUid uid, List<string> ids)
         return newCount - oldCount;
     }
 
-    /// <summary>
-    /// Returns a ninja's gamerule config data.
-    /// If the gamerule was not started then it will be started automatically.
-    /// </summary>
-    public NinjaRuleComponent? NinjaRule(EntityUid uid, GenericAntagComponent? comp = null)
-    {
-        if (!Resolve(uid, ref comp))
-            return null;
-
-        // mind not added yet so no rule
-        if (comp.RuleEntity == null)
-            return null;
-
-        return CompOrNull<NinjaRuleComponent>(comp.RuleEntity);
-    }
-
     // TODO: can probably copy paste borg code here
     /// <summary>
     /// Update the alert for the ninja's suit power indicator.
     /// </summary>
-    public void SetSuitPowerAlert(EntityUid uid, SpaceNinjaComponent? comp = null)
+    public void SetSuitPowerAlert(Entity<SpaceNinjaComponent> ent)
     {
-        if (!Resolve(uid, ref comp, false))
-            return;
-
+        var (uid, comp) = ent;
         if (comp.Deleted || comp.Suit == null)
         {
             _alerts.ClearAlert(uid, comp.SuitPowerAlert);
@@ -145,53 +115,6 @@ public override bool TryUseCharge(EntityUid user, float charge)
         return GetNinjaBattery(user, out var uid, out var battery) && _battery.TryUseCharge(uid.Value, charge, battery);
     }
 
-    /// <summary>
-    /// Set up everything for ninja to work and send the greeting message/sound.
-    /// Objectives are added by <see cref="GenericAntagSystem"/>.
-    /// </summary>
-    private void OnNinjaCreated(EntityUid uid, SpaceNinjaComponent comp, ref GenericAntagCreatedEvent args)
-    {
-        var mindId = args.MindId;
-        var mind = args.Mind;
-
-        if (mind.Session == null)
-            return;
-
-        var config = NinjaRule(uid);
-        if (config == null)
-            return;
-
-        var role = new NinjaRoleComponent
-        {
-            PrototypeId = "SpaceNinja"
-        };
-        _role.MindAddRole(mindId, role, mind);
-        _role.MindPlaySound(mindId, config.GreetingSound, mind);
-
-        var session = mind.Session;
-        _audio.PlayGlobal(config.GreetingSound, Filter.Empty().AddPlayer(session), false, AudioParams.Default);
-        _chatMan.DispatchServerMessage(session, Loc.GetString("ninja-role-greeting"));
-    }
-
-    // TODO: PowerCellDraw, modify when cloak enabled
-    /// <summary>
-    /// Handle constant power drains from passive usage and cloak.
-    /// </summary>
-    private void UpdateNinja(EntityUid uid, SpaceNinjaComponent ninja, float frameTime)
-    {
-        if (ninja.Suit == null)
-            return;
-
-        float wattage = Suit.SuitWattage(ninja.Suit.Value);
-
-        SetSuitPowerAlert(uid, ninja);
-        if (!TryUseCharge(uid, wattage * frameTime))
-        {
-            // ran out of power, uncloak ninja
-            _stealthClothing.SetEnabled(ninja.Suit.Value, uid, false);
-        }
-    }
-
     /// <summary>
     /// Increment greentext when emagging a door.
     /// </summary>
diff --git a/Content.Server/Ninja/Systems/SpiderChargeSystem.cs b/Content.Server/Ninja/Systems/SpiderChargeSystem.cs
index 64c958d6f1a..c916d568d5f 100644
--- a/Content.Server/Ninja/Systems/SpiderChargeSystem.cs
+++ b/Content.Server/Ninja/Systems/SpiderChargeSystem.cs
@@ -4,9 +4,10 @@
 using Content.Server.Objectives.Components;
 using Content.Server.Popups;
 using Content.Server.Roles;
-using Content.Server.Sticky.Events;
 using Content.Shared.Interaction;
 using Content.Shared.Ninja.Components;
+using Content.Shared.Ninja.Systems;
+using Content.Shared.Sticky;
 using Robust.Shared.GameObjects;
 
 namespace Content.Server.Ninja.Systems;
@@ -14,7 +15,7 @@ namespace Content.Server.Ninja.Systems;
 /// <summary>
 /// Prevents planting a spider charge outside of its location and handles greentext.
 /// </summary>
-public sealed class SpiderChargeSystem : EntitySystem
+public sealed class SpiderChargeSystem : SharedSpiderChargeSystem
 {
     [Dependency] private readonly MindSystem _mind = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
@@ -33,7 +34,7 @@ public override void Initialize()
     /// <summary>
     /// Require that the planter is a ninja and the charge is near the target warp point.
     /// </summary>
-    private void OnAttemptStick(EntityUid uid, SpiderChargeComponent comp, AttemptEntityStickEvent args)
+    private void OnAttemptStick(EntityUid uid, SpiderChargeComponent comp, ref AttemptEntityStickEvent args)
     {
         if (args.Cancelled)
             return;
@@ -66,7 +67,7 @@ private void OnAttemptStick(EntityUid uid, SpiderChargeComponent comp, AttemptEn
     /// <summary>
     /// Allows greentext to occur after exploding.
     /// </summary>
-    private void OnStuck(EntityUid uid, SpiderChargeComponent comp, EntityStuckEvent args)
+    private void OnStuck(EntityUid uid, SpiderChargeComponent comp, ref EntityStuckEvent args)
     {
         comp.Planter = args.User;
     }
diff --git a/Content.Server/Ninja/Systems/StunProviderSystem.cs b/Content.Server/Ninja/Systems/StunProviderSystem.cs
index 1768606ad20..822486cff52 100644
--- a/Content.Server/Ninja/Systems/StunProviderSystem.cs
+++ b/Content.Server/Ninja/Systems/StunProviderSystem.cs
@@ -6,10 +6,11 @@
 using Content.Shared.Ninja.Systems;
 using Content.Shared.Popups;
 using Content.Shared.Stunnable;
-using Robust.Shared.Prototypes;
+using Content.Shared.Timing;
+using Content.Shared.Whitelist;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Timing;
-using Content.Shared.Whitelist;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Ninja.Systems;
 
@@ -20,12 +21,12 @@ public sealed class StunProviderSystem : SharedStunProviderSystem
 {
     [Dependency] private readonly BatterySystem _battery = default!;
     [Dependency] private readonly DamageableSystem _damageable = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedNinjaGlovesSystem _gloves = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedStunSystem _stun = default!;
-    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+    [Dependency] private readonly UseDelaySystem _useDelay = default!;
 
     public override void Initialize()
     {
@@ -38,16 +39,18 @@ public override void Initialize()
     /// <summary>
     /// Stun clicked mobs on the whitelist, if there is enough power.
     /// </summary>
-    private void OnBeforeInteractHand(EntityUid uid, StunProviderComponent comp, BeforeInteractHandEvent args)
+    private void OnBeforeInteractHand(Entity<StunProviderComponent> ent, ref BeforeInteractHandEvent args)
     {
         // TODO: generic check
+        var (uid, comp) = ent;
         if (args.Handled || comp.BatteryUid == null || !_gloves.AbilityCheck(uid, args, out var target))
             return;
 
-        if (target == uid || _whitelistSystem.IsWhitelistFail(comp.Whitelist, target))
+        if (target == uid || _whitelist.IsWhitelistFail(comp.Whitelist, target))
             return;
 
-        if (_timing.CurTime < comp.NextStun)
+        var useDelay = EnsureComp<UseDelayComponent>(uid);
+        if (_useDelay.IsDelayed((uid, useDelay), id: comp.DelayId))
             return;
 
         // take charge from battery
@@ -63,13 +66,14 @@ private void OnBeforeInteractHand(EntityUid uid, StunProviderComponent comp, Bef
         _stun.TryParalyze(target, comp.StunTime, refresh: false);
 
         // short cooldown to prevent instant stunlocking
-        comp.NextStun = _timing.CurTime + comp.Cooldown;
+        _useDelay.SetLength((uid, useDelay), comp.Cooldown, id: comp.DelayId);
+        _useDelay.TryResetDelay((uid, useDelay), id: comp.DelayId);
 
         args.Handled = true;
     }
 
-    private void OnBatteryChanged(EntityUid uid, StunProviderComponent comp, ref NinjaBatteryChangedEvent args)
+    private void OnBatteryChanged(Entity<StunProviderComponent> ent, ref NinjaBatteryChangedEvent args)
     {
-        SetBattery(uid, args.Battery, comp);
+        SetBattery((ent, ent.Comp), args.Battery);
     }
 }
diff --git a/Content.Server/Nuke/NukeCodePaperSystem.cs b/Content.Server/Nuke/NukeCodePaperSystem.cs
index 8025e2bbd51..e890aa0845f 100644
--- a/Content.Server/Nuke/NukeCodePaperSystem.cs
+++ b/Content.Server/Nuke/NukeCodePaperSystem.cs
@@ -2,7 +2,6 @@
 using Content.Server.Chat.Systems;
 using Content.Server.Fax;
 using Content.Shared.Fax.Components;
-using Content.Server.Paper;
 using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
 using Content.Shared.Paper;
@@ -38,7 +37,8 @@ private void SetupPaper(EntityUid uid, NukeCodePaperComponent? component = null,
 
             if (TryGetRelativeNukeCode(uid, out var paperContent, station, onlyCurrentStation: component.AllNukesAvailable))
             {
-                _paper.SetContent(uid, paperContent);
+                if (TryComp<PaperComponent>(uid, out var paperComp))
+                    _paper.SetContent((uid, paperComp), paperContent);
             }
         }
 
diff --git a/Content.Server/Nuke/NukeSystem.cs b/Content.Server/Nuke/NukeSystem.cs
index db425b491eb..3146ce69894 100644
--- a/Content.Server/Nuke/NukeSystem.cs
+++ b/Content.Server/Nuke/NukeSystem.cs
@@ -590,7 +590,7 @@ private void DisarmBombDoafter(EntityUid uid, EntityUid user, NukeComponent nuke
         {
             BreakOnDamage = true,
             BreakOnMove = true,
-            NeedHand = true
+            NeedHand = true,
         };
 
         if (!_doAfter.TryStartDoAfter(doAfter))
diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
index b8e334fb0da..ab4ce450d88 100644
--- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
@@ -17,6 +17,7 @@
 using Content.Shared.DoAfter;
 using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
+using Content.Shared.Hands.EntitySystems;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
@@ -48,6 +49,7 @@ public sealed class DrinkSystem : SharedDrinkSystem
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
     [Dependency] private readonly SharedInteractionSystem _interaction = default!;
     [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!;
     [Dependency] private readonly StomachSystem _stomach = default!;
@@ -156,6 +158,9 @@ public void UpdateAppearance(EntityUid uid, DrinkComponent component)
         _appearance.SetData(uid, FoodVisuals.Visual, drainAvailable.Float(), appearance);
     }
 
+    /// <summary>
+    /// Tries to feed the drink item to the target entity
+    /// </summary>
     private bool TryDrink(EntityUid user, EntityUid target, DrinkComponent drink, EntityUid item)
     {
         if (!HasComp<BodyComponent>(target))
@@ -206,13 +211,14 @@ private bool TryDrink(EntityUid user, EntityUid target, DrinkComponent drink, En
             target: target,
             used: item)
         {
+            BreakOnHandChange = false,
             BreakOnMove = forceDrink,
             BreakOnDamage = true,
             MovementThreshold = 0.01f,
             DistanceThreshold = 1.0f,
-            // Mice and the like can eat without hands.
-            // TODO maybe set this based on some CanEatWithoutHands event or component?
-            NeedHand = forceDrink,
+            // do-after will stop if item is dropped when trying to feed someone else
+            // or if the item started out in the user's own hands
+            NeedHand = forceDrink || _hands.IsHolding(user, item),
         };
 
         _doAfter.TryStartDoAfter(doAfterEventArgs);
@@ -252,7 +258,7 @@ private void OnDoAfter(Entity<DrinkComponent> entity, ref ConsumeDoAfterEvent ar
         if (transferAmount <= 0)
             return;
 
-        if (!_body.TryGetBodyOrganComponents<StomachComponent>(args.Target.Value, out var stomachs, body))
+        if (!_body.TryGetBodyOrganEntityComps<StomachComponent>((args.Target.Value, body), out var stomachs))
         {
             _popup.PopupEntity(Loc.GetString(forceDrink ? "drink-component-try-use-drink-cannot-drink-other" : "drink-component-try-use-drink-had-enough"), args.Target.Value, args.User);
 
@@ -266,7 +272,7 @@ private void OnDoAfter(Entity<DrinkComponent> entity, ref ConsumeDoAfterEvent ar
             return;
         }
 
-        var firstStomach = stomachs.FirstOrNull(stomach => _stomach.CanTransferSolution(stomach.Comp.Owner, drained, stomach.Comp));
+        var firstStomach = stomachs.FirstOrNull(stomach => _stomach.CanTransferSolution(stomach.Owner, drained, stomach.Comp1));
 
         //All stomachs are full or can't handle whatever solution we have.
         if (firstStomach == null)
@@ -315,8 +321,7 @@ private void OnDoAfter(Entity<DrinkComponent> entity, ref ConsumeDoAfterEvent ar
         _audio.PlayPvs(entity.Comp.UseSound, args.Target.Value, AudioParams.Default.WithVolume(-2f));
 
         _reaction.DoEntityReaction(args.Target.Value, solution, ReactionMethod.Ingestion);
-        //TODO: Grab the stomach UIDs somehow without using Owner
-        _stomach.TryTransferSolution(firstStomach.Value.Comp.Owner, drained, firstStomach.Value.Comp);
+        _stomach.TryTransferSolution(firstStomach.Value.Owner, drained, firstStomach.Value.Comp1);
 
         _forensics.TransferDna(entity, args.Target.Value);
 
@@ -330,7 +335,7 @@ private void AddDrinkVerb(Entity<DrinkComponent> entity, ref GetVerbsEvent<Alter
             !ev.CanInteract ||
             !ev.CanAccess ||
             !TryComp<BodyComponent>(ev.User, out var body) ||
-            !_body.TryGetBodyOrganComponents<StomachComponent>(ev.User, out var stomachs, body))
+            !_body.TryGetBodyOrganEntityComps<StomachComponent>((ev.User, body), out var stomachs))
             return;
 
         // Make sure the solution exists
diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
index 1862b4e19f1..53c1b399821 100644
--- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
@@ -1,6 +1,6 @@
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
-using Content.Server.Chemistry.Containers.EntitySystems;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Server.Inventory;
 using Content.Server.Nutrition.Components;
 using Content.Shared.Nutrition.Components;
@@ -10,7 +10,6 @@
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Organ;
 using Content.Shared.Chemistry;
-using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
 using Content.Shared.FixedPoint;
@@ -31,6 +30,7 @@
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Utility;
 using System.Linq;
+using Content.Shared.Containers.ItemSlots;
 using Robust.Server.GameObjects;
 using Content.Shared.Whitelist;
 
@@ -53,7 +53,7 @@ public sealed class FoodSystem : EntitySystem
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly SharedHandsSystem _hands = default!;
     [Dependency] private readonly SharedInteractionSystem _interaction = default!;
-    [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
     [Dependency] private readonly TransformSystem _transform = default!;
     [Dependency] private readonly StackSystem _stack = default!;
     [Dependency] private readonly StomachSystem _stomach = default!;
@@ -99,6 +99,9 @@ private void OnFeedFood(Entity<FoodComponent> entity, ref AfterInteractEvent arg
         args.Handled = result.Handled;
     }
 
+    /// <summary>
+    /// Tries to feed the food item to the target entity
+    /// </summary>
     public (bool Success, bool Handled) TryFeed(EntityUid user, EntityUid target, EntityUid food, FoodComponent foodComp)
     {
         //Suppresses eating yourself and alive mobs
@@ -118,7 +121,7 @@ private void OnFeedFood(Entity<FoodComponent> entity, ref AfterInteractEvent arg
         if (!_solutionContainer.TryGetSolution(food, foodComp.Solution, out _, out var foodSolution))
             return (false, false);
 
-        if (!_body.TryGetBodyOrganComponents<StomachComponent>(target, out var stomachs, body))
+        if (!_body.TryGetBodyOrganEntityComps<StomachComponent>((target, body), out var stomachs))
             return (false, false);
 
         // Check for special digestibles
@@ -135,6 +138,16 @@ private void OnFeedFood(Entity<FoodComponent> entity, ref AfterInteractEvent arg
             return (false, true);
         }
 
+        // Checks for used item slots
+        if (TryComp<ItemSlotsComponent>(food, out var itemSlots))
+        {
+            if (itemSlots.Slots.Any(slot => slot.Value.HasItem))
+            {
+                _popup.PopupEntity(Loc.GetString("food-has-used-storage", ("food", food)), user, user);
+                return (false, true);
+            }
+        }
+
         var flavors = _flavorProfile.GetLocalizedFlavorsMessage(food, user, foodSolution);
 
         if (GetUsesRemaining(food, foodComp) <= 0)
@@ -169,12 +182,12 @@ private void OnFeedFood(Entity<FoodComponent> entity, ref AfterInteractEvent arg
                 user, target);
 
             // logging
-            _adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(user):user} is forcing {ToPrettyString(target):target} to eat {ToPrettyString(food):food} {SolutionContainerSystem.ToPrettyString(foodSolution)}");
+            _adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(user):user} is forcing {ToPrettyString(target):target} to eat {ToPrettyString(food):food} {SharedSolutionContainerSystem.ToPrettyString(foodSolution)}");
         }
         else
         {
             // log voluntary eating
-            _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(target):target} is eating {ToPrettyString(food):food} {SolutionContainerSystem.ToPrettyString(foodSolution)}");
+            _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(target):target} is eating {ToPrettyString(food):food} {SharedSolutionContainerSystem.ToPrettyString(foodSolution)}");
         }
 
         var doAfterArgs = new DoAfterArgs(EntityManager,
@@ -185,13 +198,14 @@ private void OnFeedFood(Entity<FoodComponent> entity, ref AfterInteractEvent arg
             target: target,
             used: food)
         {
+            BreakOnHandChange = false,
             BreakOnMove = forceFeed,
             BreakOnDamage = true,
             MovementThreshold = 0.01f,
             DistanceThreshold = MaxFeedDistance,
-            // Mice and the like can eat without hands.
-            // TODO maybe set this based on some CanEatWithoutHands event or component?
-            NeedHand = forceFeed,
+            // do-after will stop if item is dropped when trying to feed someone else
+            // or if the item started out in the user's own hands
+            NeedHand = forceFeed || _hands.IsHolding(user, food),
         };
 
         _doAfter.TryStartDoAfter(doAfterArgs);
@@ -206,7 +220,7 @@ private void OnDoAfter(Entity<FoodComponent> entity, ref ConsumeDoAfterEvent arg
         if (!TryComp<BodyComponent>(args.Target.Value, out var body))
             return;
 
-        if (!_body.TryGetBodyOrganComponents<StomachComponent>(args.Target.Value, out var stomachs, body))
+        if (!_body.TryGetBodyOrganEntityComps<StomachComponent>((args.Target.Value, body), out var stomachs))
             return;
 
         if (args.Used is null || !_solutionContainer.TryGetSolution(args.Used.Value, args.Solution, out var soln, out var solution))
@@ -230,23 +244,22 @@ private void OnDoAfter(Entity<FoodComponent> entity, ref ConsumeDoAfterEvent arg
 
         var split = _solutionContainer.SplitSolution(soln.Value, transferAmount);
 
-        //TODO: Get the stomach UID somehow without nabbing owner
         // Get the stomach with the highest available solution volume
         var highestAvailable = FixedPoint2.Zero;
-        StomachComponent? stomachToUse = null;
-        foreach (var (stomach, _) in stomachs)
+        Entity<StomachComponent>? stomachToUse = null;
+        foreach (var ent in stomachs)
         {
-            var owner = stomach.Owner;
-            if (!_stomach.CanTransferSolution(owner, split, stomach))
+            var owner = ent.Owner;
+            if (!_stomach.CanTransferSolution(owner, split, ent.Comp1))
                 continue;
 
-            if (!_solutionContainer.ResolveSolution(owner, StomachSystem.DefaultSolutionName, ref stomach.Solution, out var stomachSol))
+            if (!_solutionContainer.ResolveSolution(owner, StomachSystem.DefaultSolutionName, ref ent.Comp1.Solution, out var stomachSol))
                 continue;
 
             if (stomachSol.AvailableVolume <= highestAvailable)
                 continue;
 
-            stomachToUse = stomach;
+            stomachToUse = ent;
             highestAvailable = stomachSol.AvailableVolume;
         }
 
@@ -259,7 +272,7 @@ private void OnDoAfter(Entity<FoodComponent> entity, ref ConsumeDoAfterEvent arg
         }
 
         _reaction.DoEntityReaction(args.Target.Value, solution, ReactionMethod.Ingestion);
-        _stomach.TryTransferSolution(stomachToUse.Owner, split, stomachToUse);
+        _stomach.TryTransferSolution(stomachToUse!.Value.Owner, split, stomachToUse);
 
         var flavors = args.FlavorMessage;
 
@@ -351,7 +364,7 @@ private void AddEatVerb(Entity<FoodComponent> entity, ref GetVerbsEvent<Alternat
             !ev.CanInteract ||
             !ev.CanAccess ||
             !TryComp<BodyComponent>(ev.User, out var body) ||
-            !_body.TryGetBodyOrganComponents<StomachComponent>(ev.User, out var stomachs, body))
+            !_body.TryGetBodyOrganEntityComps<StomachComponent>((ev.User, body), out var stomachs))
             return;
 
         // have to kill mouse before eating it
@@ -385,7 +398,7 @@ public bool IsDigestibleBy(EntityUid uid, EntityUid food, FoodComponent? foodCom
         if (!Resolve(food, ref foodComp, false))
             return false;
 
-        if (!_body.TryGetBodyOrganComponents<StomachComponent>(uid, out var stomachs))
+        if (!_body.TryGetBodyOrganEntityComps<StomachComponent>(uid, out var stomachs))
             return false;
 
         return IsDigestibleBy(food, foodComp, stomachs);
@@ -395,7 +408,7 @@ public bool IsDigestibleBy(EntityUid uid, EntityUid food, FoodComponent? foodCom
     ///     Returns true if <paramref name="stomachs"/> has a <see cref="StomachComponent.SpecialDigestible"/> that whitelists
     ///     this <paramref name="food"/> (or if they even have enough stomachs in the first place).
     /// </summary>
-    private bool IsDigestibleBy(EntityUid food, FoodComponent component, List<(StomachComponent, OrganComponent)> stomachs)
+    private bool IsDigestibleBy(EntityUid food, FoodComponent component, List<Entity<StomachComponent, OrganComponent>> stomachs)
     {
         var digestible = true;
 
@@ -404,13 +417,13 @@ private bool IsDigestibleBy(EntityUid food, FoodComponent component, List<(Stoma
             return false;
 
         // Run through the mobs' stomachs
-        foreach (var (comp, _) in stomachs)
+        foreach (var ent in stomachs)
         {
             // Find a stomach with a SpecialDigestible
-            if (comp.SpecialDigestible == null)
+            if (ent.Comp1.SpecialDigestible == null)
                 continue;
             // Check if the food is in the whitelist
-            if (_whitelistSystem.IsWhitelistPass(comp.SpecialDigestible, food))
+            if (_whitelistSystem.IsWhitelistPass(ent.Comp1.SpecialDigestible, food))
                 return true;
             // They can only eat whitelist food and the food isn't in the whitelist. It's not edible.
             return false;
diff --git a/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs b/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
index e872a491e3d..eb78238a7c2 100644
--- a/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
@@ -18,7 +18,6 @@ public sealed class SliceableFoodSystem : EntitySystem
     {
         [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
-        [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
         [Dependency] private readonly TransformSystem _xformSystem = default!;
 
         public override void Initialize()
diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.SmokingPipe.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.SmokingPipe.cs
index 3950c73eb43..26d86acd545 100644
--- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.SmokingPipe.cs
+++ b/Content.Server/Nutrition/EntitySystems/SmokingSystem.SmokingPipe.cs
@@ -42,7 +42,7 @@ private void OnPipeInteractUsingEvent(Entity<SmokingPipeComponent> entity, ref I
             if (!isHotEvent.IsHot)
                 return;
 
-            if (TryTransferReagents(entity.Comp, smokable))
+            if (TryTransferReagents(entity, (entity.Owner, smokable)))
                 SetSmokableState(entity, SmokableState.Lit, smokable);
             args.Handled = true;
         }
@@ -62,7 +62,7 @@ public void OnPipeAfterInteract(Entity<SmokingPipeComponent> entity, ref AfterIn
             if (!isHotEvent.IsHot)
                 return;
 
-            if (TryTransferReagents(entity.Comp, smokable))
+            if (TryTransferReagents(entity, (entity.Owner, smokable)))
                 SetSmokableState(entity, SmokableState.Lit, smokable);
             args.Handled = true;
         }
@@ -74,15 +74,15 @@ private void OnPipeSolutionEmptyEvent(Entity<SmokingPipeComponent> entity, ref S
         }
 
         // Convert smokable item into reagents to be smoked
-        private bool TryTransferReagents(SmokingPipeComponent component, SmokableComponent smokable)
+        private bool TryTransferReagents(Entity<SmokingPipeComponent> entity, Entity<SmokableComponent> smokable)
         {
-            if (component.BowlSlot.Item == null)
+            if (entity.Comp.BowlSlot.Item == null)
                 return false;
 
-            EntityUid contents = component.BowlSlot.Item.Value;
+            EntityUid contents = entity.Comp.BowlSlot.Item.Value;
 
             if (!TryComp<SolutionContainerManagerComponent>(contents, out var reagents) ||
-                !_solutionContainerSystem.TryGetSolution(smokable.Owner, smokable.Solution, out var pipeSolution, out _))
+                !_solutionContainerSystem.TryGetSolution(smokable.Owner, smokable.Comp.Solution, out var pipeSolution, out _))
                 return false;
 
             foreach (var (_, soln) in _solutionContainerSystem.EnumerateSolutions((contents, reagents)))
@@ -93,7 +93,7 @@ private bool TryTransferReagents(SmokingPipeComponent component, SmokableCompone
 
             EntityManager.DeleteEntity(contents);
 
-            _itemSlotsSystem.SetLock(component.Owner, component.BowlSlot, true); //no inserting more until current runs out
+            _itemSlotsSystem.SetLock(entity.Owner, entity.Comp.BowlSlot, true); //no inserting more until current runs out
 
             return true;
         }
diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs
index a33c944c994..7f8253efedf 100644
--- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs
@@ -142,7 +142,7 @@ public override void Update(float frameTime)
 
                 // This is awful. I hate this so much.
                 // TODO: Please, someone refactor containers and free me from this bullshit.
-                if (!_container.TryGetContainingContainer(uid, out var containerManager) ||
+                if (!_container.TryGetContainingContainer((uid, null, null), out var containerManager) ||
                     !(_inventorySystem.TryGetSlotEntity(containerManager.Owner, "mask", out var inMaskSlotUid) && inMaskSlotUid == uid) ||
                     !TryComp(containerManager.Owner, out BloodstreamComponent? bloodstream))
                 {
diff --git a/Content.Server/Nutrition/EntitySystems/UtensilSystem.cs b/Content.Server/Nutrition/EntitySystems/UtensilSystem.cs
index 43087214a45..1f3d5afb433 100644
--- a/Content.Server/Nutrition/EntitySystems/UtensilSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/UtensilSystem.cs
@@ -4,6 +4,7 @@
 using Content.Shared.Interaction;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;
+using Content.Shared.Tools.EntitySystems;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Random;
@@ -25,30 +26,30 @@ public override void Initialize()
         {
             base.Initialize();
 
-            SubscribeLocalEvent<UtensilComponent, AfterInteractEvent>(OnAfterInteract, after: new[] { typeof(ItemSlotsSystem) });
+            SubscribeLocalEvent<UtensilComponent, AfterInteractEvent>(OnAfterInteract, after: new[] { typeof(ItemSlotsSystem), typeof(ToolOpenableSystem) });
         }
 
         /// <summary>
         /// Clicked with utensil
         /// </summary>
-        private void OnAfterInteract(EntityUid uid, UtensilComponent component, AfterInteractEvent ev)
+        private void OnAfterInteract(Entity<UtensilComponent> entity, ref AfterInteractEvent ev)
         {
             if (ev.Handled || ev.Target == null || !ev.CanReach)
                 return;
 
-            var result = TryUseUtensil(ev.User, ev.Target.Value, component);
+            var result = TryUseUtensil(ev.User, ev.Target.Value, entity);
             ev.Handled = result.Handled;
         }
 
-        public (bool Success, bool Handled) TryUseUtensil(EntityUid user, EntityUid target, UtensilComponent component)
+        public (bool Success, bool Handled) TryUseUtensil(EntityUid user, EntityUid target, Entity<UtensilComponent> utensil)
         {
             if (!EntityManager.TryGetComponent(target, out FoodComponent? food))
                 return (false, true);
 
             //Prevents food usage with a wrong utensil
-            if ((food.Utensil & component.Types) == 0)
+            if ((food.Utensil & utensil.Comp.Types) == 0)
             {
-                _popupSystem.PopupEntity(Loc.GetString("food-system-wrong-utensil", ("food", target), ("utensil", component.Owner)), user, user);
+                _popupSystem.PopupEntity(Loc.GetString("food-system-wrong-utensil", ("food", target), ("utensil", utensil.Owner)), user, user);
                 return (false, true);
             }
 
diff --git a/Content.Server/Nutrition/Hungry.cs b/Content.Server/Nutrition/Hungry.cs
index ae68dcd2fda..ce5e14ce091 100644
--- a/Content.Server/Nutrition/Hungry.cs
+++ b/Content.Server/Nutrition/Hungry.cs
@@ -4,40 +4,35 @@
 using Content.Shared.Nutrition.EntitySystems;
 using Robust.Shared.Console;
 
-namespace Content.Server.Nutrition
-{
-    [AdminCommand(AdminFlags.Debug)]
-    public sealed class Hungry : IConsoleCommand
-    {
-        [Dependency] private readonly IEntityManager _entities = default!;
+namespace Content.Server.Nutrition;
 
-        public string Command => "hungry";
-        public string Description => "Makes you hungry.";
-        public string Help => $"{Command}";
+[AdminCommand(AdminFlags.Debug)]
+public sealed class Hungry : LocalizedEntityCommands
+{
+    public override string Command => "hungry";
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        var player = shell.Player;
+        if (player == null)
         {
-            var player = shell.Player;
-            if (player == null)
-            {
-                shell.WriteLine("You cannot use this command unless you are a player.");
-                return;
-            }
-
-            if (player.AttachedEntity is not {Valid: true} playerEntity)
-            {
-                shell.WriteLine("You cannot use this command without an entity.");
-                return;
-            }
+            shell.WriteError(Loc.GetString("cmd-nutrition-error-player"));
+            return;
+        }
 
-            if (!_entities.TryGetComponent(playerEntity, out HungerComponent? hunger))
-            {
-                shell.WriteLine($"Your entity does not have a {nameof(HungerComponent)} component.");
-                return;
-            }
+        if (player.AttachedEntity is not {Valid: true} playerEntity)
+        {
+            shell.WriteError(Loc.GetString("cmd-nutrition-error-entity"));
+            return;
+        }
 
-            var hungryThreshold = hunger.Thresholds[HungerThreshold.Starving];
-            _entities.System<HungerSystem>().SetHunger(playerEntity, hungryThreshold, hunger);
+        if (!EntityManager.TryGetComponent(playerEntity, out HungerComponent? hunger))
+        {
+            shell.WriteError(Loc.GetString("cmd-nutrition-error-component", ("comp", nameof(HungerComponent))));
+            return;
         }
+
+        var hungryThreshold = hunger.Thresholds[HungerThreshold.Starving];
+        EntityManager.System<HungerSystem>().SetHunger(playerEntity, hungryThreshold, hunger);
     }
 }
diff --git a/Content.Server/Nutrition/SetNutrit.cs b/Content.Server/Nutrition/SetNutrit.cs
new file mode 100644
index 00000000000..c7c716b78cc
--- /dev/null
+++ b/Content.Server/Nutrition/SetNutrit.cs
@@ -0,0 +1,115 @@
+using Content.Server.Administration;
+using Content.Server.Database.Migrations.Postgres;
+using Content.Shared.Administration;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
+using Robust.Shared.Console;
+using System.Linq;
+
+namespace Content.Server.Nutrition;
+
+[AdminCommand(AdminFlags.Debug)]
+public sealed class SetNutrit : LocalizedEntityCommands
+{
+    public override string Command => "setnutrit";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        var player = shell.Player;
+        if (player == null)
+        {
+            shell.WriteError(Loc.GetString("cmd-nutrition-error-player"));
+            return;
+        }
+
+        if (player.AttachedEntity is not { Valid: true } playerEntity)
+        {
+            shell.WriteError(Loc.GetString("cmd-nutrition-error-entity"));
+            return;
+        }
+
+        if (args.Length != 2)
+        {
+            shell.WriteError(Loc.GetString("shell-wrong-arguments-number-need-specific",
+                ("properAmount", 2),
+                ("currentAmount", args.Length)
+            ));
+            return;
+        }
+
+        var systemString = args[0];
+        switch (systemString)
+        {
+            case "hunger":
+            {
+                if (!EntityManager.TryGetComponent(playerEntity, out HungerComponent? hunger))
+                {
+                    shell.WriteError(Loc.GetString("cmd-nutrition-error-component", ("comp", nameof(HungerComponent))));
+                    return;
+                }
+
+                if (!Enum.TryParse(args[1], out HungerThreshold hungerThreshold))
+                {
+                    shell.WriteError(Loc.GetString("cmd-setnutrit-error-invalid-threshold",
+                        ("thresholdType", nameof(HungerThreshold)),
+                        ("thresholdString", args[1])
+                    ));
+                    return;
+                }
+
+                var hungerValue = hunger.Thresholds[hungerThreshold];
+                EntityManager.System<HungerSystem>().SetHunger(playerEntity, hungerValue, hunger);
+                return;
+            }
+            case "thirst":
+            {
+                if (!EntityManager.TryGetComponent(playerEntity, out ThirstComponent? thirst))
+                {
+                    shell.WriteError(Loc.GetString("cmd-nutrition-error-component", ("comp", nameof(ThirstComponent))));
+                    return;
+                }
+
+                if (!Enum.TryParse(args[1], out ThirstThreshold thirstThreshold))
+                {
+                    shell.WriteError(Loc.GetString("cmd-setnutrit-error-invalid-threshold",
+                         ("thresholdType", nameof(ThirstThreshold)),
+                         ("thresholdString", args[1])
+                     ));
+                    return;
+                }
+
+                var thirstValue = thirst.ThirstThresholds[thirstThreshold];
+                EntityManager.System<ThirstSystem>().SetThirst(playerEntity, thirst, thirstValue);
+                return;
+            }
+            default:
+            {
+                shell.WriteError($"invalid nutrition system ${systemString}");
+                return;
+            }
+        }
+    }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        switch (args.Length)
+        {
+            case 1:
+            {
+                string[] kinds = { "hunger", "thirst" };
+                return CompletionResult.FromHintOptions(kinds, "nutrition system");
+            }
+            case 2:
+            {
+                return args[0] switch
+                {
+                    "hunger" => CompletionResult.FromHintOptions(Enum.GetNames<HungerThreshold>(), nameof(HungerThreshold)),
+                    "thirst" => CompletionResult.FromHintOptions(Enum.GetNames<ThirstThreshold>(), nameof(ThirstThreshold)),
+                    _ => CompletionResult.Empty,
+                };
+            }
+            default:
+                return CompletionResult.Empty;
+        }
+    }
+}
diff --git a/Content.Server/Nutrition/Thirsty.cs b/Content.Server/Nutrition/Thirsty.cs
new file mode 100644
index 00000000000..8725a62be21
--- /dev/null
+++ b/Content.Server/Nutrition/Thirsty.cs
@@ -0,0 +1,38 @@
+using Content.Server.Administration;
+using Content.Shared.Administration;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
+using Robust.Shared.Console;
+
+namespace Content.Server.Nutrition;
+
+[AdminCommand(AdminFlags.Debug)]
+public sealed class Thirsty : LocalizedEntityCommands
+{
+    public override string Command => "thirsty";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        var player = shell.Player;
+        if (player == null)
+        {
+            shell.WriteError(Loc.GetString("cmd-nutrition-error-player"));
+            return;
+        }
+
+        if (player.AttachedEntity is not {Valid: true} playerEntity)
+        {
+            shell.WriteError(Loc.GetString("cmd-nutrition-error-entity"));
+            return;
+        }
+
+        if (!EntityManager.TryGetComponent(playerEntity, out ThirstComponent? thirst))
+        {
+            shell.WriteError(Loc.GetString("cmd-nutrition-error-component", ("comp", nameof(ThirstComponent))));
+            return;
+        }
+
+        var thirstyThreshold = thirst.ThirstThresholds[ThirstThreshold.Parched];
+        EntityManager.System<ThirstSystem>().SetThirst(playerEntity, thirst, thirstyThreshold);
+    }
+}
diff --git a/Content.Server/Nyanotrasen/Carrying/CarryingSystem.cs b/Content.Server/Nyanotrasen/Carrying/CarryingSystem.cs
index a93ea564ed9..967a19d90e1 100644
--- a/Content.Server/Nyanotrasen/Carrying/CarryingSystem.cs
+++ b/Content.Server/Nyanotrasen/Carrying/CarryingSystem.cs
@@ -157,7 +157,7 @@ private void OnThrow(EntityUid uid, CarryingComponent component, BeforeThrowEven
             args.ItemUid = virtItem.BlockingEntity;
 
             var multiplier = MassContest(uid, virtItem.BlockingEntity);
-            args.ThrowStrength = 5f * multiplier;
+            args.ThrowSpeed = 5f * multiplier;
         }
 
         private void OnParentChanged(EntityUid uid, CarryingComponent component, ref EntParentChangedMessage args)
diff --git a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.Results.cs b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.Results.cs
index ae3e8b10811..3f93787934c 100644
--- a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.Results.cs
+++ b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.Results.cs
@@ -5,7 +5,6 @@
 using Content.Server.Kitchen.Components;
 using Content.Server.Nutrition.Components;
 using Content.Server.Nyanotrasen.Kitchen.Components;
-using Content.Server.Paper;
 using Content.Shared.Atmos.Rotting;
 using Content.Shared.Buckle.Components;
 using Content.Shared.Chemistry.Components;
@@ -14,6 +13,7 @@
 using Content.Shared.NPC;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Nyanotrasen.Kitchen.Components;
+using Content.Shared.Paper;
 using Robust.Shared.Random;
 
 namespace Content.Server.Nyanotrasen.Kitchen.EntitySystems;
diff --git a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs
index af6f8045a17..de41f37a921 100644
--- a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs
+++ b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs
@@ -205,7 +205,7 @@ private void CookItem(EntityUid uid, DeepFryerComponent component, EntityUid ite
         if (TryComp<TemperatureComponent>(item, out var tempComp))
         {
             // Push the temperature towards what it should be but no higher.
-            var delta = (component.PoweredTemperature - tempComp.CurrentTemperature) * tempComp.HeatCapacity;
+            var delta = (component.PoweredTemperature - tempComp.CurrentTemperature) * _temperature.GetHeatCapacity(item, tempComp);
 
             if (delta > 0f)
                 _temperature.ChangeHeat(item, delta, false, tempComp);
diff --git a/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs b/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs
index a1f20bf56a9..82dcc3e0025 100644
--- a/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs
+++ b/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs
@@ -10,9 +10,9 @@ namespace Content.Server.Psionics
 {
     public sealed class PsionicInvisibilitySystem : EntitySystem
     {
-        [Dependency] private readonly VisibilitySystem _visibilitySystem = default!;
+        [Dependency] private readonly VisibilitySystem _visibility = default!;
         [Dependency] private readonly PsionicInvisibilityPowerSystem _invisSystem = default!;
-        [Dependency] private readonly NpcFactionSystem _npcFactonSystem = default!;
+        [Dependency] private readonly NpcFactionSystem _faction = default!;
         [Dependency] private readonly SharedEyeSystem _eye = default!;
         public override void Initialize()
         {
@@ -45,16 +45,16 @@ private void OnInsulInit(EntityUid uid, PsionicInsulationComponent component, Co
             if (HasComp<PsionicInvisibilityUsedComponent>(uid))
                 _invisSystem.ToggleInvisibility(uid);
 
-            if (_npcFactonSystem.ContainsFaction(uid, "PsionicInterloper"))
+            if (_faction.IsMember(uid, "PsionicInterloper"))
             {
                 component.SuppressedFactions.Add("PsionicInterloper");
-                _npcFactonSystem.RemoveFaction(uid, "PsionicInterloper");
+                _faction.RemoveFaction(uid, "PsionicInterloper");
             }
 
-            if (_npcFactonSystem.ContainsFaction(uid, "GlimmerMonster"))
+            if (_faction.IsMember(uid, "GlimmerMonster"))
             {
                 component.SuppressedFactions.Add("GlimmerMonster");
-                _npcFactonSystem.RemoveFaction(uid, "GlimmerMonster");
+                _faction.RemoveFaction(uid, "GlimmerMonster");
             }
 
             SetCanSeePsionicInvisiblity(uid, true);
@@ -75,29 +75,31 @@ private void OnInsulShutdown(EntityUid uid, PsionicInsulationComponent component
 
             foreach (var faction in component.SuppressedFactions)
             {
-                _npcFactonSystem.AddFaction(uid, faction);
+                _faction.AddFaction(uid, faction);
             }
             component.SuppressedFactions.Clear();
         }
 
         private void OnInvisInit(EntityUid uid, PsionicallyInvisibleComponent component, ComponentInit args)
         {
-            var visibility = EntityManager.EnsureComponent<VisibilityComponent>(uid);
+            var visibility = EnsureComp<VisibilityComponent>(uid);
+            var ent = (uid, visibility);
 
-            _visibilitySystem.AddLayer(uid, visibility, (int) VisibilityFlags.PsionicInvisibility, false);
-            _visibilitySystem.RemoveLayer(uid, visibility, (int) VisibilityFlags.Normal, false);
-            _visibilitySystem.RefreshVisibility(uid, visibility);
+            _visibility.AddLayer(ent, (int) VisibilityFlags.PsionicInvisibility, false);
+            _visibility.RemoveLayer(ent, (int) VisibilityFlags.Normal, false);
+            _visibility.RefreshVisibility(ent);
         }
 
 
         private void OnInvisShutdown(EntityUid uid, PsionicallyInvisibleComponent component, ComponentShutdown args)
         {
-            if (TryComp<VisibilityComponent>(uid, out var visibility))
-            {
-                _visibilitySystem.RemoveLayer(uid, visibility, (int) VisibilityFlags.PsionicInvisibility, false);
-                _visibilitySystem.AddLayer(uid, visibility, (int) VisibilityFlags.Normal, false);
-                _visibilitySystem.RefreshVisibility(uid, visibility);
-            }
+            if (!TryComp<VisibilityComponent>(uid, out var visibility))
+                return;
+
+            var ent = (uid, visibility);
+            _visibility.RemoveLayer(ent, (int) VisibilityFlags.PsionicInvisibility, false);
+            _visibility.AddLayer(ent, (int) VisibilityFlags.Normal, false);
+            _visibility.RefreshVisibility(ent);
         }
 
         private void OnEyeInit(EntityUid uid, EyeComponent component, ComponentInit args)
diff --git a/Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs b/Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs
index fbde7271f1c..889a0d27225 100644
--- a/Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs
+++ b/Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs
@@ -30,7 +30,7 @@ public sealed class PsionicsSystem : EntitySystem
         [Dependency] private readonly MindSwapPowerSystem _mindSwapPowerSystem = default!;
         [Dependency] private readonly GlimmerSystem _glimmerSystem = default!;
         [Dependency] private readonly ChatSystem _chat = default!;
-        [Dependency] private readonly NpcFactionSystem _npcFactonSystem = default!;
+        [Dependency] private readonly NpcFactionSystem _faction = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
 
@@ -98,10 +98,10 @@ private void OnInit(EntityUid uid, PsionicComponent component, ComponentInit arg
             if (!TryComp<NpcFactionMemberComponent>(uid, out var factions))
                 return;
 
-            if (_npcFactonSystem.ContainsFaction(uid, "GlimmerMonster", factions))
+            if (_faction.IsMember((uid, factions), "GlimmerMonster"))
                 return;
 
-            _npcFactonSystem.AddFaction(uid, "PsionicInterloper");
+            _faction.AddFaction((uid, factions), "PsionicInterloper");
         }
 
         private void OnRemove(EntityUid uid, PsionicComponent component, ComponentRemove args)
@@ -109,7 +109,7 @@ private void OnRemove(EntityUid uid, PsionicComponent component, ComponentRemove
             if (!TryComp<NpcFactionMemberComponent>(uid, out var factions))
                 return;
 
-            _npcFactonSystem.RemoveFaction(uid, "PsionicInterloper");
+            _faction.RemoveFaction((uid, factions), "PsionicInterloper");
         }
 
         private void OnStamHit(EntityUid uid, AntiPsionicWeaponComponent component, StaminaMeleeHitEvent args)
diff --git a/Content.Server/Nyanotrasen/Research/Oracle/OracleSystem.cs b/Content.Server/Nyanotrasen/Research/Oracle/OracleSystem.cs
index 084b666a754..8c3bf5c98a0 100644
--- a/Content.Server/Nyanotrasen/Research/Oracle/OracleSystem.cs
+++ b/Content.Server/Nyanotrasen/Research/Oracle/OracleSystem.cs
@@ -222,7 +222,8 @@ public List<string> GetAllProtos(OracleComponent component)
             foreach (var recipe in tech.RecipeUnlocks)
             {
                 var recipeProto = _prototypeManager.Index(recipe);
-                allRecipes.Add(recipeProto.Result);
+                if (recipeProto.Result is {} result)
+                    allRecipes.Add(result);
             }
         }
 
diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/MundaneDischargeRuleComponent.cs b/Content.Server/Nyanotrasen/StationEvents/Components/MundaneDischargeRuleComponent.cs
deleted file mode 100644
index ac188f3d9aa..00000000000
--- a/Content.Server/Nyanotrasen/StationEvents/Components/MundaneDischargeRuleComponent.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Content.Server.StationEvents.Events;
-
-namespace Content.Server.StationEvents.Components;
-
-[RegisterComponent, Access(typeof(MundaneDischargeRule))]
-public sealed partial class MundaneDischargeRuleComponent : Component
-{
-}
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/FreeProberRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/FreeProberRule.cs
index aba6bb71b7a..f1628c7bfd1 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/FreeProberRule.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/FreeProberRule.cs
@@ -1,10 +1,10 @@
-using Content.Server.GameTicking.Components;
 using Content.Server.Power.Components;
 using Content.Server.Psionics.Glimmer;
 using Content.Server.Station.Systems;
 using Content.Server.StationEvents.Components;
 using Content.Server.StationEvents.Events;
 using Content.Shared.Construction.EntitySystems;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Psionics.Glimmer;
 using Robust.Shared.Map;
 using Robust.Shared.Random;
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerEventSystem.cs b/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerEventSystem.cs
index 9e5eb328b75..07356026c9a 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerEventSystem.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerEventSystem.cs
@@ -1,6 +1,6 @@
-using Content.Server.GameTicking.Components;
 using Content.Server.Psionics.Glimmer;
 using Content.Server.StationEvents.Events;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Psionics.Glimmer;
 
 namespace Content.Server.Nyanotrasen.StationEvents.Events
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerRandomSentienceRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerRandomSentienceRule.cs
index fc2b40f76c8..26c9e0b4456 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerRandomSentienceRule.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerRandomSentienceRule.cs
@@ -1,9 +1,9 @@
-using Content.Server.GameTicking.Components;
 using Content.Server.Ghost.Roles.Components;
 using Content.Server.Psionics;
 using Content.Server.Speech.Components;
 using Content.Server.StationEvents.Components;
 using Content.Server.StationEvents.Events;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Mobs.Systems;
 
 namespace Content.Server.Nyanotrasen.StationEvents.Events;
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerRevenantSpawnRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerRevenantSpawnRule.cs
index 96a75d52efa..69a2ba18da0 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerRevenantSpawnRule.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerRevenantSpawnRule.cs
@@ -1,7 +1,7 @@
-using Content.Server.GameTicking.Components;
 using Content.Server.Psionics.Glimmer;
 using Content.Server.StationEvents.Components;
 using Content.Server.StationEvents.Events;
+using Content.Shared.GameTicking.Components;
 using Robust.Shared.Random;
 
 namespace Content.Server.Nyanotrasen.StationEvents.Events;
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs
index 5b5f4081d6a..2af523102b7 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs
@@ -1,9 +1,9 @@
 using Content.Server.Abilities.Psionics;
-using Content.Server.GameTicking.Components;
 using Content.Server.Psionics;
 using Content.Server.StationEvents.Components;
 using Content.Server.StationEvents.Events;
 using Content.Shared.Abilities.Psionics;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Robust.Shared.Player;
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/MundaneDischargeRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/MundaneDischargeRule.cs
deleted file mode 100644
index e969e7cfe44..00000000000
--- a/Content.Server/Nyanotrasen/StationEvents/Events/MundaneDischargeRule.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Content.Server.StationEvents.Components;
-
-namespace Content.Server.StationEvents.Events;
-
-/// <summary>
-/// Early anti-ramp event.
-/// </summary>
-internal sealed class MundaneDischargeRule : StationEventSystem<MundaneDischargeRuleComponent>
-{
-}
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs
index aa4d60fd805..9baffbc84cd 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs
@@ -1,6 +1,5 @@
 using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
-using Content.Server.GameTicking.Components;
 using Content.Server.Popups;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
@@ -10,6 +9,7 @@
 using Content.Shared.Abilities.Psionics;
 using Content.Shared.Construction.EntitySystems;
 using Content.Shared.Damage;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Inventory;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs
index 6490067db16..e99aa0ebcc0 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs
@@ -1,9 +1,9 @@
 using Content.Server.Abilities.Psionics;
-using Content.Server.GameTicking.Components;
 using Content.Server.Psionics;
 using Content.Server.StationEvents.Components;
 using Content.Server.StationEvents.Events;
 using Content.Shared.Abilities.Psionics;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Psionics.Glimmer;
 using Content.Shared.Zombies;
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs
index 531dd9443d0..368de95f341 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs
@@ -1,10 +1,10 @@
-using Content.Server.GameTicking.Components;
 using Content.Server.Popups;
 using Content.Server.Psionics;
 using Content.Server.StationEvents.Components;
 using Content.Server.StationEvents.Events;
 using Content.Server.Stunnable;
 using Content.Shared.Abilities.Psionics;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.StatusEffect;
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/PsionicCatGotYourTongueRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/PsionicCatGotYourTongueRule.cs
index b6d62ddd5aa..fdc4b259cee 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/PsionicCatGotYourTongueRule.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/PsionicCatGotYourTongueRule.cs
@@ -1,8 +1,8 @@
-using Content.Server.GameTicking.Components;
 using Content.Server.Psionics;
 using Content.Server.StationEvents.Components;
 using Content.Server.StationEvents.Events;
 using Content.Shared.Abilities.Psionics;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.StatusEffect;
diff --git a/Content.Server/Objectives/Commands/ListObjectivesCommand.cs b/Content.Server/Objectives/Commands/ListObjectivesCommand.cs
index 97fc943269a..88dcdcedf65 100644
--- a/Content.Server/Objectives/Commands/ListObjectivesCommand.cs
+++ b/Content.Server/Objectives/Commands/ListObjectivesCommand.cs
@@ -33,7 +33,7 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
             }
 
             shell.WriteLine($"Objectives for player {player.UserId}:");
-            var objectives = mind.AllObjectives.ToList();
+            var objectives = mind.Objectives.ToList();
             if (objectives.Count == 0)
             {
                 shell.WriteLine("None.");
diff --git a/Content.Server/Objectives/Components/StealAreaComponent.cs b/Content.Server/Objectives/Components/StealAreaComponent.cs
new file mode 100644
index 00000000000..26e752f2f28
--- /dev/null
+++ b/Content.Server/Objectives/Components/StealAreaComponent.cs
@@ -0,0 +1,23 @@
+using Content.Server.Objectives.Systems;
+using Content.Server.Thief.Systems;
+
+namespace Content.Server.Objectives.Components;
+
+/// <summary>
+/// An abstract component that allows other systems to count adjacent objects as "stolen" when controlling other systems
+/// </summary>
+[RegisterComponent, Access(typeof(StealConditionSystem), typeof(ThiefBeaconSystem))]
+public sealed partial class StealAreaComponent : Component
+{
+    [DataField]
+    public bool Enabled = true;
+
+    [DataField]
+    public float Range = 1f;
+
+    /// <summary>
+    /// all the minds that will be credited with stealing from this area.
+    /// </summary>
+    [DataField]
+    public HashSet<EntityUid> Owners = new();
+}
diff --git a/Content.Server/Objectives/Components/StealConditionComponent.cs b/Content.Server/Objectives/Components/StealConditionComponent.cs
index f8d68063f87..cdade8cc8d7 100644
--- a/Content.Server/Objectives/Components/StealConditionComponent.cs
+++ b/Content.Server/Objectives/Components/StealConditionComponent.cs
@@ -22,11 +22,18 @@ public sealed partial class StealConditionComponent : Component
     [DataField]
     public bool VerifyMapExistence = true;
 
+    /// <summary>
+    /// If true, counts objects that are close to steal areas.
+    /// </summary>
+    [DataField]
+    public bool CheckStealAreas = false;
+
     /// <summary>
     /// If the target may be alive but has died, it will not be counted
     /// </summary>
     [DataField]
     public bool CheckAlive = false;
+
     /// <summary>
     /// The minimum number of items you need to steal to fulfill a objective
     /// </summary>
diff --git a/Content.Server/Objectives/ObjectivesSystem.cs b/Content.Server/Objectives/ObjectivesSystem.cs
index f8ecc22828e..382cb1ab441 100644
--- a/Content.Server/Objectives/ObjectivesSystem.cs
+++ b/Content.Server/Objectives/ObjectivesSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.GameTicking;
 using Content.Server.Shuttles.Systems;
 using Content.Shared.Cuffs.Components;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Mind;
 using Content.Shared.Objectives.Components;
 using Content.Shared.Objectives.Systems;
@@ -9,9 +10,9 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using System.Linq;
-using Content.Server.GameTicking.Components;
 using System.Text;
 using Robust.Server.Player;
+using Robust.Shared.Utility;
 
 namespace Content.Server.Objectives;
 
@@ -128,12 +129,12 @@ private void AddSummary(StringBuilder result, string agent, List<(EntityUid, str
             var agentSummary = new StringBuilder();
             agentSummary.AppendLine(Loc.GetString("objectives-with-objectives", ("custody", custody), ("title", title), ("agent", agent)));
 
-            foreach (var objectiveGroup in objectives.GroupBy(o => Comp<ObjectiveComponent>(o).Issuer))
+            foreach (var objectiveGroup in objectives.GroupBy(o => Comp<ObjectiveComponent>(o).LocIssuer))
             {
                 //TO DO:
                 //check for the right group here. Getting the target issuer is easy: objectiveGroup.Key
                 //It should be compared to the type of the group's issuer.
-                agentSummary.AppendLine(Loc.GetString($"objective-issuer-{objectiveGroup.Key}"));
+                agentSummary.AppendLine(objectiveGroup.Key);
 
                 foreach (var objective in objectiveGroup)
                 {
@@ -180,33 +181,32 @@ private void AddSummary(StringBuilder result, string agent, List<(EntityUid, str
         }
     }
 
-    public EntityUid? GetRandomObjective(EntityUid mindId, MindComponent mind, string objectiveGroupProto)
+    public EntityUid? GetRandomObjective(EntityUid mindId, MindComponent mind, ProtoId<WeightedRandomPrototype> objectiveGroupProto, float maxDifficulty)
     {
-        if (!_prototypeManager.TryIndex<WeightedRandomPrototype>(objectiveGroupProto, out var groups))
+        if (!_prototypeManager.TryIndex(objectiveGroupProto, out var groupsProto))
         {
             Log.Error($"Tried to get a random objective, but can't index WeightedRandomPrototype {objectiveGroupProto}");
             return null;
         }
 
-        // TODO replace whatever the fuck this is with a proper objective selection system
-        // yeah the old 'preventing infinite loops' thing wasn't super elegant either and it mislead people on what exactly it did
-        var tries = 0;
-        while (tries < 20)
-        {
-            var groupName = groups.Pick(_random);
+        // Make a copy of the weights so we don't trash the prototype by removing entries
+        var groups = groupsProto.Weights.ShallowClone();
 
+        while (_random.TryPickAndTake(groups, out var groupName))
+        {
             if (!_prototypeManager.TryIndex<WeightedRandomPrototype>(groupName, out var group))
             {
                 Log.Error($"Couldn't index objective group prototype {groupName}");
                 return null;
             }
 
-            var proto = group.Pick(_random);
-            var objective = TryCreateObjective(mindId, mind, proto);
-            if (objective != null)
-                return objective;
-
-            tries++;
+            var objectives = group.Weights.ShallowClone();
+            while (_random.TryPickAndTake(objectives, out var objectiveProto))
+            {
+                if (TryCreateObjective((mindId, mind), objectiveProto, out var objective)
+                    && Comp<ObjectiveComponent>(objective.Value).Difficulty <= maxDifficulty)
+                    return objective;
+            }
         }
 
         return null;
diff --git a/Content.Server/Objectives/Systems/CodeConditionSystem.cs b/Content.Server/Objectives/Systems/CodeConditionSystem.cs
index 7ba312f4bb9..fbc58dafe82 100644
--- a/Content.Server/Objectives/Systems/CodeConditionSystem.cs
+++ b/Content.Server/Objectives/Systems/CodeConditionSystem.cs
@@ -35,20 +35,6 @@ public bool IsCompleted(Entity<CodeConditionComponent?> ent)
         return ent.Comp.Completed;
     }
 
-    /// <summary>
-    /// Returns true if a mob's objective with a certain prototype is completed.
-    /// </summary>
-    public bool IsCompleted(Entity<MindContainerComponent?> mob, string prototype)
-    {
-        if (_mind.GetMind(mob, mob.Comp) is not {} mindId)
-            return false;
-
-        if (!_mind.TryFindObjective(mindId, prototype, out var obj))
-            return false;
-
-        return IsCompleted(obj.Value);
-    }
-
     /// <summary>
     /// Sets an objective's completed field.
     /// </summary>
diff --git a/Content.Server/Objectives/Systems/HelpProgressConditionSystem.cs b/Content.Server/Objectives/Systems/HelpProgressConditionSystem.cs
index e4455c03813..e0a56149b3e 100644
--- a/Content.Server/Objectives/Systems/HelpProgressConditionSystem.cs
+++ b/Content.Server/Objectives/Systems/HelpProgressConditionSystem.cs
@@ -59,7 +59,7 @@ private void OnTraitorAssigned(EntityUid uid, RandomTraitorProgressComponent com
             if (!TryComp<MindComponent>(traitor, out var mind))
                 continue;
 
-            foreach (var objective in mind.AllObjectives)
+            foreach (var objective in mind.Objectives)
             {
                 if (HasComp<HelpProgressConditionComponent>(objective))
                     removeList.Add(traitor);
@@ -88,7 +88,7 @@ private float GetProgress(EntityUid target)
 
         if (TryComp<MindComponent>(target, out var mind))
         {
-            foreach (var objective in mind.AllObjectives)
+            foreach (var objective in mind.Objectives)
             {
                 // this has the potential to loop forever, anything setting target has to check that there is no HelpProgressCondition.
                 var info = _objectives.GetInfo(objective, target, mind);
diff --git a/Content.Server/Objectives/Systems/ObjectiveBlacklistRequirementSystem.cs b/Content.Server/Objectives/Systems/ObjectiveBlacklistRequirementSystem.cs
index 8fe7e7e2031..0671c6b67e4 100644
--- a/Content.Server/Objectives/Systems/ObjectiveBlacklistRequirementSystem.cs
+++ b/Content.Server/Objectives/Systems/ObjectiveBlacklistRequirementSystem.cs
@@ -23,7 +23,7 @@ private void OnCheck(EntityUid uid, ObjectiveBlacklistRequirementComponent comp,
         if (args.Cancelled)
             return;
 
-        foreach (var objective in args.Mind.AllObjectives)
+        foreach (var objective in args.Mind.Objectives)
         {
             if (_whitelistSystem.IsBlacklistPass(comp.Blacklist, objective))
             {
diff --git a/Content.Server/Objectives/Systems/StealConditionSystem.cs b/Content.Server/Objectives/Systems/StealConditionSystem.cs
index 0fe6f0947c8..2c9244cf7d5 100644
--- a/Content.Server/Objectives/Systems/StealConditionSystem.cs
+++ b/Content.Server/Objectives/Systems/StealConditionSystem.cs
@@ -10,6 +10,7 @@
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Movement.Pulling.Components;
+using Content.Shared.Stacks;
 
 namespace Content.Server.Objectives.Systems;
 
@@ -20,16 +21,15 @@ public sealed class StealConditionSystem : EntitySystem
     [Dependency] private readonly MetaDataSystem _metaData = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
     [Dependency] private readonly SharedObjectivesSystem _objectives = default!;
+    [Dependency] private readonly EntityLookupSystem _lookup = default!;
 
     private EntityQuery<ContainerManagerComponent> _containerQuery;
-    private EntityQuery<MetaDataComponent> _metaQuery;
 
     public override void Initialize()
     {
         base.Initialize();
 
         _containerQuery = GetEntityQuery<ContainerManagerComponent>();
-        _metaQuery = GetEntityQuery<MetaDataComponent>();
 
         SubscribeLocalEvent<StealConditionComponent, ObjectiveAssignedEvent>(OnAssigned);
         SubscribeLocalEvent<StealConditionComponent, ObjectiveAfterAssignEvent>(OnAfterAssign);
@@ -95,25 +95,33 @@ private float GetProgress(MindComponent mind, StealConditionComponent condition)
         if (!_containerQuery.TryGetComponent(mind.OwnedEntity, out var currentManager))
             return 0;
 
-        var stack = new Stack<ContainerManagerComponent>();
+        var containerStack = new Stack<ContainerManagerComponent>();
         var count = 0;
 
+        //check stealAreas
+        if (condition.CheckStealAreas)
+        {
+            var areasQuery = AllEntityQuery<StealAreaComponent>();
+            while (areasQuery.MoveNext(out var uid, out var area))
+            {
+                if (!area.Owners.Contains(mind.Owner))
+                    continue;
+
+                var nearestEnt = _lookup.GetEntitiesInRange(uid, area.Range);
+                foreach (var ent in nearestEnt)
+                {
+                    CheckEntity(ent, condition, ref containerStack, ref count);
+                }
+            }
+        }
+
         //check pulling object
         if (TryComp<PullerComponent>(mind.OwnedEntity, out var pull)) //TO DO: to make the code prettier? don't like the repetition
         {
             var pulledEntity = pull.Pulling;
             if (pulledEntity != null)
             {
-                // check if this is the item
-                if (CheckStealTarget(pulledEntity.Value, condition)) count++;
-
-                //we don't check the inventories of sentient entity
-                if (!HasComp<MindContainerComponent>(pulledEntity))
-                {
-                    // if it is a container check its contents
-                    if (_containerQuery.TryGetComponent(pulledEntity, out var containerManager))
-                        stack.Push(containerManager);
-                }
+                CheckEntity(pulledEntity.Value, condition, ref containerStack, ref count);
             }
         }
 
@@ -126,28 +134,42 @@ private float GetProgress(MindComponent mind, StealConditionComponent condition)
                 foreach (var entity in container.ContainedEntities)
                 {
                     // check if this is the item
-                    if (CheckStealTarget(entity, condition)) count++; //To Do: add support for stackable items
+                    count += CheckStealTarget(entity, condition);
 
                     // if it is a container check its contents
                     if (_containerQuery.TryGetComponent(entity, out var containerManager))
-                        stack.Push(containerManager);
+                        containerStack.Push(containerManager);
                 }
             }
-        } while (stack.TryPop(out currentManager));
+        } while (containerStack.TryPop(out currentManager));
 
         var result = count / (float) condition.CollectionSize;
         result = Math.Clamp(result, 0, 1);
         return result;
     }
 
-    private bool CheckStealTarget(EntityUid entity, StealConditionComponent condition)
+    private void CheckEntity(EntityUid entity, StealConditionComponent condition, ref Stack<ContainerManagerComponent> containerStack, ref int counter)
+    {
+        // check if this is the item
+        counter += CheckStealTarget(entity, condition);
+
+        //we don't check the inventories of sentient entity
+        if (!TryComp<MindContainerComponent>(entity, out var pullMind))
+        {
+            // if it is a container check its contents
+            if (_containerQuery.TryGetComponent(entity, out var containerManager))
+                containerStack.Push(containerManager);
+        }
+    }
+
+    private int CheckStealTarget(EntityUid entity, StealConditionComponent condition)
     {
         // check if this is the target
         if (!TryComp<StealTargetComponent>(entity, out var target))
-            return false;
+            return 0;
 
         if (target.StealGroup != condition.StealGroup)
-            return false;
+            return 0;
 
         // check if needed target alive
         if (condition.CheckAlive)
@@ -155,9 +177,10 @@ private bool CheckStealTarget(EntityUid entity, StealConditionComponent conditio
             if (TryComp<MobStateComponent>(entity, out var state))
             {
                 if (!_mobState.IsAlive(entity, state))
-                    return false;
+                    return 0;
             }
         }
-        return true;
+
+        return TryComp<StackComponent>(entity, out var stack) ? stack.Count : 1;
     }
 }
diff --git a/Content.Server/PDA/PdaSystem.cs b/Content.Server/PDA/PdaSystem.cs
index 43bf571eb45..691d024ecd7 100644
--- a/Content.Server/PDA/PdaSystem.cs
+++ b/Content.Server/PDA/PdaSystem.cs
@@ -123,7 +123,7 @@ private void OnNotification(Entity<PdaComponent> ent, ref CartridgeLoaderNotific
         {
             _ringer.RingerPlayRingtone(ent.Owner);
 
-            if (!_containerSystem.TryGetContainingContainer(ent, out var container)
+            if (!_containerSystem.TryGetContainingContainer((ent, null, null), out var container)
                 || !TryComp<ActorComponent>(container.Owner, out var actor))
                 return;
 
diff --git a/Content.Server/Paper/PaperComponent.cs b/Content.Server/Paper/PaperComponent.cs
deleted file mode 100644
index 6c96b67acb4..00000000000
--- a/Content.Server/Paper/PaperComponent.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Content.Shared.Paper;
-using Robust.Shared.GameStates;
-
-namespace Content.Server.Paper;
-
-[RegisterComponent]
-public sealed partial class PaperComponent : SharedPaperComponent
-{
-    public PaperAction Mode;
-    [DataField("content")]
-    public string Content { get; set; } = "";
-
-    [DataField("contentSize")]
-    public int ContentSize { get; set; } = 6000;
-
-    [DataField("stampedBy")]
-    public List<StampDisplayInfo> StampedBy { get; set; } = new();
-
-    [DataField("canEdit")]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public bool CanEdit { get; set; } = true; // DeltaV - Used for paper slips
-
-    /// <summary>
-    ///     Stamp to be displayed on the paper, state from beauracracy.rsi
-    /// </summary>
-    [DataField("stampState")]
-    public string? StampState { get; set; }
-}
diff --git a/Content.Server/Paper/PaperRandomStorySystem.cs b/Content.Server/Paper/PaperRandomStorySystem.cs
index 156718f5450..2e43058197b 100644
--- a/Content.Server/Paper/PaperRandomStorySystem.cs
+++ b/Content.Server/Paper/PaperRandomStorySystem.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Paper;
 using Content.Shared.StoryGen;
 
 namespace Content.Server.Paper;
@@ -11,10 +12,10 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<PaperRandomStoryComponent, MapInitEvent>(OnMapinit);
+        SubscribeLocalEvent<PaperRandomStoryComponent, MapInitEvent>(OnMapInit);
     }
 
-    private void OnMapinit(Entity<PaperRandomStoryComponent> paperStory, ref MapInitEvent ev)
+    private void OnMapInit(Entity<PaperRandomStoryComponent> paperStory, ref MapInitEvent ev)
     {
         if (!TryComp<PaperComponent>(paperStory, out var paper))
             return;
@@ -22,6 +23,6 @@ private void OnMapinit(Entity<PaperRandomStoryComponent> paperStory, ref MapInit
         if (!_storyGen.TryGenerateStoryFromTemplate(paperStory.Comp.Template, out var story))
             return;
 
-        _paper.SetContent(paperStory.Owner, story, paper);
+        _paper.SetContent((paperStory.Owner, paper), story);
     }
 }
diff --git a/Content.Server/Paper/PaperSystem.cs b/Content.Server/Paper/PaperSystem.cs
deleted file mode 100644
index 61addc1b517..00000000000
--- a/Content.Server/Paper/PaperSystem.cs
+++ /dev/null
@@ -1,223 +0,0 @@
-using System.Linq;
-using Content.Server.Administration.Logs;
-using Content.Server.Popups;
-using Content.Shared.UserInterface;
-using Content.Shared.Database;
-using Content.Shared.Examine;
-using Content.Shared.Interaction;
-using Content.Shared.Paper;
-using Content.Shared.Tag;
-using Robust.Server.GameObjects;
-using Robust.Shared.Player;
-using Robust.Shared.Audio.Systems;
-using static Content.Shared.Paper.SharedPaperComponent;
-
-namespace Content.Server.Paper
-{
-    public sealed class PaperSystem : EntitySystem
-    {
-        [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-        [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-        [Dependency] private readonly SharedInteractionSystem _interaction = default!;
-        [Dependency] private readonly PopupSystem _popupSystem = default!;
-        [Dependency] private readonly TagSystem _tagSystem = default!;
-        [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
-        [Dependency] private readonly MetaDataSystem _metaSystem = default!;
-        [Dependency] private readonly SharedAudioSystem _audio = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            SubscribeLocalEvent<PaperComponent, ComponentInit>(OnInit);
-            SubscribeLocalEvent<PaperComponent, BeforeActivatableUIOpenEvent>(BeforeUIOpen);
-            SubscribeLocalEvent<PaperComponent, ExaminedEvent>(OnExamined);
-            SubscribeLocalEvent<PaperComponent, InteractUsingEvent>(OnInteractUsing);
-            SubscribeLocalEvent<PaperComponent, PaperInputTextMessage>(OnInputTextMessage);
-
-            SubscribeLocalEvent<ActivateOnPaperOpenedComponent, PaperWriteEvent>(OnPaperWrite);
-
-            SubscribeLocalEvent<PaperComponent, MapInitEvent>(OnMapInit);
-        }
-
-        private void OnMapInit(EntityUid uid, PaperComponent paperComp, MapInitEvent args)
-        {
-            if (!string.IsNullOrEmpty(paperComp.Content))
-            {
-                paperComp.Content = Loc.GetString(paperComp.Content);
-            }
-        }
-
-        private void OnInit(EntityUid uid, PaperComponent paperComp, ComponentInit args)
-        {
-            paperComp.Mode = PaperAction.Read;
-            UpdateUserInterface(uid, paperComp);
-
-            if (TryComp<AppearanceComponent>(uid, out var appearance))
-            {
-                if (paperComp.Content != "")
-                    _appearance.SetData(uid, PaperVisuals.Status, PaperStatus.Written, appearance);
-
-                if (paperComp.StampState != null)
-                    _appearance.SetData(uid, PaperVisuals.Stamp, paperComp.StampState, appearance);
-            }
-
-        }
-
-        private void BeforeUIOpen(EntityUid uid, PaperComponent paperComp, BeforeActivatableUIOpenEvent args)
-        {
-            paperComp.Mode = PaperAction.Read;
-            UpdateUserInterface(uid, paperComp);
-        }
-
-        private void OnExamined(EntityUid uid, PaperComponent paperComp, ExaminedEvent args)
-        {
-            if (!args.IsInDetailsRange)
-                return;
-
-            using (args.PushGroup(nameof(PaperComponent)))
-            {
-                if (paperComp.Content != "")
-                    args.PushMarkup(
-                        Loc.GetString(
-                            "paper-component-examine-detail-has-words", ("paper", uid)
-                        )
-                    );
-
-                if (paperComp.StampedBy.Count > 0)
-                {
-                    var commaSeparated =
-                        string.Join(", ", paperComp.StampedBy.Select(s => Loc.GetString(s.StampedName)));
-                    args.PushMarkup(
-                        Loc.GetString(
-                            "paper-component-examine-detail-stamped-by", ("paper", uid), ("stamps", commaSeparated))
-                    );
-                }
-            }
-        }
-
-        private void OnInteractUsing(EntityUid uid, PaperComponent paperComp, InteractUsingEvent args)
-        {
-            // only allow editing if there are no stamps or when using a cyberpen
-            var editable = paperComp.StampedBy.Count == 0 || _tagSystem.HasTag(args.Used, "WriteIgnoreStamps");
-            if (_tagSystem.HasTag(args.Used, "Write") && editable && paperComp.CanEdit)
-            {
-                var writeEvent = new PaperWriteEvent(uid, args.User);
-                RaiseLocalEvent(args.Used, ref writeEvent);
-
-                paperComp.Mode = PaperAction.Write;
-                _uiSystem.OpenUi(uid, PaperUiKey.Key, args.User);
-                UpdateUserInterface(uid, paperComp);
-                args.Handled = true;
-                return;
-            }
-
-            // If a stamp, attempt to stamp paper
-            if (TryComp<StampComponent>(args.Used, out var stampComp) && TryStamp(uid, GetStampInfo(stampComp), stampComp.StampState, paperComp))
-            {
-                // successfully stamped, play popup
-                var stampPaperOtherMessage = Loc.GetString("paper-component-action-stamp-paper-other",
-                        ("user", args.User), ("target", args.Target), ("stamp", args.Used));
-
-                _popupSystem.PopupEntity(stampPaperOtherMessage, args.User, Filter.PvsExcept(args.User, entityManager: EntityManager), true);
-                var stampPaperSelfMessage = Loc.GetString("paper-component-action-stamp-paper-self",
-                        ("target", args.Target), ("stamp", args.Used));
-                _popupSystem.PopupEntity(stampPaperSelfMessage, args.User, args.User);
-
-                _audio.PlayPvs(stampComp.Sound, uid);
-
-                UpdateUserInterface(uid, paperComp);
-            }
-        }
-
-        private static StampDisplayInfo GetStampInfo(StampComponent stamp)
-        {
-            return new StampDisplayInfo
-            {
-                StampedName = stamp.StampedName,
-                StampedColor = stamp.StampedColor
-            };
-        }
-
-        private void OnInputTextMessage(EntityUid uid, PaperComponent paperComp, PaperInputTextMessage args)
-        {
-            if (args.Text.Length <= paperComp.ContentSize)
-            {
-                paperComp.Content = args.Text;
-
-                if (TryComp<AppearanceComponent>(uid, out var appearance))
-                    _appearance.SetData(uid, PaperVisuals.Status, PaperStatus.Written, appearance);
-
-                if (TryComp(uid, out MetaDataComponent? meta))
-                    _metaSystem.SetEntityDescription(uid, "", meta);
-
-                _adminLogger.Add(LogType.Chat, LogImpact.Low,
-                    $"{ToPrettyString(args.Actor):player} has written on {ToPrettyString(uid):entity} the following text: {args.Text}");
-
-                _audio.PlayPvs(paperComp.Sound, uid);
-            }
-
-            paperComp.Mode = PaperAction.Read;
-            UpdateUserInterface(uid, paperComp);
-        }
-
-        private void OnPaperWrite(EntityUid uid, ActivateOnPaperOpenedComponent comp, ref PaperWriteEvent args)
-        {
-            _interaction.UseInHandInteraction(args.User, uid);
-        }
-
-        /// <summary>
-        ///     Accepts the name and state to be stamped onto the paper, returns true if successful.
-        /// </summary>
-        public bool TryStamp(EntityUid uid, StampDisplayInfo stampInfo, string spriteStampState, PaperComponent? paperComp = null)
-        {
-            if (!Resolve(uid, ref paperComp))
-                return false;
-
-            if (!paperComp.StampedBy.Contains(stampInfo))
-            {
-                paperComp.StampedBy.Add(stampInfo);
-                if (paperComp.StampState == null && TryComp<AppearanceComponent>(uid, out var appearance))
-                {
-                    paperComp.StampState = spriteStampState;
-                    // Would be nice to be able to display multiple sprites on the paper
-                    // but most of the existing images overlap
-                    _appearance.SetData(uid, PaperVisuals.Stamp, paperComp.StampState, appearance);
-                }
-            }
-            return true;
-        }
-
-        public void SetContent(EntityUid uid, string content, PaperComponent? paperComp = null)
-        {
-            if (!Resolve(uid, ref paperComp))
-                return;
-
-            paperComp.Content = content + '\n';
-            UpdateUserInterface(uid, paperComp);
-
-            if (!TryComp<AppearanceComponent>(uid, out var appearance))
-                return;
-
-            var status = string.IsNullOrWhiteSpace(content)
-                ? PaperStatus.Blank
-                : PaperStatus.Written;
-
-            _appearance.SetData(uid, PaperVisuals.Status, status, appearance);
-        }
-
-        public void UpdateUserInterface(EntityUid uid, PaperComponent? paperComp = null)
-        {
-            if (!Resolve(uid, ref paperComp))
-                return;
-
-            _uiSystem.SetUiState(uid, PaperUiKey.Key, new PaperBoundUserInterfaceState(paperComp.Content, paperComp.StampedBy, paperComp.Mode));
-        }
-    }
-
-    /// <summary>
-    /// Event fired when using a pen on paper, opening the UI.
-    /// </summary>
-    [ByRefEvent]
-    public record struct PaperWriteEvent(EntityUid User, EntityUid Paper);
-}
diff --git a/Content.Server/Parallax/BiomeSystem.cs b/Content.Server/Parallax/BiomeSystem.cs
index 7e854e8bbfb..d3919347f76 100644
--- a/Content.Server/Parallax/BiomeSystem.cs
+++ b/Content.Server/Parallax/BiomeSystem.cs
@@ -126,20 +126,18 @@ private void OnBiomeMapInit(EntityUid uid, BiomeComponent component, MapInitEven
         var xform = Transform(uid);
         var mapId = xform.MapID;
 
-        if (mapId != MapId.Nullspace && TryComp(uid, out MapGridComponent? mapGrid))
+        if (mapId != MapId.Nullspace && HasComp<MapGridComponent>(uid))
         {
             var setTiles = new List<(Vector2i Index, Tile tile)>();
 
-            foreach (var grid in _mapManager.GetAllMapGrids(mapId))
+            foreach (var grid in _mapManager.GetAllGrids(mapId))
             {
-                var gridUid = grid.Owner;
-
-                if (!_fixturesQuery.TryGetComponent(gridUid, out var fixtures))
+                if (!_fixturesQuery.TryGetComponent(grid.Owner, out var fixtures))
                     continue;
 
                 // Don't want shuttles flying around now do we.
-                _shuttles.Disable(gridUid);
-                var pTransform = _physics.GetPhysicsTransform(gridUid);
+                _shuttles.Disable(grid.Owner);
+                var pTransform = _physics.GetPhysicsTransform(grid.Owner);
 
                 foreach (var fixture in fixtures.Fixtures.Values)
                 {
diff --git a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorEmitterComponent.cs b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorEmitterComponent.cs
index 05ab81c0f59..7697644a3bc 100644
--- a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorEmitterComponent.cs
+++ b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorEmitterComponent.cs
@@ -1,13 +1,12 @@
-using Content.Shared.Singularity.Components;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.ParticleAccelerator.Components;
 
 [RegisterComponent]
 public sealed partial class ParticleAcceleratorEmitterComponent : Component
 {
-    [DataField("emittedPrototype")]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public string EmittedPrototype = "ParticlesProjectile";
+    [DataField]
+    public EntProtoId EmittedPrototype = "ParticlesProjectile";
 
     [DataField("emitterType")]
     [ViewVariables(VVAccess.ReadWrite)]
diff --git a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.ControlBox.cs b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.ControlBox.cs
index 80f398c0a79..4d39a5ce305 100644
--- a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.ControlBox.cs
+++ b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.ControlBox.cs
@@ -101,6 +101,7 @@ public void SwitchOff(EntityUid uid, EntityUid? user = null, ParticleAccelerator
             _adminLogger.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(player):player} has turned {ToPrettyString(uid)} off");
 
         comp.Enabled = false;
+        SetStrength(uid, ParticleAcceleratorPowerState.Standby, user, comp);
         UpdatePowerDraw(uid, comp);
         PowerOff(uid, comp);
         UpdateUI(uid, comp);
@@ -174,12 +175,14 @@ or ParticleAcceleratorPowerState.Level1
                 var pos = Transform(uid);
                 if (_timing.CurTime > comp.EffectCooldown)
                 {
-                    _chat.SendAdminAlert(player, Loc.GetString("particle-accelerator-admin-power-strength-warning",
+                    _chat.SendAdminAlert(player,
+                        Loc.GetString("particle-accelerator-admin-power-strength-warning",
                         ("machine", ToPrettyString(uid)),
-                        ("powerState", strength),
+                        ("powerState", GetPANumericalLevel(strength)),
                         ("coordinates", pos.Coordinates)));
                     _audio.PlayGlobal("/Audio/Misc/adminlarm.ogg",
-                        Filter.Empty().AddPlayers(_adminManager.ActiveAdmins), false,
+                        Filter.Empty().AddPlayers(_adminManager.ActiveAdmins),
+                        false,
                         AudioParams.Default.WithVolume(-8f));
                     comp.EffectCooldown = _timing.CurTime + comp.CooldownDuration;
                 }
@@ -230,7 +233,7 @@ private void UpdatePowerDraw(EntityUid uid, ParticleAcceleratorControlBoxCompone
         powerConsumer.DrawRate = powerDraw;
     }
 
-    private void UpdateUI(EntityUid uid, ParticleAcceleratorControlBoxComponent? comp = null)
+    public void UpdateUI(EntityUid uid, ParticleAcceleratorControlBoxComponent? comp = null)
     {
         if (!Resolve(uid, ref comp))
             return;
@@ -247,7 +250,9 @@ private void UpdateUI(EntityUid uid, ParticleAcceleratorControlBoxComponent? com
             receive = powerConsumer.ReceivedPower;
         }
 
-        _uiSystem.SetUiState(uid, ParticleAcceleratorControlBoxUiKey.Key, new ParticleAcceleratorUIState(
+        _uiSystem.SetUiState(uid,
+            ParticleAcceleratorControlBoxUiKey.Key,
+            new ParticleAcceleratorUIState(
             comp.Assembled,
             comp.Enabled,
             comp.SelectedStrength,
@@ -396,4 +401,16 @@ private void OnUIRescanMessage(EntityUid uid, ParticleAcceleratorControlBoxCompo
 
         UpdateUI(uid, comp);
     }
+
+    public static int GetPANumericalLevel(ParticleAcceleratorPowerState state)
+    {
+        return state switch
+        {
+            ParticleAcceleratorPowerState.Level0 => 1,
+            ParticleAcceleratorPowerState.Level1 => 2,
+            ParticleAcceleratorPowerState.Level2 => 3,
+            ParticleAcceleratorPowerState.Level3 => 4,
+            _ => 0
+        };
+    }
 }
diff --git a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.Parts.cs b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.Parts.cs
index 99bb0d5cbda..829de0af470 100644
--- a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.Parts.cs
+++ b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.Parts.cs
@@ -1,10 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
-using System.Numerics;
 using Content.Server.ParticleAccelerator.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Events;
-using Robust.Shared.Player;
 
 namespace Content.Server.ParticleAccelerator.EntitySystems;
 
@@ -26,8 +24,6 @@ public void RescanParts(EntityUid uid, EntityUid? user = null, ParticleAccelerat
         if (controller.CurrentlyRescanning)
             return;
 
-        SwitchOff(uid, user, controller);
-
         var partQuery = GetEntityQuery<ParticleAcceleratorPartComponent>();
         foreach (var part in AllParts(uid, controller))
         {
@@ -45,19 +41,25 @@ public void RescanParts(EntityUid uid, EntityUid? user = null, ParticleAccelerat
 
         var xformQuery = GetEntityQuery<TransformComponent>();
         if (!xformQuery.TryGetComponent(uid, out var xform) || !xform.Anchored)
+        {
+            SwitchOff(uid, user, controller);
             return;
+        }
 
         var gridUid = xform.GridUid;
         if (gridUid == null || gridUid != xform.ParentUid || !TryComp<MapGridComponent>(gridUid, out var grid))
+        {
+            SwitchOff(uid, user, controller);
             return;
+        }
 
         // Find fuel chamber first by scanning cardinals.
         var fuelQuery = GetEntityQuery<ParticleAcceleratorFuelChamberComponent>();
         foreach (var adjacent in _mapSystem.GetCardinalNeighborCells(gridUid.Value, grid, xform.Coordinates))
         {
             if (fuelQuery.HasComponent(adjacent)
-            && partQuery.TryGetComponent(adjacent, out var partState)
-            && partState.Master == null)
+                && partQuery.TryGetComponent(adjacent, out var partState)
+                && partState.Master == null)
             {
                 controller.FuelChamber = adjacent;
                 break;
@@ -66,7 +68,7 @@ public void RescanParts(EntityUid uid, EntityUid? user = null, ParticleAccelerat
 
         if (controller.FuelChamber == null)
         {
-            UpdateUI(uid, controller);
+            SwitchOff(uid, user, controller);
             return;
         }
 
@@ -93,19 +95,19 @@ public void RescanParts(EntityUid uid, EntityUid? user = null, ParticleAccelerat
         var positionForeEmitter = positionFuelChamber + offsetVect * 2;
         var positionStarboardEmitter = positionFuelChamber + offsetVect * 2 - orthoOffsetVect;
 
-        ScanPart<ParticleAcceleratorEndCapComponent>(gridUid!.Value, positionEndCap, rotation, out controller.EndCap, out var _, grid);
-        ScanPart<ParticleAcceleratorPowerBoxComponent>(gridUid!.Value, positionPowerBox, rotation, out controller.PowerBox, out var _, grid);
+        ScanPart<ParticleAcceleratorEndCapComponent>(gridUid.Value, positionEndCap, rotation, out controller.EndCap, out _, grid);
+        ScanPart<ParticleAcceleratorPowerBoxComponent>(gridUid.Value, positionPowerBox, rotation, out controller.PowerBox, out _, grid);
 
-        if (!ScanPart<ParticleAcceleratorEmitterComponent>(gridUid!.Value, positionPortEmitter, rotation, out controller.PortEmitter, out var portEmitter, grid)
-        || portEmitter!.Type != ParticleAcceleratorEmitterType.Port)
+        if (!ScanPart<ParticleAcceleratorEmitterComponent>(gridUid.Value, positionPortEmitter, rotation, out controller.PortEmitter, out var portEmitter, grid)
+        || portEmitter.Type != ParticleAcceleratorEmitterType.Port)
             controller.PortEmitter = null;
 
-        if (!ScanPart<ParticleAcceleratorEmitterComponent>(gridUid!.Value, positionForeEmitter, rotation, out controller.ForeEmitter, out var foreEmitter, grid)
-        || foreEmitter!.Type != ParticleAcceleratorEmitterType.Fore)
+        if (!ScanPart<ParticleAcceleratorEmitterComponent>(gridUid.Value, positionForeEmitter, rotation, out controller.ForeEmitter, out var foreEmitter, grid)
+        || foreEmitter.Type != ParticleAcceleratorEmitterType.Fore)
             controller.ForeEmitter = null;
 
-        if (!ScanPart<ParticleAcceleratorEmitterComponent>(gridUid!.Value, positionStarboardEmitter, rotation, out controller.StarboardEmitter, out var starboardEmitter, grid)
-        || starboardEmitter!.Type != ParticleAcceleratorEmitterType.Starboard)
+        if (!ScanPart<ParticleAcceleratorEmitterComponent>(gridUid.Value, positionStarboardEmitter, rotation, out controller.StarboardEmitter, out var starboardEmitter, grid)
+        || starboardEmitter.Type != ParticleAcceleratorEmitterType.Starboard)
             controller.StarboardEmitter = null;
 
         controller.Assembled =
@@ -157,19 +159,19 @@ private bool ScanPart<T>(EntityUid uid, Vector2i coordinates, Angle? rotation, [
 
     private void OnComponentShutdown(EntityUid uid, ParticleAcceleratorPartComponent comp, ComponentShutdown args)
     {
-        if (EntityManager.EntityExists(comp.Master))
+        if (Exists(comp.Master))
             RescanParts(comp.Master!.Value);
     }
 
     private void BodyTypeChanged(EntityUid uid, ParticleAcceleratorPartComponent comp, ref PhysicsBodyTypeChangedEvent args)
     {
-        if (EntityManager.EntityExists(comp.Master))
+        if (Exists(comp.Master))
             RescanParts(comp.Master!.Value);
     }
 
     private void OnMoveEvent(EntityUid uid, ParticleAcceleratorPartComponent comp, ref MoveEvent args)
     {
-        if (EntityManager.EntityExists(comp.Master))
+        if (Exists(comp.Master))
             RescanParts(comp.Master!.Value);
     }
 }
diff --git a/Content.Server/ParticleAccelerator/Wires/ParticleAcceleratorInterfaceWireAction.cs b/Content.Server/ParticleAccelerator/Wires/ParticleAcceleratorInterfaceWireAction.cs
index 4e70854d6b4..688571d9f5a 100644
--- a/Content.Server/ParticleAccelerator/Wires/ParticleAcceleratorInterfaceWireAction.cs
+++ b/Content.Server/ParticleAccelerator/Wires/ParticleAcceleratorInterfaceWireAction.cs
@@ -1,4 +1,5 @@
 using Content.Server.ParticleAccelerator.Components;
+using Content.Server.ParticleAccelerator.EntitySystems;
 using Content.Server.Wires;
 using Content.Shared.Singularity.Components;
 using Content.Shared.Wires;
@@ -19,12 +20,16 @@ public sealed partial class ParticleAcceleratorKeyboardWireAction : ComponentWir
     public override bool Cut(EntityUid user, Wire wire, ParticleAcceleratorControlBoxComponent controller)
     {
         controller.InterfaceDisabled = true;
+        var paSystem = EntityManager.System<ParticleAcceleratorSystem>();
+        paSystem.UpdateUI(wire.Owner, controller);
         return true;
     }
 
     public override bool Mend(EntityUid user, Wire wire, ParticleAcceleratorControlBoxComponent controller)
     {
         controller.InterfaceDisabled = false;
+        var paSystem = EntityManager.System<ParticleAcceleratorSystem>();
+        paSystem.UpdateUI(wire.Owner, controller);
         return true;
     }
 
diff --git a/Content.Server/ParticleAccelerator/Wires/ParticleAcceleratorLimiterWireAction.cs b/Content.Server/ParticleAccelerator/Wires/ParticleAcceleratorLimiterWireAction.cs
index 0645944a2ac..33c8761a832 100644
--- a/Content.Server/ParticleAccelerator/Wires/ParticleAcceleratorLimiterWireAction.cs
+++ b/Content.Server/ParticleAccelerator/Wires/ParticleAcceleratorLimiterWireAction.cs
@@ -5,7 +5,6 @@
 using Content.Shared.Popups;
 using Content.Shared.Singularity.Components;
 using Content.Shared.Wires;
-using Robust.Shared.Player;
 
 namespace Content.Server.ParticleAccelerator.Wires;
 
@@ -35,6 +34,8 @@ public sealed partial class ParticleAcceleratorLimiterWireAction : ComponentWire
     public override bool Cut(EntityUid user, Wire wire, ParticleAcceleratorControlBoxComponent controller)
     {
         controller.MaxStrength = ParticleAcceleratorPowerState.Level3;
+        var paSystem = EntityManager.System<ParticleAcceleratorSystem>();
+        paSystem.UpdateUI(wire.Owner, controller);
         return true;
     }
 
@@ -49,12 +50,14 @@ public override bool Mend(EntityUid user, Wire wire, ParticleAcceleratorControlB
         // Since that blocks SetStrength().
         var paSystem = EntityManager.System<ParticleAcceleratorSystem>();
         paSystem.SetStrength(wire.Owner, controller.MaxStrength, user, controller);
+        paSystem.UpdateUI(wire.Owner, controller);
         return true;
     }
 
     public override void Pulse(EntityUid user, Wire wire, ParticleAcceleratorControlBoxComponent controller)
     {
-        EntityManager.System<PopupSystem>().PopupEntity(
+        EntityManager.System<PopupSystem>()
+            .PopupEntity(
             Loc.GetString("particle-accelerator-control-box-component-wires-update-limiter-on-pulse"),
             user,
             PopupType.SmallCaution
diff --git a/Content.Server/ParticleAccelerator/Wires/ParticleAcceleratorStrengthWireAction.cs b/Content.Server/ParticleAccelerator/Wires/ParticleAcceleratorStrengthWireAction.cs
index 1650960bd31..15a425f4c26 100644
--- a/Content.Server/ParticleAccelerator/Wires/ParticleAcceleratorStrengthWireAction.cs
+++ b/Content.Server/ParticleAccelerator/Wires/ParticleAcceleratorStrengthWireAction.cs
@@ -21,12 +21,16 @@ public sealed partial class ParticleAcceleratorStrengthWireAction : ComponentWir
     public override bool Cut(EntityUid user, Wire wire, ParticleAcceleratorControlBoxComponent controller)
     {
         controller.StrengthLocked = true;
+        var paSystem = EntityManager.System<ParticleAcceleratorSystem>();
+        paSystem.UpdateUI(wire.Owner, controller);
         return true;
     }
 
     public override bool Mend(EntityUid user, Wire wire, ParticleAcceleratorControlBoxComponent controller)
     {
         controller.StrengthLocked = false;
+        var paSystem = EntityManager.System<ParticleAcceleratorSystem>();
+        paSystem.UpdateUI(wire.Owner, controller);
         return true;
     }
 
diff --git a/Content.Server/Physics/Components/ChasingWalkComponent.cs b/Content.Server/Physics/Components/ChasingWalkComponent.cs
index 222c9d64db8..819fd809399 100644
--- a/Content.Server/Physics/Components/ChasingWalkComponent.cs
+++ b/Content.Server/Physics/Components/ChasingWalkComponent.cs
@@ -65,7 +65,7 @@ public sealed partial class ChasingWalkComponent : Component
     /// The component that the entity is chasing
     /// </summary>
     [DataField(required: true)]
-    public ComponentRegistry ChasingComponent = default!;
+    public ComponentRegistry ChasingComponent = [];
 
     /// <summary>
     /// The maximum radius in which the entity chooses the target component to follow
diff --git a/Content.Server/Physics/Controllers/ChasingWalkSystem.cs b/Content.Server/Physics/Controllers/ChasingWalkSystem.cs
index 618dd4156fc..fa55ce024e4 100644
--- a/Content.Server/Physics/Controllers/ChasingWalkSystem.cs
+++ b/Content.Server/Physics/Controllers/ChasingWalkSystem.cs
@@ -61,6 +61,9 @@ public override void UpdateBeforeSolve(bool prediction, float frameTime)
 
     private void ChangeTarget(EntityUid uid, ChasingWalkComponent component)
     {
+        if (component.ChasingComponent.Count <= 0)
+            return;
+
         //We find our coordinates and calculate the radius of the target search.
         var xform = Transform(uid);
         var range = component.MaxChaseRadius;
diff --git a/Content.Server/Physics/Controllers/MoverController.cs b/Content.Server/Physics/Controllers/MoverController.cs
index 6edc202d153..8b6839ddd0e 100644
--- a/Content.Server/Physics/Controllers/MoverController.cs
+++ b/Content.Server/Physics/Controllers/MoverController.cs
@@ -30,26 +30,26 @@ public override void Initialize()
             SubscribeLocalEvent<InputMoverComponent, PlayerDetachedEvent>(OnPlayerDetached);
         }
 
-        private void OnRelayPlayerAttached(EntityUid uid, RelayInputMoverComponent component, PlayerAttachedEvent args)
+        private void OnRelayPlayerAttached(Entity<RelayInputMoverComponent> entity, ref PlayerAttachedEvent args)
         {
-            if (MoverQuery.TryGetComponent(component.RelayEntity, out var inputMover))
-                SetMoveInput(inputMover, MoveButtons.None);
+            if (MoverQuery.TryGetComponent(entity.Comp.RelayEntity, out var inputMover))
+                SetMoveInput((entity.Owner, inputMover), MoveButtons.None);
         }
 
-        private void OnRelayPlayerDetached(EntityUid uid, RelayInputMoverComponent component, PlayerDetachedEvent args)
+        private void OnRelayPlayerDetached(Entity<RelayInputMoverComponent> entity, ref PlayerDetachedEvent args)
         {
-            if (MoverQuery.TryGetComponent(component.RelayEntity, out var inputMover))
-                SetMoveInput(inputMover, MoveButtons.None);
+            if (MoverQuery.TryGetComponent(entity.Comp.RelayEntity, out var inputMover))
+                SetMoveInput((entity.Owner, inputMover), MoveButtons.None);
         }
 
-        private void OnPlayerAttached(EntityUid uid, InputMoverComponent component, PlayerAttachedEvent args)
+        private void OnPlayerAttached(Entity<InputMoverComponent> entity, ref PlayerAttachedEvent args)
         {
-            SetMoveInput(component, MoveButtons.None);
+            SetMoveInput(entity, MoveButtons.None);
         }
 
-        private void OnPlayerDetached(EntityUid uid, InputMoverComponent component, PlayerDetachedEvent args)
+        private void OnPlayerDetached(Entity<InputMoverComponent> entity, ref PlayerDetachedEvent args)
         {
-            SetMoveInput(component, MoveButtons.None);
+            SetMoveInput(entity, MoveButtons.None);
         }
 
         protected override bool CanSound()
diff --git a/Content.Server/Pinpointer/StationMapComponent.cs b/Content.Server/Pinpointer/StationMapUserComponent.cs
similarity index 77%
rename from Content.Server/Pinpointer/StationMapComponent.cs
rename to Content.Server/Pinpointer/StationMapUserComponent.cs
index 942ea1aba8e..358e26d82e8 100644
--- a/Content.Server/Pinpointer/StationMapComponent.cs
+++ b/Content.Server/Pinpointer/StationMapUserComponent.cs
@@ -1,11 +1,5 @@
 namespace Content.Server.Pinpointer;
 
-[RegisterComponent]
-public sealed partial class StationMapComponent : Component
-{
-
-}
-
 /// <summary>
 /// Added to an entity using station map so when its parent changes we reset it.
 /// </summary>
diff --git a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
index 88b46cd922f..e9bd5140ae1 100644
--- a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
+++ b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
@@ -6,6 +6,7 @@
 using Content.Server.GameTicking;
 using Content.Server.GameTicking.Events;
 using Content.Server.Mind;
+using Content.Server.Preferences.Managers;
 using Content.Server.Station.Events;
 using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
@@ -13,6 +14,7 @@
 using Content.Shared.Mobs.Components;
 using Content.Shared.Players;
 using Content.Shared.Players.PlayTimeTracking;
+using Content.Shared.Preferences;
 using Content.Shared.Roles;
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
@@ -35,7 +37,7 @@ public sealed class PlayTimeTrackingSystem : EntitySystem
     [Dependency] private readonly MindSystem _minds = default!;
     [Dependency] private readonly PlayTimeTrackingManager _tracking = default!;
     [Dependency] private readonly IAdminManager _adminManager = default!;
-    [Dependency] private readonly SharedRoleSystem _role = default!;
+    [Dependency] private readonly IServerPreferencesManager _preferencesManager = default!;
 
     public override void Initialize()
     {
@@ -210,7 +212,7 @@ public bool IsAllowed(ICommonSession player, string role)
 
         var isWhitelisted = player.ContentData()?.Whitelisted ?? false; // DeltaV - Whitelist requirement
 
-        return JobRequirements.TryRequirementsMet(job, playTimes, out _, EntityManager, _prototypes, isWhitelisted);
+        return JobRequirements.TryRequirementsMet(job, playTimes, out _, EntityManager, _prototypes, (HumanoidCharacterProfile?) _preferencesManager.GetPreferences(player.UserId).SelectedCharacter, isWhitelisted);
     }
 
     public HashSet<ProtoId<JobPrototype>> GetDisallowedJobs(ICommonSession player)
@@ -229,7 +231,7 @@ public HashSet<ProtoId<JobPrototype>> GetDisallowedJobs(ICommonSession player)
 
         foreach (var job in _prototypes.EnumeratePrototypes<JobPrototype>())
         {
-            if (JobRequirements.TryRequirementsMet(job, playTimes, out _, EntityManager, _prototypes, isWhitelisted))
+            if (JobRequirements.TryRequirementsMet(job, playTimes, out _, EntityManager, _prototypes, (HumanoidCharacterProfile?) _preferencesManager.GetPreferences(player.UserId).SelectedCharacter, isWhitelisted))
                 roles.Add(job.ID);
         }
 
@@ -254,7 +256,7 @@ public void RemoveDisallowedJobs(NetUserId userId, List<ProtoId<JobPrototype>> j
         for (var i = 0; i < jobs.Count; i++)
         {
             if (_prototypes.TryIndex(jobs[i], out var job)
-                && JobRequirements.TryRequirementsMet(job, playTimes, out _, EntityManager, _prototypes, isWhitelisted))
+                && JobRequirements.TryRequirementsMet(job, playTimes, out _, EntityManager, _prototypes, (HumanoidCharacterProfile?) _preferencesManager.GetPreferences(userId).SelectedCharacter, isWhitelisted))
             {
                 continue;
             }
diff --git a/Content.Server/Pointing/EntitySystems/PointingSystem.cs b/Content.Server/Pointing/EntitySystems/PointingSystem.cs
index 9dc3b5e1e67..d5ad1fb123e 100644
--- a/Content.Server/Pointing/EntitySystems/PointingSystem.cs
+++ b/Content.Server/Pointing/EntitySystems/PointingSystem.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using Content.Server.Administration.Logs;
 using Content.Server.Pointing.Components;
+using Content.Shared.CCVar;
 using Content.Shared.Database;
 using Content.Shared.Examine;
 using Content.Shared.Eye;
@@ -14,6 +15,7 @@
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
+using Robust.Shared.Configuration;
 using Robust.Shared.Enums;
 using Robust.Shared.GameStates;
 using Robust.Shared.Input.Binding;
@@ -27,6 +29,7 @@ namespace Content.Server.Pointing.EntitySystems
     [UsedImplicitly]
     internal sealed class PointingSystem : SharedPointingSystem
     {
+        [Dependency] private readonly IConfigurationManager _config = default!;
         [Dependency] private readonly IReplayRecordingManager _replay = default!;
         [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
@@ -40,7 +43,7 @@ internal sealed class PointingSystem : SharedPointingSystem
         [Dependency] private readonly IAdminLogManager _adminLogger = default!;
         [Dependency] private readonly ExamineSystemShared _examine = default!;
 
-        private static readonly TimeSpan PointDelay = TimeSpan.FromSeconds(0.5f);
+        private TimeSpan _pointDelay = TimeSpan.FromSeconds(0.5f);
 
         /// <summary>
         ///     A dictionary of players to the last time that they
@@ -101,7 +104,7 @@ public bool InRange(EntityUid pointer, EntityCoordinates coordinates)
         {
             if (HasComp<GhostComponent>(pointer))
             {
-                return Transform(pointer).Coordinates.InRange(EntityManager, _transform, coordinates, 15);
+                return _transform.InRange(Transform(pointer).Coordinates, coordinates, 15);
             }
             else
             {
@@ -124,7 +127,7 @@ public bool TryPoint(ICommonSession? session, EntityCoordinates coordsPointed, E
             }
 
             if (_pointers.TryGetValue(session, out var lastTime) &&
-                _gameTiming.CurTime < lastTime + PointDelay)
+                _gameTiming.CurTime < lastTime + _pointDelay)
             {
                 return false;
             }
@@ -145,17 +148,14 @@ public bool TryPoint(ICommonSession? session, EntityCoordinates coordsPointed, E
                 _popup.PopupEntity(Loc.GetString("pointing-system-try-point-cannot-reach"), player, player);
                 return false;
             }
-
-            var mapCoordsPointed = coordsPointed.ToMap(EntityManager, _transform);
+            var mapCoordsPointed = _transform.ToMapCoordinates(coordsPointed);
             _rotateToFaceSystem.TryFaceCoordinates(player, mapCoordsPointed.Position);
 
             var arrow = EntityManager.SpawnEntity("PointingArrow", coordsPointed);
 
             if (TryComp<PointingArrowComponent>(arrow, out var pointing))
             {
-                if (TryComp(player, out TransformComponent? xformPlayer))
-                    pointing.StartPosition = EntityCoordinates.FromMap(arrow, xformPlayer.Coordinates.ToMap(EntityManager, _transform), _transform).Position;
-
+                pointing.StartPosition = _transform.ToCoordinates((arrow, Transform(arrow)), _transform.ToMapCoordinates(Transform(player).Coordinates)).Position;
                 pointing.EndTime = _gameTiming.CurTime + PointDuration;
 
                 Dirty(arrow, pointing);
@@ -260,6 +260,8 @@ public override void Initialize()
             CommandBinds.Builder
                 .Bind(ContentKeyFunctions.Point, new PointerInputCmdHandler(TryPoint))
                 .Register<PointingSystem>();
+
+            Subs.CVar(_config, CCVars.PointingCooldownSeconds, v => _pointDelay = TimeSpan.FromSeconds(v), true);
         }
 
         private void OnPointAttempt(PointingAttemptEvent ev, EntitySessionEventArgs args)
diff --git a/Content.Server/Pointing/EntitySystems/RoguePointingSystem.cs b/Content.Server/Pointing/EntitySystems/RoguePointingSystem.cs
index be3ceb3b086..bdd652f38f1 100644
--- a/Content.Server/Pointing/EntitySystems/RoguePointingSystem.cs
+++ b/Content.Server/Pointing/EntitySystems/RoguePointingSystem.cs
@@ -12,6 +12,7 @@ internal sealed class RoguePointingSystem : EntitySystem
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly ExplosionSystem _explosion = default!;
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+        [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
 
         private EntityUid? RandomNearbyPlayer(EntityUid uid, RoguePointingArrowComponent? component = null, TransformComponent? transform = null)
         {
@@ -66,27 +67,28 @@ public override void Update(float frameTime)
                 }
 
                 component.TurningDelay -= frameTime;
+                var (transformPos, transformRot) = _transformSystem.GetWorldPositionRotation(transform);
 
                 if (component.TurningDelay > 0)
                 {
-                    var difference = Comp<TransformComponent>(chasing).WorldPosition - transform.WorldPosition;
+                    var difference = _transformSystem.GetWorldPosition(chasing) - transformPos;
                     var angle = difference.ToAngle();
                     var adjusted = angle.Degrees + 90;
                     var newAngle = Angle.FromDegrees(adjusted);
 
-                    transform.WorldRotation = newAngle;
+                    _transformSystem.SetWorldRotation(transform, newAngle);
 
                     UpdateAppearance(uid, component, transform);
                     continue;
                 }
 
-                transform.WorldRotation += Angle.FromDegrees(20);
+                _transformSystem.SetWorldRotation(transform, transformRot + Angle.FromDegrees(20));
 
                 UpdateAppearance(uid, component, transform);
 
-                var toChased = Comp<TransformComponent>(chasing).WorldPosition - transform.WorldPosition;
+                var toChased = _transformSystem.GetWorldPosition(chasing) - transformPos;
 
-                transform.WorldPosition += toChased * frameTime * component.ChasingSpeed;
+                _transformSystem.SetWorldPosition((uid, transform), transformPos + (toChased * frameTime * component.ChasingSpeed));
 
                 component.ChasingTime -= frameTime;
 
diff --git a/Content.Server/Polymorph/Systems/PolymorphSystem.cs b/Content.Server/Polymorph/Systems/PolymorphSystem.cs
index d4a9159d44f..daff200982d 100644
--- a/Content.Server/Polymorph/Systems/PolymorphSystem.cs
+++ b/Content.Server/Polymorph/Systems/PolymorphSystem.cs
@@ -211,7 +211,7 @@ private void OnDestruction(Entity<PolymorphedEntityComponent> ent, ref Destructi
         var childXform = Transform(child);
         _transform.SetLocalRotation(child, targetTransformComp.LocalRotation, childXform);
 
-        if (_container.TryGetContainingContainer(uid, out var cont))
+        if (_container.TryGetContainingContainer((uid, targetTransformComp, null), out var cont))
             _container.Insert(child, cont);
 
         //Transfers all damage from the original to the new one
diff --git a/Content.Server/Power/EntitySystems/ChargerSystem.cs b/Content.Server/Power/EntitySystems/ChargerSystem.cs
index 67b9db5e6b2..826c489606f 100644
--- a/Content.Server/Power/EntitySystems/ChargerSystem.cs
+++ b/Content.Server/Power/EntitySystems/ChargerSystem.cs
@@ -39,7 +39,37 @@ private void OnStartup(EntityUid uid, ChargerComponent component, ComponentStart
 
     private void OnChargerExamine(EntityUid uid, ChargerComponent component, ExaminedEvent args)
     {
-        args.PushMarkup(Loc.GetString("charger-examine", ("color", "yellow"), ("chargeRate", (int) component.ChargeRate)));
+        using (args.PushGroup(nameof(ChargerComponent)))
+        {
+            // rate at which the charger charges
+            args.PushMarkup(Loc.GetString("charger-examine", ("color", "yellow"), ("chargeRate", (int) component.ChargeRate)));
+
+            // try to get contents of the charger
+            if (!_container.TryGetContainer(uid, component.SlotId, out var container))
+                return;
+
+            if (HasComp<PowerCellSlotComponent>(uid))
+                return;
+
+            // if charger is empty and not a power cell type charger, add empty message
+            // power cells have their own empty message by default, for things like flash lights
+            if (container.ContainedEntities.Count == 0)
+            {
+                args.PushMarkup(Loc.GetString("charger-empty"));
+            }
+            else
+            {
+                // add how much each item is charged it 
+                foreach (var contained in container.ContainedEntities)
+                {
+                    if (!TryComp<BatteryComponent>(contained, out var battery))
+                        continue;
+
+                    var chargePercentage = (battery.CurrentCharge / battery.MaxCharge) * 100;
+                    args.PushMarkup(Loc.GetString("charger-content", ("chargePercentage", (int) chargePercentage)));
+                }
+            }
+        }
     }
 
     public override void Update(float frameTime)
diff --git a/Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs b/Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs
index 13e27559835..a07d590461e 100644
--- a/Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs
@@ -4,17 +4,16 @@
 using Content.Server.Power.Components;
 using Content.Server.Power.Nodes;
 using Content.Server.Power.NodeGroups;
-using Content.Server.Station.Components;
 using Content.Server.StationEvents.Components;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Pinpointer;
+using Content.Shared.Station.Components;
 using Content.Shared.Power;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Utility;
 using System.Linq;
-using System.Diagnostics.CodeAnalysis;
-using Content.Server.GameTicking.Components;
 
 namespace Content.Server.Power.EntitySystems;
 
diff --git a/Content.Server/Power/EntitySystems/PowerNetSystem.cs b/Content.Server/Power/EntitySystems/PowerNetSystem.cs
index 6c35ba20083..a7098649cef 100644
--- a/Content.Server/Power/EntitySystems/PowerNetSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerNetSystem.cs
@@ -22,7 +22,6 @@ public sealed class PowerNetSystem : EntitySystem
         [Dependency] private readonly PowerNetConnectorSystem _powerNetConnector = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
         [Dependency] private readonly IParallelManager _parMan = default!;
-        [Dependency] private readonly PowerReceiverSystem _powerReceiver = default!;
 
         private readonly PowerState _powerState = new();
         private readonly HashSet<PowerNet> _powerNetReconnectQueue = new();
diff --git a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
index 51520f04644..9b15bdfd287 100644
--- a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
@@ -21,7 +21,6 @@ public sealed class PowerReceiverSystem : SharedPowerReceiverSystem
     {
         [Dependency] private readonly IAdminLogManager _adminLogger = default!;
         [Dependency] private readonly IAdminManager _adminManager = default!;
-        [Dependency] private readonly AppearanceSystem _appearance = default!;
         [Dependency] private readonly AudioSystem _audio = default!;
         private EntityQuery<ApcPowerReceiverComponent> _recQuery;
         private EntityQuery<ApcPowerProviderComponent> _provQuery;
@@ -47,6 +46,11 @@ public override void Initialize()
             _provQuery = GetEntityQuery<ApcPowerProviderComponent>();
         }
 
+        private void OnExamined(Entity<ApcPowerReceiverComponent> ent, ref ExaminedEvent args)
+        {
+            args.PushMarkup(GetExamineText(ent.Comp.Powered));
+        }
+
         private void OnGetVerbs(EntityUid uid, ApcPowerReceiverComponent component, GetVerbsEvent<Verb> args)
         {
             if (!_adminManager.HasAdminFlag(args.User, AdminFlags.Admin))
@@ -62,17 +66,6 @@ private void OnGetVerbs(EntityUid uid, ApcPowerReceiverComponent component, GetV
             });
         }
 
-        ///<summary>
-        ///Adds some markup to the examine text of whatever object is using this component to tell you if it's powered or not, even if it doesn't have an icon state to do this for you.
-        ///</summary>
-        private void OnExamined(EntityUid uid, ApcPowerReceiverComponent component, ExaminedEvent args)
-        {
-            args.PushMarkup(Loc.GetString("power-receiver-component-on-examine-main",
-                                            ("stateText", Loc.GetString( component.Powered
-                                                ? "power-receiver-component-on-examine-powered"
-                                                : "power-receiver-component-on-examine-unpowered"))));
-        }
-
         private void OnProviderShutdown(EntityUid uid, ApcPowerProviderComponent component, ComponentShutdown args)
         {
             foreach (var receiver in component.LinkedReceivers)
diff --git a/Content.Server/Power/EntitySystems/StaticPowerSystem.cs b/Content.Server/Power/EntitySystems/StaticPowerSystem.cs
index 9e11d9311af..61a23e501df 100644
--- a/Content.Server/Power/EntitySystems/StaticPowerSystem.cs
+++ b/Content.Server/Power/EntitySystems/StaticPowerSystem.cs
@@ -9,7 +9,7 @@ public static class StaticPowerSystem
     public static bool IsPowered(this EntitySystem system, EntityUid uid, IEntityManager entManager, ApcPowerReceiverComponent? receiver = null)
     {
         if (receiver == null && !entManager.TryGetComponent(uid, out receiver))
-            return false;
+            return true;
 
         return receiver.Powered;
     }
diff --git a/Content.Server/Power/Generator/PortableGeneratorSystem.cs b/Content.Server/Power/Generator/PortableGeneratorSystem.cs
index f7d259b122a..0ee228680eb 100644
--- a/Content.Server/Power/Generator/PortableGeneratorSystem.cs
+++ b/Content.Server/Power/Generator/PortableGeneratorSystem.cs
@@ -73,8 +73,10 @@ private void StartGenerator(EntityUid uid, PortableGeneratorComponent component,
 
         _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, component.StartTime, new GeneratorStartedEvent(), uid, uid)
         {
-            BreakOnDamage = true, BreakOnMove = true, RequireCanInteract = true,
-            NeedHand = true
+            BreakOnDamage = true,
+            BreakOnMove = true,
+            NeedHand = true,
+            BreakOnDropItem = false,
         });
     }
 
diff --git a/Content.Server/PowerCell/PowerCellSystem.Draw.cs b/Content.Server/PowerCell/PowerCellSystem.Draw.cs
index 4155a4f6bec..9ebd677f473 100644
--- a/Content.Server/PowerCell/PowerCellSystem.Draw.cs
+++ b/Content.Server/PowerCell/PowerCellSystem.Draw.cs
@@ -1,4 +1,5 @@
 using Content.Server.Power.Components;
+using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.PowerCell;
 using Content.Shared.PowerCell.Components;
 
@@ -10,22 +11,20 @@ public sealed partial class PowerCellSystem
      * Handles PowerCellDraw
      */
 
-    private static readonly TimeSpan Delay = TimeSpan.FromSeconds(1);
-
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
-        var query = EntityQueryEnumerator<PowerCellDrawComponent, PowerCellSlotComponent>();
+        var query = EntityQueryEnumerator<PowerCellDrawComponent, PowerCellSlotComponent, ItemToggleComponent>();
 
-        while (query.MoveNext(out var uid, out var comp, out var slot))
+        while (query.MoveNext(out var uid, out var comp, out var slot, out var toggle))
         {
-            if (!comp.Drawing)
+            if (!comp.Enabled || !toggle.Activated)
                 continue;
 
             if (Timing.CurTime < comp.NextUpdateTime)
                 continue;
 
-            comp.NextUpdateTime += Delay;
+            comp.NextUpdateTime += comp.Delay;
 
             if (!TryGetBatteryFromSlot(uid, out var batteryEnt, out var battery, slot))
                 continue;
@@ -33,7 +32,8 @@ public override void Update(float frameTime)
             if (_battery.TryUseCharge(batteryEnt.Value, comp.DrawRate, battery))
                 continue;
 
-            comp.Drawing = false;
+            Toggle.TryDeactivate((uid, toggle));
+
             var ev = new PowerCellSlotEmptyEvent();
             RaiseLocalEvent(uid, ref ev);
         }
@@ -42,26 +42,9 @@ public override void Update(float frameTime)
     private void OnDrawChargeChanged(EntityUid uid, PowerCellDrawComponent component, ref ChargeChangedEvent args)
     {
         // Update the bools for client prediction.
-        bool canDraw;
-        bool canUse;
-
-        if (component.UseRate > 0f)
-        {
-            canUse = args.Charge > component.UseRate;
-        }
-        else
-        {
-            canUse = true;
-        }
+        var canUse = component.UseRate <= 0f || args.Charge > component.UseRate;
 
-        if (component.DrawRate > 0f)
-        {
-            canDraw = args.Charge > 0f;
-        }
-        else
-        {
-            canDraw = true;
-        }
+        var canDraw = component.DrawRate <= 0f || args.Charge > 0f;
 
         if (canUse != component.CanUse || canDraw != component.CanDraw)
         {
@@ -76,6 +59,9 @@ private void OnDrawCellChanged(EntityUid uid, PowerCellDrawComponent component,
         var canDraw = !args.Ejected && HasCharge(uid, float.MinValue);
         var canUse = !args.Ejected && HasActivatableCharge(uid, component);
 
+        if (!canDraw)
+            Toggle.TryDeactivate(uid);
+
         if (canUse != component.CanUse || canDraw != component.CanDraw)
         {
             component.CanDraw = canDraw;
diff --git a/Content.Server/PowerCell/PowerCellSystem.cs b/Content.Server/PowerCell/PowerCellSystem.cs
index f45a01b2e1b..f7b4cf02491 100644
--- a/Content.Server/PowerCell/PowerCellSystem.cs
+++ b/Content.Server/PowerCell/PowerCellSystem.cs
@@ -39,8 +39,8 @@ public override void Initialize()
         SubscribeLocalEvent<PowerCellDrawComponent, ChargeChangedEvent>(OnDrawChargeChanged);
         SubscribeLocalEvent<PowerCellDrawComponent, PowerCellChangedEvent>(OnDrawCellChanged);
 
-        // funny
         SubscribeLocalEvent<PowerCellSlotComponent, ExaminedEvent>(OnCellSlotExamined);
+        // funny
         SubscribeLocalEvent<PowerCellSlotComponent, BeingMicrowavedEvent>(OnSlotMicrowaved);
     }
 
@@ -64,11 +64,11 @@ private void OnChargeChanged(EntityUid uid, PowerCellComponent component, ref Ch
         }
 
         var frac = args.Charge / args.MaxCharge;
-        var level = (byte) ContentHelpers.RoundToNearestLevels(frac, 1, PowerCellComponent.PowerCellVisualsLevels);
+        var level = (byte)ContentHelpers.RoundToNearestLevels(frac, 1, PowerCellComponent.PowerCellVisualsLevels);
         _sharedAppearanceSystem.SetData(uid, PowerCellVisuals.ChargeLevel, level);
 
         // If this power cell is inside a cell-slot, inform that entity that the power has changed (for updating visuals n such).
-        if (_containerSystem.TryGetContainingContainer(uid, out var container)
+        if (_containerSystem.TryGetContainingContainer((uid, null, null), out var container)
             && TryComp(container.Owner, out PowerCellSlotComponent? slot)
             && _itemSlotsSystem.TryGetSlot(container.Owner, slot.CellSlotId, out var itemSlot))
         {
diff --git a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
index 8de458b6ee6..2583ed02217 100644
--- a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
+++ b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
@@ -250,7 +250,6 @@ public bool TryGetCachedPreferences(NetUserId userId,
 
         /// <summary>
         /// Retrieves preferences for the given username from storage.
-        /// Creates and saves default preferences if they are not found, then returns them.
         /// </summary>
         public PlayerPreferences GetPreferences(NetUserId userId)
         {
@@ -265,7 +264,6 @@ public PlayerPreferences GetPreferences(NetUserId userId)
 
         /// <summary>
         /// Retrieves preferences for the given username from storage or returns null.
-        /// Creates and saves default preferences if they are not found, then returns them.
         /// </summary>
         public PlayerPreferences? GetPreferencesOrNull(NetUserId? userId)
         {
diff --git a/Content.Server/Procedural/DungeonJob.PostGen.cs b/Content.Server/Procedural/DungeonJob.PostGen.cs
deleted file mode 100644
index cb9e64f04e2..00000000000
--- a/Content.Server/Procedural/DungeonJob.PostGen.cs
+++ /dev/null
@@ -1,1258 +0,0 @@
-using System.Linq;
-using System.Numerics;
-using System.Threading.Tasks;
-using Content.Server.NodeContainer;
-using Content.Shared.Doors.Components;
-using Content.Shared.Maps;
-using Content.Shared.Physics;
-using Content.Shared.Procedural;
-using Content.Shared.Procedural.PostGeneration;
-using Content.Shared.Storage;
-using Content.Shared.Tag;
-using Robust.Shared.Collections;
-using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-using Robust.Shared.Utility;
-
-namespace Content.Server.Procedural;
-
-public sealed partial class DungeonJob
-{
-    /*
-     * Run after the main dungeon generation
-     */
-
-    private static readonly ProtoId<TagPrototype> WallTag = "Wall";
-
-    private bool HasWall(MapGridComponent grid, Vector2i tile)
-    {
-        var anchored = _maps.GetAnchoredEntitiesEnumerator(_gridUid, _grid, tile);
-
-        while (anchored.MoveNext(out var uid))
-        {
-            if (_tag.HasTag(uid.Value, WallTag))
-                return true;
-        }
-
-        return false;
-    }
-
-    private async Task PostGen(AutoCablingPostGen gen, Dungeon dungeon, EntityUid gridUid, MapGridComponent grid,
-        Random random)
-    {
-        // There's a lot of ways you could do this.
-        // For now we'll just connect every LV cable in the dungeon.
-        var cableTiles = new HashSet<Vector2i>();
-        var allTiles = new HashSet<Vector2i>(dungeon.CorridorTiles);
-        allTiles.UnionWith(dungeon.RoomTiles);
-        allTiles.UnionWith(dungeon.RoomExteriorTiles);
-        allTiles.UnionWith(dungeon.CorridorExteriorTiles);
-        var nodeQuery = _entManager.GetEntityQuery<NodeContainerComponent>();
-
-        // Gather existing nodes
-        foreach (var tile in allTiles)
-        {
-            var anchored = _maps.GetAnchoredEntitiesEnumerator(_gridUid, _grid, tile);
-
-            while (anchored.MoveNext(out var anc))
-            {
-                if (!nodeQuery.TryGetComponent(anc, out var nodeContainer) ||
-                   !nodeContainer.Nodes.ContainsKey("power"))
-                {
-                    continue;
-                }
-
-                cableTiles.Add(tile);
-                break;
-            }
-        }
-
-        // Iterating them all might be expensive.
-        await SuspendIfOutOfTime();
-
-        if (!ValidateResume())
-            return;
-
-        var startNodes = new List<Vector2i>(cableTiles);
-        random.Shuffle(startNodes);
-        var start = startNodes[0];
-        var remaining = new HashSet<Vector2i>(startNodes);
-        var frontier = new PriorityQueue<Vector2i, float>();
-        frontier.Enqueue(start, 0f);
-        var cameFrom = new Dictionary<Vector2i, Vector2i>();
-        var costSoFar = new Dictionary<Vector2i, float>();
-        var lastDirection = new Dictionary<Vector2i, Direction>();
-        costSoFar[start] = 0f;
-        lastDirection[start] = Direction.Invalid;
-
-        while (remaining.Count > 0)
-        {
-            if (frontier.Count == 0)
-            {
-                var newStart = remaining.First();
-                frontier.Enqueue(newStart, 0f);
-                lastDirection[newStart] = Direction.Invalid;
-            }
-
-            var node = frontier.Dequeue();
-
-            if (remaining.Remove(node))
-            {
-                var weh = node;
-
-                while (cameFrom.TryGetValue(weh, out var receiver))
-                {
-                    cableTiles.Add(weh);
-                    weh = receiver;
-
-                    if (weh == start)
-                        break;
-                }
-            }
-
-            if (!grid.TryGetTileRef(node, out var tileRef) || tileRef.Tile.IsEmpty)
-            {
-                continue;
-            }
-
-            for (var i = 0; i < 4; i++)
-            {
-                var dir = (Direction) (i * 2);
-
-                var neighbor = node + dir.ToIntVec();
-                var tileCost = 1f;
-
-                // Prefer straight lines.
-                if (lastDirection[node] != dir)
-                {
-                    tileCost *= 1.1f;
-                }
-
-                if (cableTiles.Contains(neighbor))
-                {
-                    tileCost *= 0.1f;
-                }
-
-                // Prefer tiles without walls on them
-                if (HasWall(grid, neighbor))
-                {
-                    tileCost *= 20f;
-                }
-
-                var gScore = costSoFar[node] + tileCost;
-
-                if (costSoFar.TryGetValue(neighbor, out var nextValue) && gScore >= nextValue)
-                {
-                    continue;
-                }
-
-                cameFrom[neighbor] = node;
-                costSoFar[neighbor] = gScore;
-                lastDirection[neighbor] = dir;
-                frontier.Enqueue(neighbor, gScore);
-            }
-        }
-
-        foreach (var tile in cableTiles)
-        {
-            var anchored = grid.GetAnchoredEntitiesEnumerator(tile);
-            var found = false;
-
-            while (anchored.MoveNext(out var anc))
-            {
-                if (!nodeQuery.TryGetComponent(anc, out var nodeContainer) ||
-                    !nodeContainer.Nodes.ContainsKey("power"))
-                {
-                    continue;
-                }
-
-                found = true;
-                break;
-            }
-
-            if (found)
-                continue;
-
-            _entManager.SpawnEntity(gen.Entity, _grid.GridTileToLocal(tile));
-        }
-    }
-
-    private async Task PostGen(BoundaryWallPostGen gen, Dungeon dungeon, EntityUid gridUid, MapGridComponent grid, Random random)
-    {
-        var tileDef = _tileDefManager[gen.Tile];
-        var tiles = new List<(Vector2i Index, Tile Tile)>(dungeon.RoomExteriorTiles.Count);
-
-        // Spawn wall outline
-        // - Tiles first
-        foreach (var neighbor in dungeon.RoomExteriorTiles)
-        {
-            DebugTools.Assert(!dungeon.RoomTiles.Contains(neighbor));
-
-            if (dungeon.Entrances.Contains(neighbor))
-                continue;
-
-            if (!_anchorable.TileFree(grid, neighbor, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
-                continue;
-
-            tiles.Add((neighbor, _tile.GetVariantTile((ContentTileDefinition) tileDef, random)));
-        }
-
-        foreach (var index in dungeon.CorridorExteriorTiles)
-        {
-            if (dungeon.RoomTiles.Contains(index))
-                continue;
-
-            if (!_anchorable.TileFree(grid, index, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
-                continue;
-
-            tiles.Add((index, _tile.GetVariantTile((ContentTileDefinition)tileDef, random)));
-        }
-
-        grid.SetTiles(tiles);
-
-        // Double iteration coz we bulk set tiles for speed.
-        for (var i = 0; i < tiles.Count; i++)
-        {
-            var index = tiles[i];
-            if (!_anchorable.TileFree(grid, index.Index, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
-                continue;
-
-            // If no cardinal neighbors in dungeon then we're a corner.
-            var isCorner = false;
-
-            if (gen.CornerWall != null)
-            {
-                isCorner = true;
-
-                for (var x = -1; x <= 1; x++)
-                {
-                    for (var y = -1; y <= 1; y++)
-                    {
-                        if (x != 0 && y != 0)
-                        {
-                            continue;
-                        }
-
-                        var neighbor = new Vector2i(index.Index.X + x, index.Index.Y + y);
-
-                        if (dungeon.RoomTiles.Contains(neighbor) || dungeon.CorridorTiles.Contains(neighbor))
-                        {
-                            isCorner = false;
-                            break;
-                        }
-                    }
-
-                    if (!isCorner)
-                        break;
-                }
-
-                if (isCorner)
-                    _entManager.SpawnEntity(gen.CornerWall, grid.GridTileToLocal(index.Index));
-            }
-
-            if (!isCorner)
-                _entManager.SpawnEntity(gen.Wall, grid.GridTileToLocal(index.Index));
-
-            if (i % 20 == 0)
-            {
-                await SuspendIfOutOfTime();
-
-                if (!ValidateResume())
-                    return;
-            }
-        }
-    }
-
-    private async Task PostGen(CornerClutterPostGen gen, Dungeon dungeon, EntityUid gridUid, MapGridComponent grid,
-        Random random)
-    {
-        var physicsQuery = _entManager.GetEntityQuery<PhysicsComponent>();
-
-        foreach (var tile in dungeon.CorridorTiles)
-        {
-            var enumerator = _grid.GetAnchoredEntitiesEnumerator(tile);
-            var blocked = false;
-
-            while (enumerator.MoveNext(out var ent))
-            {
-                // TODO: TileFree
-                if (!physicsQuery.TryGetComponent(ent, out var physics) ||
-                    !physics.CanCollide ||
-                    !physics.Hard)
-                {
-                    continue;
-                }
-
-                blocked = true;
-                break;
-            }
-
-            if (blocked)
-                continue;
-
-            // If at least 2 adjacent tiles are blocked consider it a corner
-            for (var i = 0; i < 4; i++)
-            {
-                var dir = (Direction) (i * 2);
-                blocked = HasWall(grid, tile + dir.ToIntVec());
-
-                if (!blocked)
-                    continue;
-
-                var nextDir = (Direction) ((i + 1) * 2 % 8);
-                blocked = HasWall(grid, tile + nextDir.ToIntVec());
-
-                if (!blocked)
-                    continue;
-
-                if (random.Prob(gen.Chance))
-                {
-                    var coords = _grid.GridTileToLocal(tile);
-                    var protos = EntitySpawnCollection.GetSpawns(gen.Contents, random);
-                    _entManager.SpawnEntities(coords, protos);
-                }
-
-                break;
-            }
-        }
-    }
-
-    private async Task PostGen(CorridorDecalSkirtingPostGen decks, Dungeon dungeon, EntityUid gridUid, MapGridComponent grid, Random random)
-    {
-        var directions = new ValueList<DirectionFlag>(4);
-        var pocketDirections = new ValueList<Direction>(4);
-        var doorQuery = _entManager.GetEntityQuery<DoorComponent>();
-        var physicsQuery = _entManager.GetEntityQuery<PhysicsComponent>();
-        var offset = -_grid.TileSizeHalfVector;
-        var color = decks.Color;
-
-        foreach (var tile in dungeon.CorridorTiles)
-        {
-            DebugTools.Assert(!dungeon.RoomTiles.Contains(tile));
-            directions.Clear();
-
-            // Do cardinals 1 step
-            // Do corners the other step
-            for (var i = 0; i < 4; i++)
-            {
-                var dir = (DirectionFlag) Math.Pow(2, i);
-                var neighbor = tile + dir.AsDir().ToIntVec();
-
-                var anc = _grid.GetAnchoredEntitiesEnumerator(neighbor);
-
-                while (anc.MoveNext(out var ent))
-                {
-                    if (!physicsQuery.TryGetComponent(ent, out var physics) ||
-                        !physics.CanCollide ||
-                        !physics.Hard ||
-                        doorQuery.HasComponent(ent.Value))
-                    {
-                        continue;
-                    }
-
-                    directions.Add(dir);
-                    break;
-                }
-            }
-
-            // Pockets
-            if (directions.Count == 0)
-            {
-                pocketDirections.Clear();
-
-                for (var i = 1; i < 5; i++)
-                {
-                    var dir = (Direction) (i * 2 - 1);
-                    var neighbor = tile + dir.ToIntVec();
-
-                    var anc = _grid.GetAnchoredEntitiesEnumerator(neighbor);
-
-                    while (anc.MoveNext(out var ent))
-                    {
-                        if (!physicsQuery.TryGetComponent(ent, out var physics) ||
-                            !physics.CanCollide ||
-                            !physics.Hard ||
-                            doorQuery.HasComponent(ent.Value))
-                        {
-                            continue;
-                        }
-
-                        pocketDirections.Add(dir);
-                        break;
-                    }
-                }
-
-                if (pocketDirections.Count == 1)
-                {
-                    if (decks.PocketDecals.TryGetValue(pocketDirections[0], out var cDir))
-                    {
-                        // Decals not being centered biting my ass again
-                        var gridPos = _grid.GridTileToLocal(tile).Offset(offset);
-                        _decals.TryAddDecal(cDir, gridPos, out _, color: color);
-                    }
-                }
-
-                continue;
-            }
-
-            if (directions.Count == 1)
-            {
-                if (decks.CardinalDecals.TryGetValue(directions[0], out var cDir))
-                {
-                    // Decals not being centered biting my ass again
-                    var gridPos = _grid.GridTileToLocal(tile).Offset(offset);
-                    _decals.TryAddDecal(cDir, gridPos, out _, color: color);
-                }
-
-                continue;
-            }
-
-            // Corners
-            if (directions.Count == 2)
-            {
-                // Auehghegueugegegeheh help me
-                var dirFlag = directions[0] | directions[1];
-
-                if (decks.CornerDecals.TryGetValue(dirFlag, out var cDir))
-                {
-                    var gridPos = _grid.GridTileToLocal(tile).Offset(offset);
-                    _decals.TryAddDecal(cDir, gridPos, out _, color: color);
-                }
-            }
-        }
-    }
-
-    private async Task PostGen(DungeonEntrancePostGen gen, Dungeon dungeon, EntityUid gridUid, MapGridComponent grid, Random random)
-    {
-        var rooms = new List<DungeonRoom>(dungeon.Rooms);
-        var roomTiles = new List<Vector2i>();
-        var tileDef = _tileDefManager[gen.Tile];
-
-        for (var i = 0; i < gen.Count; i++)
-        {
-            var roomIndex = random.Next(rooms.Count);
-            var room = rooms[roomIndex];
-
-            // Move out 3 tiles in a direction away from center of the room
-            // If none of those intersect another tile it's probably external
-            // TODO: Maybe need to take top half of furthest rooms in case there's interior exits?
-            roomTiles.AddRange(room.Exterior);
-            random.Shuffle(roomTiles);
-
-            foreach (var tile in roomTiles)
-            {
-                var isValid = false;
-
-                // Check if one side is dungeon and the other side is nothing.
-                for (var j = 0; j < 4; j++)
-                {
-                    var dir = (Direction) (j * 2);
-                    var oppositeDir = dir.GetOpposite();
-                    var dirVec = tile + dir.ToIntVec();
-                    var oppositeDirVec = tile + oppositeDir.ToIntVec();
-
-                    if (!dungeon.RoomTiles.Contains(dirVec))
-                    {
-                        continue;
-                    }
-
-                    if (dungeon.RoomTiles.Contains(oppositeDirVec) ||
-                        dungeon.RoomExteriorTiles.Contains(oppositeDirVec) ||
-                        dungeon.CorridorExteriorTiles.Contains(oppositeDirVec) ||
-                        dungeon.CorridorTiles.Contains(oppositeDirVec))
-                    {
-                        continue;
-                    }
-
-                    // Check if exterior spot free.
-                    if (!_anchorable.TileFree(_grid, tile, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
-                    {
-                        continue;
-                    }
-
-                    // Check if interior spot free (no guarantees on exterior but ClearDoor should handle it)
-                    if (!_anchorable.TileFree(_grid, dirVec, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
-                    {
-                        continue;
-                    }
-
-                    // Valid pick!
-                    isValid = true;
-
-                    // Entrance wew
-                    grid.SetTile(tile, _tile.GetVariantTile((ContentTileDefinition) tileDef, random));
-                    ClearDoor(dungeon, grid, tile);
-                    var gridCoords = grid.GridTileToLocal(tile);
-                    // Need to offset the spawn to avoid spawning in the room.
-
-                    _entManager.SpawnEntities(gridCoords, gen.Entities);
-
-                    // Clear out any biome tiles nearby to avoid blocking it
-                    foreach (var nearTile in grid.GetTilesIntersecting(new Circle(gridCoords.Position, 1.5f), false))
-                    {
-                        if (dungeon.RoomTiles.Contains(nearTile.GridIndices) ||
-                            dungeon.RoomExteriorTiles.Contains(nearTile.GridIndices) ||
-                            dungeon.CorridorTiles.Contains(nearTile.GridIndices) ||
-                            dungeon.CorridorExteriorTiles.Contains(nearTile.GridIndices))
-                        {
-                            continue;
-                        }
-
-                        grid.SetTile(nearTile.GridIndices, _tile.GetVariantTile((ContentTileDefinition) tileDef, random));;
-                    }
-
-                    break;
-                }
-
-                if (isValid)
-                    break;
-            }
-
-            roomTiles.Clear();
-        }
-    }
-
-    private async Task PostGen(ExternalWindowPostGen gen, Dungeon dungeon, EntityUid gridUid, MapGridComponent grid,
-        Random random)
-    {
-        // Iterate every tile with N chance to spawn windows on that wall per cardinal dir.
-        var chance = 0.25 / 3f;
-
-        var allExterior = new HashSet<Vector2i>(dungeon.CorridorExteriorTiles);
-        allExterior.UnionWith(dungeon.RoomExteriorTiles);
-        var validTiles = allExterior.ToList();
-        random.Shuffle(validTiles);
-
-        var tiles = new List<(Vector2i, Tile)>();
-        var tileDef = _tileDefManager[gen.Tile];
-        var count = Math.Floor(validTiles.Count * chance);
-        var index = 0;
-        var takenTiles = new HashSet<Vector2i>();
-
-        // There's a bunch of shit here but tl;dr
-        // - don't spawn over cap
-        // - Check if we have 3 tiles in a row that aren't corners and aren't obstructed
-        foreach (var tile in validTiles)
-        {
-            if (index > count)
-                break;
-
-            // Room tile / already used.
-            if (!_anchorable.TileFree(_grid, tile, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask) ||
-                takenTiles.Contains(tile))
-            {
-                continue;
-            }
-
-            // Check we're not on a corner
-            for (var i = 0; i < 2; i++)
-            {
-                var dir = (Direction) (i * 2);
-                var dirVec = dir.ToIntVec();
-                var isValid = true;
-
-                // Check 1 beyond either side to ensure it's not a corner.
-                for (var j = -1; j < 4; j++)
-                {
-                    var neighbor = tile + dirVec * j;
-
-                    if (!allExterior.Contains(neighbor) ||
-                        takenTiles.Contains(neighbor) ||
-                        !_anchorable.TileFree(grid, neighbor, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
-                    {
-                        isValid = false;
-                        break;
-                    }
-
-                    // Also check perpendicular that it is free
-                    foreach (var k in new [] {2, 6})
-                    {
-                        var perp = (Direction) ((i * 2 + k) % 8);
-                        var perpVec = perp.ToIntVec();
-                        var perpTile = tile + perpVec;
-
-                        if (allExterior.Contains(perpTile) ||
-                            takenTiles.Contains(neighbor) ||
-                            !_anchorable.TileFree(_grid, perpTile, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
-                        {
-                            isValid = false;
-                            break;
-                        }
-                    }
-
-                    if (!isValid)
-                        break;
-                }
-
-                if (!isValid)
-                    continue;
-
-                for (var j = 0; j < 3; j++)
-                {
-                    var neighbor = tile + dirVec * j;
-
-                    tiles.Add((neighbor, _tile.GetVariantTile((ContentTileDefinition) tileDef, random)));
-                    index++;
-                    takenTiles.Add(neighbor);
-                }
-            }
-        }
-
-        grid.SetTiles(tiles);
-        index = 0;
-
-        foreach (var tile in tiles)
-        {
-            var gridPos = grid.GridTileToLocal(tile.Item1);
-
-            index += gen.Entities.Count;
-            _entManager.SpawnEntities(gridPos, gen.Entities);
-
-            if (index > 20)
-            {
-                index -= 20;
-                await SuspendIfOutOfTime();
-
-                if (!ValidateResume())
-                    return;
-            }
-        }
-    }
-
-    /*
-     * You may be wondering why these are different.
-     * It's because for internals we want to force it as it looks nicer and not leave it up to chance.
-     */
-
-    // TODO: Can probably combine these a bit, their differences are in really annoying to pull out spots.
-
-    private async Task PostGen(InternalWindowPostGen gen, Dungeon dungeon, EntityUid gridUid, MapGridComponent grid,
-        Random random)
-    {
-        // Iterate every room and check if there's a gap beyond it that leads to another room within N tiles
-        // If so then consider windows
-        var minDistance = 4;
-        var maxDistance = 6;
-        var tileDef = _tileDefManager[gen.Tile];
-
-        foreach (var room in dungeon.Rooms)
-        {
-            var validTiles = new List<Vector2i>();
-
-            for (var i = 0; i < 4; i++)
-            {
-                var dir = (DirectionFlag) Math.Pow(2, i);
-                var dirVec = dir.AsDir().ToIntVec();
-
-                foreach (var tile in room.Tiles)
-                {
-                    var tileAngle = ((Vector2) tile + grid.TileSizeHalfVector - room.Center).ToAngle();
-                    var roundedAngle = Math.Round(tileAngle.Theta / (Math.PI / 2)) * (Math.PI / 2);
-
-                    var tileVec = (Vector2i) new Angle(roundedAngle).ToVec().Rounded();
-
-                    if (!tileVec.Equals(dirVec))
-                        continue;
-
-                    var valid = false;
-
-                    for (var j = 1; j < maxDistance; j++)
-                    {
-                        var edgeNeighbor = tile + dirVec * j;
-
-                        if (dungeon.RoomTiles.Contains(edgeNeighbor))
-                        {
-                            if (j < minDistance)
-                            {
-                                valid = false;
-                            }
-                            else
-                            {
-                                valid = true;
-                            }
-
-                            break;
-                        }
-                    }
-
-                    if (!valid)
-                        continue;
-
-                    var windowTile = tile + dirVec;
-
-                    if (!_anchorable.TileFree(grid, windowTile, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
-                        continue;
-
-                    validTiles.Add(windowTile);
-                }
-
-                validTiles.Sort((x, y) => ((Vector2) x + grid.TileSizeHalfVector - room.Center).LengthSquared().CompareTo((y + grid.TileSizeHalfVector - room.Center).LengthSquared));
-
-                for (var j = 0; j < Math.Min(validTiles.Count, 3); j++)
-                {
-                    var tile = validTiles[j];
-                    var gridPos = grid.GridTileToLocal(tile);
-                    grid.SetTile(tile, _tile.GetVariantTile((ContentTileDefinition) tileDef, random));
-
-                    _entManager.SpawnEntities(gridPos, gen.Entities);
-                }
-
-                if (validTiles.Count > 0)
-                {
-                    await SuspendIfOutOfTime();
-
-                    if (!ValidateResume())
-                        return;
-                }
-
-                validTiles.Clear();
-            }
-        }
-    }
-
-    /// <summary>
-    /// Simply places tiles / entities on the entrances to rooms.
-    /// </summary>
-    private async Task PostGen(RoomEntrancePostGen gen, Dungeon dungeon, EntityUid gridUid, MapGridComponent grid,
-        Random random)
-    {
-        var setTiles = new List<(Vector2i, Tile)>();
-        var tileDef = _tileDefManager[gen.Tile];
-
-        foreach (var room in dungeon.Rooms)
-        {
-            foreach (var entrance in room.Entrances)
-            {
-                setTiles.Add((entrance, _tile.GetVariantTile((ContentTileDefinition) tileDef, random)));
-            }
-        }
-
-        grid.SetTiles(setTiles);
-
-        foreach (var room in dungeon.Rooms)
-        {
-            foreach (var entrance in room.Entrances)
-            {
-                _entManager.SpawnEntities(grid.GridTileToLocal(entrance), gen.Entities);
-            }
-        }
-    }
-
-    /// <summary>
-    /// Generates corridor connections between entrances to all the rooms.
-    /// </summary>
-    private async Task PostGen(CorridorPostGen gen, Dungeon dungeon, EntityUid gridUid, MapGridComponent grid, Random random)
-    {
-        var entrances = new List<Vector2i>(dungeon.Rooms.Count);
-
-        // Grab entrances
-        foreach (var room in dungeon.Rooms)
-        {
-            entrances.AddRange(room.Entrances);
-        }
-
-        var edges = _dungeon.MinimumSpanningTree(entrances, random);
-        await SuspendIfOutOfTime();
-
-        if (!ValidateResume())
-            return;
-
-        // TODO: Add in say 1/3 of edges back in to add some cyclic to it.
-
-        var expansion = gen.Width - 2;
-        // Okay so tl;dr is that we don't want to cut close to rooms as it might go from 3 width to 2 width suddenly
-        // So we will add a buffer range around each room to deter pathfinding there unless necessary
-        var deterredTiles = new HashSet<Vector2i>();
-
-        if (expansion >= 1)
-        {
-            foreach (var tile in dungeon.RoomExteriorTiles)
-            {
-                for (var x = -expansion; x <= expansion; x++)
-                {
-                    for (var y = -expansion; y <= expansion; y++)
-                    {
-                        var neighbor = new Vector2(tile.X + x, tile.Y + y).Floored();
-
-                        if (dungeon.RoomTiles.Contains(neighbor) ||
-                            dungeon.RoomExteriorTiles.Contains(neighbor) ||
-                            entrances.Contains(neighbor))
-                        {
-                            continue;
-                        }
-
-                        deterredTiles.Add(neighbor);
-                    }
-                }
-            }
-        }
-
-        foreach (var room in dungeon.Rooms)
-        {
-            foreach (var entrance in room.Entrances)
-            {
-                // Just so we can still actually get in to the entrance we won't deter from a tile away from it.
-                var normal = (entrance + grid.TileSizeHalfVector - room.Center).ToWorldAngle().GetCardinalDir().ToIntVec();
-                deterredTiles.Remove(entrance + normal);
-            }
-        }
-
-        var excludedTiles = new HashSet<Vector2i>(dungeon.RoomExteriorTiles);
-        excludedTiles.UnionWith(dungeon.RoomTiles);
-        var corridorTiles = new HashSet<Vector2i>();
-
-        _dungeon.GetCorridorNodes(corridorTiles, edges, gen.PathLimit, excludedTiles, tile =>
-        {
-            var mod = 1f;
-
-            if (corridorTiles.Contains(tile))
-            {
-                mod *= 0.1f;
-            }
-
-            if (deterredTiles.Contains(tile))
-            {
-                mod *= 2f;
-            }
-
-            return mod;
-        });
-
-        WidenCorridor(dungeon, gen.Width, corridorTiles);
-
-        var setTiles = new List<(Vector2i, Tile)>();
-        var tileDef = _prototype.Index(gen.Tile);
-
-        foreach (var tile in corridorTiles)
-        {
-            setTiles.Add((tile, _tile.GetVariantTile(tileDef, random)));
-        }
-
-        grid.SetTiles(setTiles);
-        dungeon.CorridorTiles.UnionWith(corridorTiles);
-        BuildCorridorExterior(dungeon);
-    }
-
-    private void BuildCorridorExterior(Dungeon dungeon)
-    {
-        var exterior = dungeon.CorridorExteriorTiles;
-
-        // Just ignore entrances or whatever for now.
-        foreach (var tile in dungeon.CorridorTiles)
-        {
-            for (var x = -1; x <= 1; x++)
-            {
-                for (var y = -1; y <= 1; y++)
-                {
-                    var neighbor = new Vector2i(tile.X + x, tile.Y + y);
-
-                    if (dungeon.CorridorTiles.Contains(neighbor) ||
-                        dungeon.RoomExteriorTiles.Contains(neighbor) ||
-                        dungeon.RoomTiles.Contains(neighbor) ||
-                        dungeon.Entrances.Contains(neighbor))
-                    {
-                        continue;
-                    }
-
-                    exterior.Add(neighbor);
-                }
-            }
-        }
-    }
-
-    private void WidenCorridor(Dungeon dungeon, float width, ICollection<Vector2i> corridorTiles)
-    {
-        var expansion = width - 2;
-
-        // Widen the path
-        if (expansion >= 1)
-        {
-            var toAdd = new ValueList<Vector2i>();
-
-            foreach (var node in corridorTiles)
-            {
-                // Uhhh not sure on the cleanest way to do this but tl;dr we don't want to hug
-                // exterior walls and make the path smaller.
-
-                for (var x = -expansion; x <= expansion; x++)
-                {
-                    for (var y = -expansion; y <= expansion; y++)
-                    {
-                        var neighbor = new Vector2(node.X + x, node.Y + y).Floored();
-
-                        // Diagonals still matter here.
-                        if (dungeon.RoomTiles.Contains(neighbor) ||
-                            dungeon.RoomExteriorTiles.Contains(neighbor))
-                        {
-                            // Try
-
-                            continue;
-                        }
-
-                        toAdd.Add(neighbor);
-                    }
-                }
-            }
-
-            foreach (var node in toAdd)
-            {
-                corridorTiles.Add(node);
-            }
-        }
-    }
-
-    private async Task PostGen(EntranceFlankPostGen gen, Dungeon dungeon, EntityUid gridUid, MapGridComponent grid,
-        Random random)
-    {
-        var tiles = new List<(Vector2i Index, Tile)>();
-        var tileDef = _tileDefManager[gen.Tile];
-        var spawnPositions = new ValueList<Vector2i>(dungeon.Rooms.Count);
-
-        foreach (var room in dungeon.Rooms)
-        {
-            foreach (var entrance in room.Entrances)
-            {
-                for (var i = 0; i < 8; i++)
-                {
-                    var dir = (Direction) i;
-                    var neighbor = entrance + dir.ToIntVec();
-
-                    if (!dungeon.RoomExteriorTiles.Contains(neighbor))
-                        continue;
-
-                    tiles.Add((neighbor, _tile.GetVariantTile((ContentTileDefinition) tileDef, random)));
-                    spawnPositions.Add(neighbor);
-                }
-            }
-        }
-
-        grid.SetTiles(tiles);
-
-        foreach (var entrance in spawnPositions)
-        {
-            _entManager.SpawnEntities(_grid.GridTileToLocal(entrance), gen.Entities);
-        }
-    }
-
-    private async Task PostGen(JunctionPostGen gen, Dungeon dungeon, EntityUid gridUid, MapGridComponent grid,
-        Random random)
-    {
-        var tileDef = _tileDefManager[gen.Tile];
-
-        // N-wide junctions
-        foreach (var tile in dungeon.CorridorTiles)
-        {
-            if (!_anchorable.TileFree(_grid, tile, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
-                continue;
-
-            // Check each direction:
-            // - Check if immediate neighbors are free
-            // - Check if the neighbors beyond that are not free
-            // - Then check either side if they're slightly more free
-            var exteriorWidth = (int) Math.Floor(gen.Width / 2f);
-            var width = (int) Math.Ceiling(gen.Width / 2f);
-
-            for (var i = 0; i < 2; i++)
-            {
-                var isValid = true;
-                var neighborDir = (Direction) (i * 2);
-                var neighborVec = neighborDir.ToIntVec();
-
-                for (var j = -width; j <= width; j++)
-                {
-                    if (j == 0)
-                        continue;
-
-                    var neighbor = tile + neighborVec * j;
-
-                    // If it's an end tile then check it's occupied.
-                    if (j == -width ||
-                        j == width)
-                    {
-                        if (!HasWall(grid, neighbor))
-                        {
-                            isValid = false;
-                            break;
-                        }
-
-                        continue;
-                    }
-
-                    // If we're not at the end tile then check it + perpendicular are free.
-                    if (!_anchorable.TileFree(_grid, neighbor, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
-                    {
-                        isValid = false;
-                        break;
-                    }
-
-                    var perp1 = tile + neighborVec * j + ((Direction) ((i * 2 + 2) % 8)).ToIntVec();
-                    var perp2 = tile + neighborVec * j + ((Direction) ((i * 2 + 6) % 8)).ToIntVec();
-
-                    if (!_anchorable.TileFree(_grid, perp1, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
-                    {
-                        isValid = false;
-                        break;
-                    }
-
-                    if (!_anchorable.TileFree(_grid, perp2, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
-                    {
-                        isValid = false;
-                        break;
-                    }
-                }
-
-                if (!isValid)
-                    continue;
-
-                // Check corners to see if either side opens up (if it's just a 1x wide corridor do nothing, needs to be a funnel.
-                foreach (var j in new [] {-exteriorWidth, exteriorWidth})
-                {
-                    var freeCount = 0;
-
-                    // Need at least 3 of 4 free
-                    for (var k = 0; k < 4; k++)
-                    {
-                        var cornerDir = (Direction) (k * 2 + 1);
-                        var cornerVec = cornerDir.ToIntVec();
-                        var cornerNeighbor = tile + neighborVec * j + cornerVec;
-
-                        if (_anchorable.TileFree(_grid, cornerNeighbor, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
-                        {
-                            freeCount++;
-                        }
-                    }
-
-                    if (freeCount < gen.Width)
-                        continue;
-
-                    // Valid!
-                    isValid = true;
-
-                    for (var x = -width + 1; x < width; x++)
-                    {
-                        var weh = tile + neighborDir.ToIntVec() * x;
-                        grid.SetTile(weh, _tile.GetVariantTile((ContentTileDefinition) tileDef, random));
-
-                        var coords = grid.GridTileToLocal(weh);
-                        _entManager.SpawnEntities(coords, gen.Entities);
-                    }
-
-                    break;
-                }
-
-                if (isValid)
-                {
-                    await SuspendIfOutOfTime();
-
-                    if (!ValidateResume())
-                        return;
-                }
-
-                break;
-            }
-        }
-    }
-
-    private async Task PostGen(MiddleConnectionPostGen gen, Dungeon dungeon, EntityUid gridUid, MapGridComponent grid, Random random)
-    {
-        // TODO: Need a minimal spanning tree version tbh
-
-        // Grab all of the room bounds
-        // Then, work out connections between them
-        var roomBorders = new Dictionary<DungeonRoom, HashSet<Vector2i>>(dungeon.Rooms.Count);
-
-        foreach (var room in dungeon.Rooms)
-        {
-            var roomEdges = new HashSet<Vector2i>();
-
-            foreach (var index in room.Tiles)
-            {
-                for (var x = -1; x <= 1; x++)
-                {
-                    for (var y = -1; y <= 1; y++)
-                    {
-                        // Cardinals only
-                        if (x != 0 && y != 0 ||
-                            x == 0 && y == 0)
-                        {
-                            continue;
-                        }
-
-                        var neighbor = new Vector2i(index.X + x, index.Y + y);
-
-                        if (dungeon.RoomTiles.Contains(neighbor))
-                            continue;
-
-                        if (!_anchorable.TileFree(grid, neighbor, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
-                            continue;
-
-                        roomEdges.Add(neighbor);
-                    }
-                }
-            }
-
-            roomBorders.Add(room, roomEdges);
-        }
-
-        // Do pathfind from first room to work out graph.
-        // TODO: Optional loops
-
-        var roomConnections = new Dictionary<DungeonRoom, List<DungeonRoom>>();
-        var frontier = new Queue<DungeonRoom>();
-        frontier.Enqueue(dungeon.Rooms.First());
-        var tileDef = _tileDefManager[gen.Tile];
-
-        foreach (var (room, border) in roomBorders)
-        {
-            var conns = roomConnections.GetOrNew(room);
-
-            foreach (var (otherRoom, otherBorders) in roomBorders)
-            {
-                if (room.Equals(otherRoom) ||
-                    conns.Contains(otherRoom))
-                {
-                    continue;
-                }
-
-                var flipp = new HashSet<Vector2i>(border);
-                flipp.IntersectWith(otherBorders);
-
-                if (flipp.Count == 0 ||
-                    gen.OverlapCount != -1 && flipp.Count != gen.OverlapCount)
-                    continue;
-
-                var center = Vector2.Zero;
-
-                foreach (var node in flipp)
-                {
-                    center += (Vector2) node + grid.TileSizeHalfVector;
-                }
-
-                center /= flipp.Count;
-                // Weight airlocks towards center more.
-                var nodeDistances = new List<(Vector2i Node, float Distance)>(flipp.Count);
-
-                foreach (var node in flipp)
-                {
-                    nodeDistances.Add((node, ((Vector2) node + grid.TileSizeHalfVector - center).LengthSquared()));
-                }
-
-                nodeDistances.Sort((x, y) => x.Distance.CompareTo(y.Distance));
-
-                var width = gen.Count;
-
-                for (var i = 0; i < nodeDistances.Count; i++)
-                {
-                    var node = nodeDistances[i].Node;
-                    var gridPos = grid.GridTileToLocal(node);
-                    if (!_anchorable.TileFree(grid, node, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
-                        continue;
-
-                    width--;
-                    grid.SetTile(node, _tile.GetVariantTile((ContentTileDefinition) tileDef, random));
-
-                    if (gen.EdgeEntities != null && nodeDistances.Count - i <= 2)
-                    {
-                        _entManager.SpawnEntities(gridPos, gen.EdgeEntities);
-                    }
-                    else
-                    {
-                        // Iterate neighbors and check for blockers, if so bulldoze
-                        ClearDoor(dungeon, grid, node);
-
-                        _entManager.SpawnEntities(gridPos, gen.Entities);
-                    }
-
-                    if (width == 0)
-                        break;
-                }
-
-                conns.Add(otherRoom);
-                var otherConns = roomConnections.GetOrNew(otherRoom);
-                otherConns.Add(room);
-                await SuspendIfOutOfTime();
-
-                if (!ValidateResume())
-                    return;
-            }
-        }
-    }
-
-    /// <summary>
-    /// Removes any unwanted obstacles around a door tile.
-    /// </summary>
-    private void ClearDoor(Dungeon dungeon, MapGridComponent grid, Vector2i indices, bool strict = false)
-    {
-        var flags = strict
-            ? LookupFlags.Dynamic | LookupFlags.Static | LookupFlags.StaticSundries
-            : LookupFlags.Dynamic | LookupFlags.Static;
-        var physicsQuery = _entManager.GetEntityQuery<PhysicsComponent>();
-
-        for (var x = -1; x <= 1; x++)
-        {
-            for (var y = -1; y <= 1; y++)
-            {
-                if (x != 0 && y != 0)
-                    continue;
-
-                var neighbor = new Vector2i(indices.X + x, indices.Y + y);
-
-                if (!dungeon.RoomTiles.Contains(neighbor))
-                    continue;
-
-                // Shrink by 0.01 to avoid polygon overlap from neighboring tiles.
-                foreach (var ent in _lookup.GetEntitiesIntersecting(_gridUid, new Box2(neighbor * grid.TileSize, (neighbor + 1) * grid.TileSize).Enlarged(-0.1f), flags))
-                {
-                    if (!physicsQuery.TryGetComponent(ent, out var physics) ||
-                        !physics.Hard ||
-                        (DungeonSystem.CollisionMask & physics.CollisionLayer) == 0x0 &&
-                        (DungeonSystem.CollisionLayer & physics.CollisionMask) == 0x0)
-                    {
-                        continue;
-                    }
-
-                    _entManager.DeleteEntity(ent);
-                }
-            }
-        }
-    }
-
-    private async Task PostGen(WallMountPostGen gen, Dungeon dungeon, EntityUid gridUid, MapGridComponent grid,
-        Random random)
-    {
-        var tileDef = _tileDefManager[gen.Tile];
-        var checkedTiles = new HashSet<Vector2i>();
-        var allExterior = new HashSet<Vector2i>(dungeon.CorridorExteriorTiles);
-        allExterior.UnionWith(dungeon.RoomExteriorTiles);
-        var count = 0;
-
-        foreach (var neighbor in allExterior)
-        {
-            // Occupado
-            if (dungeon.RoomTiles.Contains(neighbor) || checkedTiles.Contains(neighbor) || !_anchorable.TileFree(grid, neighbor, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
-                continue;
-
-            if (!random.Prob(gen.Prob) || !checkedTiles.Add(neighbor))
-                continue;
-
-            grid.SetTile(neighbor, _tile.GetVariantTile((ContentTileDefinition) tileDef, random));
-            var gridPos = grid.GridTileToLocal(neighbor);
-            var protoNames = EntitySpawnCollection.GetSpawns(gen.Spawns, random);
-
-            _entManager.SpawnEntities(gridPos, protoNames);
-            count += protoNames.Count;
-
-            if (count > 20)
-            {
-                count -= 20;
-                await SuspendIfOutOfTime();
-
-                if (!ValidateResume())
-                    return;
-            }
-        }
-    }
-}
diff --git a/Content.Server/Procedural/DungeonJob.PostGenBiome.cs b/Content.Server/Procedural/DungeonJob.PostGenBiome.cs
deleted file mode 100644
index 4d3f573f4d4..00000000000
--- a/Content.Server/Procedural/DungeonJob.PostGenBiome.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-using System.Threading.Tasks;
-using Content.Server.Parallax;
-using Content.Shared.Parallax.Biomes;
-using Content.Shared.Parallax.Biomes.Markers;
-using Content.Shared.Procedural;
-using Content.Shared.Procedural.PostGeneration;
-using Content.Shared.Random.Helpers;
-using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
-using Robust.Shared.Utility;
-
-namespace Content.Server.Procedural;
-
-public sealed partial class DungeonJob
-{
-    /*
-     * Handles PostGen code for marker layers + biomes.
-     */
-
-    private async Task PostGen(BiomePostGen postGen, Dungeon dungeon, EntityUid gridUid, MapGridComponent grid, Random random)
-    {
-        if (_entManager.TryGetComponent(gridUid, out BiomeComponent? biomeComp))
-            return;
-
-        biomeComp = _entManager.AddComponent<BiomeComponent>(gridUid);
-        var biomeSystem = _entManager.System<BiomeSystem>();
-        biomeSystem.SetTemplate(gridUid, biomeComp, _prototype.Index(postGen.BiomeTemplate));
-        var seed = random.Next();
-        var xformQuery = _entManager.GetEntityQuery<TransformComponent>();
-
-        foreach (var node in dungeon.RoomTiles)
-        {
-            // Need to set per-tile to override data.
-            if (biomeSystem.TryGetTile(node, biomeComp.Layers, seed, grid, out var tile))
-            {
-                _maps.SetTile(gridUid, grid, node, tile.Value);
-            }
-
-            if (biomeSystem.TryGetDecals(node, biomeComp.Layers, seed, grid, out var decals))
-            {
-                foreach (var decal in decals)
-                {
-                    _decals.TryAddDecal(decal.ID, new EntityCoordinates(gridUid, decal.Position), out _);
-                }
-            }
-
-            if (biomeSystem.TryGetEntity(node, biomeComp, grid, out var entityProto))
-            {
-                var ent = _entManager.SpawnEntity(entityProto, new EntityCoordinates(gridUid, node + grid.TileSizeHalfVector));
-                var xform = xformQuery.Get(ent);
-
-                if (!xform.Comp.Anchored)
-                {
-                    _transform.AnchorEntity(ent, xform);
-                }
-
-                // TODO: Engine bug with SpawnAtPosition
-                DebugTools.Assert(xform.Comp.Anchored);
-            }
-
-            await SuspendIfOutOfTime();
-            ValidateResume();
-        }
-
-        biomeComp.Enabled = false;
-    }
-
-    private async Task PostGen(BiomeMarkerLayerPostGen postGen, Dungeon dungeon, EntityUid gridUid, MapGridComponent grid, Random random)
-    {
-        if (!_entManager.TryGetComponent(gridUid, out BiomeComponent? biomeComp))
-            return;
-
-        var biomeSystem = _entManager.System<BiomeSystem>();
-        var weightedRandom = _prototype.Index(postGen.MarkerTemplate);
-        var xformQuery = _entManager.GetEntityQuery<TransformComponent>();
-        var templates = new Dictionary<string, int>();
-
-        for (var i = 0; i < postGen.Count; i++)
-        {
-            var template = weightedRandom.Pick(random);
-            var count = templates.GetOrNew(template);
-            count++;
-            templates[template] = count;
-        }
-
-        foreach (var (template, count) in templates)
-        {
-            var markerTemplate = _prototype.Index<BiomeMarkerLayerPrototype>(template);
-
-            var bounds = new Box2i();
-
-            foreach (var tile in dungeon.RoomTiles)
-            {
-                bounds = bounds.UnionTile(tile);
-            }
-
-            await SuspendIfOutOfTime();
-            ValidateResume();
-
-            biomeSystem.GetMarkerNodes(gridUid, biomeComp, grid, markerTemplate, true, bounds, count,
-                random, out var spawnSet, out var existing, false);
-
-            await SuspendIfOutOfTime();
-            ValidateResume();
-
-            foreach (var ent in existing)
-            {
-                _entManager.DeleteEntity(ent);
-            }
-
-            await SuspendIfOutOfTime();
-            ValidateResume();
-
-            foreach (var (node, mask) in spawnSet)
-            {
-                string? proto;
-
-                if (mask != null && markerTemplate.EntityMask.TryGetValue(mask, out var maskedProto))
-                {
-                    proto = maskedProto;
-                }
-                else
-                {
-                    proto = markerTemplate.Prototype;
-                }
-
-                var ent = _entManager.SpawnAtPosition(proto, new EntityCoordinates(gridUid, node + grid.TileSizeHalfVector));
-                var xform = xformQuery.Get(ent);
-
-                if (!xform.Comp.Anchored)
-                    _transform.AnchorEntity(ent, xform);
-
-                await SuspendIfOutOfTime();
-                ValidateResume();
-            }
-        }
-    }
-}
diff --git a/Content.Server/Procedural/DungeonJob.cs b/Content.Server/Procedural/DungeonJob.cs
deleted file mode 100644
index bf2822ff423..00000000000
--- a/Content.Server/Procedural/DungeonJob.cs
+++ /dev/null
@@ -1,192 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-using Content.Server.Construction;
-using Robust.Shared.CPUJob.JobQueues;
-using Content.Server.Decals;
-using Content.Shared.Construction.EntitySystems;
-using Content.Shared.Maps;
-using Content.Shared.Procedural;
-using Content.Shared.Procedural.DungeonGenerators;
-using Content.Shared.Procedural.PostGeneration;
-using Content.Shared.Tag;
-using Robust.Server.Physics;
-using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
-
-namespace Content.Server.Procedural;
-
-public sealed partial class DungeonJob : Job<Dungeon>
-{
-    private readonly IEntityManager _entManager;
-    private readonly IMapManager _mapManager;
-    private readonly IPrototypeManager _prototype;
-    private readonly ITileDefinitionManager _tileDefManager;
-
-    private readonly AnchorableSystem _anchorable;
-    private readonly DecalSystem _decals;
-    private readonly DungeonSystem _dungeon;
-    private readonly EntityLookupSystem _lookup;
-    private readonly TagSystem _tag;
-    private readonly TileSystem _tile;
-    private readonly SharedMapSystem _maps;
-    private readonly SharedTransformSystem _transform;
-
-    private readonly DungeonConfigPrototype _gen;
-    private readonly int _seed;
-    private readonly Vector2i _position;
-
-    private readonly MapGridComponent _grid;
-    private readonly EntityUid _gridUid;
-
-    private readonly ISawmill _sawmill;
-
-    public DungeonJob(
-        ISawmill sawmill,
-        double maxTime,
-        IEntityManager entManager,
-        IMapManager mapManager,
-        IPrototypeManager prototype,
-        ITileDefinitionManager tileDefManager,
-        AnchorableSystem anchorable,
-        DecalSystem decals,
-        DungeonSystem dungeon,
-        EntityLookupSystem lookup,
-        TagSystem tag,
-        TileSystem tile,
-        SharedTransformSystem transform,
-        DungeonConfigPrototype gen,
-        MapGridComponent grid,
-        EntityUid gridUid,
-        int seed,
-        Vector2i position,
-        CancellationToken cancellation = default) : base(maxTime, cancellation)
-    {
-        _sawmill = sawmill;
-        _entManager = entManager;
-        _mapManager = mapManager;
-        _prototype = prototype;
-        _tileDefManager = tileDefManager;
-
-        _anchorable = anchorable;
-        _decals = decals;
-        _dungeon = dungeon;
-        _lookup = lookup;
-        _tag = tag;
-        _tile = tile;
-        _maps = _entManager.System<SharedMapSystem>();
-        _transform = transform;
-
-        _gen = gen;
-        _grid = grid;
-        _gridUid = gridUid;
-        _seed = seed;
-        _position = position;
-    }
-
-    protected override async Task<Dungeon?> Process()
-    {
-        Dungeon dungeon;
-        _sawmill.Info($"Generating dungeon {_gen.ID} with seed {_seed} on {_entManager.ToPrettyString(_gridUid)}");
-        _grid.CanSplit = false;
-
-        switch (_gen.Generator)
-        {
-            case NoiseDunGen noise:
-                dungeon = await GenerateNoiseDungeon(noise, _gridUid, _grid, _seed);
-                break;
-            case PrefabDunGen prefab:
-                dungeon = await GeneratePrefabDungeon(prefab, _gridUid, _grid, _seed);
-                DebugTools.Assert(dungeon.RoomExteriorTiles.Count > 0);
-                break;
-            default:
-                throw new NotImplementedException();
-        }
-
-        DebugTools.Assert(dungeon.RoomTiles.Count > 0);
-
-        // To make it slightly more deterministic treat this RNG as separate ig.
-        var random = new Random(_seed);
-
-        foreach (var post in _gen.PostGeneration)
-        {
-            _sawmill.Debug($"Doing postgen {post.GetType()} for {_gen.ID} with seed {_seed}");
-
-            switch (post)
-            {
-                case AutoCablingPostGen cabling:
-                    await PostGen(cabling, dungeon, _gridUid, _grid, random);
-                    break;
-                case BiomePostGen biome:
-                    await PostGen(biome, dungeon, _gridUid, _grid, random);
-                    break;
-                case BoundaryWallPostGen boundary:
-                    await PostGen(boundary, dungeon, _gridUid, _grid, random);
-                    break;
-                case CornerClutterPostGen clutter:
-                    await PostGen(clutter, dungeon, _gridUid, _grid, random);
-                    break;
-                case CorridorClutterPostGen corClutter:
-                    await PostGen(corClutter, dungeon, _gridUid, _grid, random);
-                    break;
-                case CorridorPostGen cordor:
-                    await PostGen(cordor, dungeon, _gridUid, _grid, random);
-                    break;
-                case CorridorDecalSkirtingPostGen decks:
-                    await PostGen(decks, dungeon, _gridUid, _grid, random);
-                    break;
-                case EntranceFlankPostGen flank:
-                    await PostGen(flank, dungeon, _gridUid, _grid, random);
-                    break;
-                case JunctionPostGen junc:
-                    await PostGen(junc, dungeon, _gridUid, _grid, random);
-                    break;
-                case MiddleConnectionPostGen dordor:
-                    await PostGen(dordor, dungeon, _gridUid, _grid, random);
-                    break;
-                case DungeonEntrancePostGen entrance:
-                    await PostGen(entrance, dungeon, _gridUid, _grid, random);
-                    break;
-                case ExternalWindowPostGen externalWindow:
-                    await PostGen(externalWindow, dungeon, _gridUid, _grid, random);
-                    break;
-                case InternalWindowPostGen internalWindow:
-                    await PostGen(internalWindow, dungeon, _gridUid, _grid, random);
-                    break;
-                case BiomeMarkerLayerPostGen markerPost:
-                    await PostGen(markerPost, dungeon, _gridUid, _grid, random);
-                    break;
-                case RoomEntrancePostGen rEntrance:
-                    await PostGen(rEntrance, dungeon, _gridUid, _grid, random);
-                    break;
-                case WallMountPostGen wall:
-                    await PostGen(wall, dungeon, _gridUid, _grid, random);
-                    break;
-                case WormCorridorPostGen worm:
-                    await PostGen(worm, dungeon, _gridUid, _grid, random);
-                    break;
-                default:
-                    throw new NotImplementedException();
-            }
-
-            await SuspendIfOutOfTime();
-
-            if (!ValidateResume())
-                break;
-        }
-
-        // Defer splitting so they don't get spammed and so we don't have to worry about tracking the grid along the way.
-        _grid.CanSplit = true;
-        _entManager.System<GridFixtureSystem>().CheckSplits(_gridUid);
-        return dungeon;
-    }
-
-    private bool ValidateResume()
-    {
-        if (_entManager.Deleted(_gridUid))
-            return false;
-
-        return true;
-    }
-}
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.DunGenExterior.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.DunGenExterior.cs
new file mode 100644
index 00000000000..acffd057fad
--- /dev/null
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.DunGenExterior.cs
@@ -0,0 +1,58 @@
+using System.Threading.Tasks;
+using Content.Server.NPC.Pathfinding;
+using Content.Shared.Maps;
+using Content.Shared.Procedural;
+using Content.Shared.Procedural.DungeonGenerators;
+using Robust.Shared.Collections;
+using Robust.Shared.Random;
+using Robust.Shared.Utility;
+
+namespace Content.Server.Procedural.DungeonJob;
+
+public sealed partial class DungeonJob
+{
+    /// <summary>
+    /// <see cref="ExteriorDunGen"/>
+    /// </summary>
+    private async Task<List<Dungeon>> GenerateExteriorDungen(Vector2i position, ExteriorDunGen dungen, HashSet<Vector2i> reservedTiles, Random random)
+    {
+        DebugTools.Assert(_grid.ChunkCount > 0);
+
+        var aabb = new Box2i(_grid.LocalAABB.BottomLeft.Floored(), _grid.LocalAABB.TopRight.Floored());
+        var angle = random.NextAngle();
+
+        var distance = Math.Max(aabb.Width / 2f + 1f, aabb.Height / 2f + 1f);
+
+        var startTile = new Vector2i(0, (int) distance).Rotate(angle);
+
+        Vector2i? dungeonSpawn = null;
+        var pathfinder = _entManager.System<PathfindingSystem>();
+
+        // Gridcast
+        pathfinder.GridCast(startTile, position, tile =>
+        {
+            if (!_maps.TryGetTileRef(_gridUid, _grid, tile, out var tileRef) ||
+                tileRef.Tile.IsSpace(_tileDefManager))
+            {
+                return true;
+            }
+
+            dungeonSpawn = tile;
+            return false;
+        });
+
+        if (dungeonSpawn == null)
+        {
+            return new List<Dungeon>()
+            {
+                Dungeon.Empty
+            };
+        }
+
+        var config = _prototype.Index(dungen.Proto);
+        var nextSeed = random.Next();
+        var dungeons = await GetDungeons(dungeonSpawn.Value, config, config.Data, config.Layers, reservedTiles, nextSeed, new Random(nextSeed));
+
+        return dungeons;
+    }
+}
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.DunGenFill.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.DunGenFill.cs
new file mode 100644
index 00000000000..5a0d77c6151
--- /dev/null
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.DunGenFill.cs
@@ -0,0 +1,50 @@
+using System.Numerics;
+using System.Threading.Tasks;
+using Content.Shared.Procedural;
+using Content.Shared.Procedural.DungeonGenerators;
+
+namespace Content.Server.Procedural.DungeonJob;
+
+public sealed partial class DungeonJob
+{
+    /// <summary>
+    /// <see cref="FillGridDunGen"/>
+    /// </summary>
+    private async Task<Dungeon> GenerateFillDunGen(DungeonData data, HashSet<Vector2i> reservedTiles)
+    {
+        if (!data.Entities.TryGetValue(DungeonDataKey.Fill, out var fillEnt))
+        {
+            LogDataError(typeof(FillGridDunGen));
+            return Dungeon.Empty;
+        }
+
+        var roomTiles = new HashSet<Vector2i>();
+        var tiles = _maps.GetAllTilesEnumerator(_gridUid, _grid);
+
+        while (tiles.MoveNext(out var tileRef))
+        {
+            var tile = tileRef.Value.GridIndices;
+
+            if (reservedTiles.Contains(tile))
+                continue;
+
+            if (!_anchorable.TileFree(_grid, tile, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
+                continue;
+
+            var gridPos = _maps.GridTileToLocal(_gridUid, _grid, tile);
+            _entManager.SpawnEntity(fillEnt, gridPos);
+
+            roomTiles.Add(tile);
+
+            await SuspendDungeon();
+            if (!ValidateResume())
+                break;
+        }
+
+        var dungeon = new Dungeon();
+        var room = new DungeonRoom(roomTiles, Vector2.Zero, Box2i.Empty, new HashSet<Vector2i>());
+        dungeon.AddRoom(room);
+
+        return dungeon;
+    }
+}
diff --git a/Content.Server/Procedural/DungeonJob.NoiseDunGen.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.DunGenNoise.cs
similarity index 73%
rename from Content.Server/Procedural/DungeonJob.NoiseDunGen.cs
rename to Content.Server/Procedural/DungeonJob/DungeonJob.DunGenNoise.cs
index 73c3386ead5..b2526ec17d1 100644
--- a/Content.Server/Procedural/DungeonJob.NoiseDunGen.cs
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.DunGenNoise.cs
@@ -4,19 +4,25 @@
 using Content.Shared.Procedural;
 using Content.Shared.Procedural.DungeonGenerators;
 using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
-namespace Content.Server.Procedural;
+namespace Content.Server.Procedural.DungeonJob;
 
 public sealed partial class DungeonJob
 {
-    private async Task<Dungeon> GenerateNoiseDungeon(NoiseDunGen dungen, EntityUid gridUid, MapGridComponent grid,
-        int seed)
+    /// <summary>
+    /// <see cref="NoiseDunGen"/>
+    /// </summary>
+    private async Task<Dungeon> GenerateNoiseDunGen(
+        Vector2i position,
+        NoiseDunGen dungen,
+        HashSet<Vector2i> reservedTiles,
+        int seed,
+        Random random)
     {
-        var rand = new Random(seed);
         var tiles = new List<(Vector2i, Tile)>();
+        var matrix = Matrix3Helpers.CreateTranslation(position);
 
         foreach (var layer in dungen.Layers)
         {
@@ -30,7 +36,7 @@ private async Task<Dungeon> GenerateNoiseDungeon(NoiseDunGen dungen, EntityUid g
         var frontier = new Queue<Vector2i>();
         var rooms = new List<DungeonRoom>();
         var tileCount = 0;
-        var tileCap = rand.NextGaussian(dungen.TileCap, dungen.CapStd);
+        var tileCap = random.NextGaussian(dungen.TileCap, dungen.CapStd);
         var visited = new HashSet<Vector2i>();
 
         while (iterations > 0 && tileCount < tileCap)
@@ -39,22 +45,22 @@ private async Task<Dungeon> GenerateNoiseDungeon(NoiseDunGen dungen, EntityUid g
             iterations--;
 
             // Get a random exterior tile to start floodfilling from.
-            var edge = rand.Next(4);
+            var edge = random.Next(4);
             Vector2i seedTile;
 
             switch (edge)
             {
                 case 0:
-                    seedTile = new Vector2i(rand.Next(area.Left - 2, area.Right + 1), area.Bottom - 2);
+                    seedTile = new Vector2i(random.Next(area.Left - 2, area.Right + 1), area.Bottom - 2);
                     break;
                 case 1:
-                    seedTile = new Vector2i(area.Right + 1, rand.Next(area.Bottom - 2, area.Top + 1));
+                    seedTile = new Vector2i(area.Right + 1, random.Next(area.Bottom - 2, area.Top + 1));
                     break;
                 case 2:
-                    seedTile = new Vector2i(rand.Next(area.Left - 2, area.Right + 1), area.Top + 1);
+                    seedTile = new Vector2i(random.Next(area.Left - 2, area.Right + 1), area.Top + 1);
                     break;
                 case 3:
-                    seedTile = new Vector2i(area.Left - 2, rand.Next(area.Bottom - 2, area.Top + 1));
+                    seedTile = new Vector2i(area.Left - 2, random.Next(area.Bottom - 2, area.Top + 1));
                     break;
                 default:
                     throw new ArgumentOutOfRangeException();
@@ -80,14 +86,20 @@ private async Task<Dungeon> GenerateNoiseDungeon(NoiseDunGen dungen, EntityUid g
                     if (value < layer.Threshold)
                         continue;
 
-                    roomArea = roomArea.UnionTile(node);
                     foundNoise = true;
                     noiseFill = true;
+
+                    // Still want the tile to gen as normal but can't do anything with it.
+                    if (reservedTiles.Contains(node))
+                        break;
+
+                    roomArea = roomArea.UnionTile(node);
                     var tileDef = _tileDefManager[layer.Tile];
-                    var variant = _tile.PickVariant((ContentTileDefinition) tileDef, rand);
+                    var variant = _tile.PickVariant((ContentTileDefinition) tileDef, random);
+                    var adjusted = Vector2.Transform(node + _grid.TileSizeHalfVector, matrix).Floored();
 
-                    tiles.Add((node, new Tile(tileDef.TileId, variant: variant)));
-                    roomTiles.Add(node);
+                    tiles.Add((adjusted, new Tile(tileDef.TileId, variant: variant)));
+                    roomTiles.Add(adjusted);
                     tileCount++;
                     break;
                 }
@@ -123,7 +135,7 @@ private async Task<Dungeon> GenerateNoiseDungeon(NoiseDunGen dungen, EntityUid g
 
             foreach (var tile in roomTiles)
             {
-                center += tile + grid.TileSizeHalfVector;
+                center += tile + _grid.TileSizeHalfVector;
             }
 
             center /= roomTiles.Count;
@@ -132,15 +144,8 @@ private async Task<Dungeon> GenerateNoiseDungeon(NoiseDunGen dungen, EntityUid g
             ValidateResume();
         }
 
-        grid.SetTiles(tiles);
-
+        _maps.SetTiles(_gridUid, _grid, tiles);
         var dungeon = new Dungeon(rooms);
-
-        foreach (var tile in tiles)
-        {
-            dungeon.RoomTiles.Add(tile.Item1);
-        }
-
         return dungeon;
     }
 }
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.DunGenNoiseDistance.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.DunGenNoiseDistance.cs
new file mode 100644
index 00000000000..f1808ec90cd
--- /dev/null
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.DunGenNoiseDistance.cs
@@ -0,0 +1,112 @@
+using System.Numerics;
+using System.Threading.Tasks;
+using Content.Shared.Maps;
+using Content.Shared.Procedural;
+using Content.Shared.Procedural.Distance;
+using Content.Shared.Procedural.DungeonGenerators;
+using Robust.Shared.Map;
+
+namespace Content.Server.Procedural.DungeonJob;
+
+public sealed partial class DungeonJob
+{
+    /*
+     * See https://www.redblobgames.com/maps/terrain-from-noise/#islands
+     * Really it's just blending from the original noise (which may occupy the entire area)
+     * with some other shape to confine it into a bounds more naturally.
+     * https://old.reddit.com/r/proceduralgeneration/comments/kaen7h/new_video_on_procedural_island_noise_generation/gfjmgen/ also has more variations
+     */
+
+    /// <summary>
+    /// <see cref="NoiseDistanceDunGen"/>
+    /// </summary>
+    private async Task<Dungeon> GenerateNoiseDistanceDunGen(
+        Vector2i position,
+        NoiseDistanceDunGen dungen,
+        HashSet<Vector2i> reservedTiles,
+        int seed,
+        Random random)
+    {
+        var tiles = new List<(Vector2i, Tile)>();
+        var matrix = Matrix3Helpers.CreateTranslation(position);
+
+        foreach (var layer in dungen.Layers)
+        {
+            layer.Noise.SetSeed(seed);
+        }
+
+        // First we have to find a seed tile, then floodfill from there until we get to noise
+        // at which point we floodfill the entire noise.
+        var area = Box2i.FromDimensions(-dungen.Size / 2, dungen.Size);
+        var roomTiles = new HashSet<Vector2i>();
+        var width = (float) area.Width;
+        var height = (float) area.Height;
+
+        for (var x = area.Left; x <= area.Right; x++)
+        {
+            for (var y = area.Bottom; y <= area.Top; y++)
+            {
+                var node = new Vector2i(x, y);
+
+                foreach (var layer in dungen.Layers)
+                {
+                    var value = layer.Noise.GetNoise(node.X, node.Y);
+
+                    if (dungen.DistanceConfig != null)
+                    {
+                        // Need to get dx - dx in a range from -1 -> 1
+                        var dx = 2 * x / width;
+                        var dy = 2 * y / height;
+
+                        var distance = GetDistance(dx, dy, dungen.DistanceConfig);
+
+                        value = MathHelper.Lerp(value, 1f - distance, dungen.DistanceConfig.BlendWeight);
+                    }
+
+                    if (value < layer.Threshold)
+                        continue;
+
+                    var tileDef = _tileDefManager[layer.Tile];
+                    var variant = _tile.PickVariant((ContentTileDefinition) tileDef, random);
+                    var adjusted = Vector2.Transform(node + _grid.TileSizeHalfVector, matrix).Floored();
+
+                    // Do this down here because noise has a much higher chance of failing than reserved tiles.
+                    if (reservedTiles.Contains(adjusted))
+                    {
+                        break;
+                    }
+
+                    tiles.Add((adjusted, new Tile(tileDef.TileId, variant: variant)));
+                    roomTiles.Add(adjusted);
+                    break;
+                }
+            }
+
+            await SuspendDungeon();
+        }
+
+        var room = new DungeonRoom(roomTiles, area.Center, area, new HashSet<Vector2i>());
+
+        _maps.SetTiles(_gridUid, _grid, tiles);
+        var dungeon = new Dungeon(new List<DungeonRoom>()
+        {
+            room,
+        });
+
+        await SuspendDungeon();
+        return dungeon;
+    }
+
+    private float GetDistance(float dx, float dy, IDunGenDistance distance)
+    {
+        switch (distance)
+        {
+            case DunGenEuclideanSquaredDistance:
+                return MathF.Min(1f, (dx * dx + dy * dy) / MathF.Sqrt(2));
+            case DunGenSquareBump:
+                return 1f - (1f - dx * dx) * (1f - dy * dy);
+            default:
+                throw new ArgumentOutOfRangeException();
+        }
+    }
+}
diff --git a/Content.Server/Procedural/DungeonJob.PrefabDunGen.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.DunGenPrefab.cs
similarity index 82%
rename from Content.Server/Procedural/DungeonJob.PrefabDunGen.cs
rename to Content.Server/Procedural/DungeonJob/DungeonJob.DunGenPrefab.cs
index a19f7e4701d..33bbeba4b53 100644
--- a/Content.Server/Procedural/DungeonJob.PrefabDunGen.cs
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.DunGenPrefab.cs
@@ -1,25 +1,33 @@
 using System.Numerics;
 using System.Threading.Tasks;
-using Content.Shared.Decals;
 using Content.Shared.Procedural;
 using Content.Shared.Procedural.DungeonGenerators;
+using Content.Shared.Whitelist;
 using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
-namespace Content.Server.Procedural;
+namespace Content.Server.Procedural.DungeonJob;
 
 public sealed partial class DungeonJob
 {
-    private async Task<Dungeon> GeneratePrefabDungeon(PrefabDunGen prefab, EntityUid gridUid, MapGridComponent grid, int seed)
+    /// <summary>
+    /// <see cref="PrefabDunGen"/>
+    /// </summary>
+    private async Task<Dungeon> GeneratePrefabDunGen(Vector2i position, DungeonData data, PrefabDunGen prefab, HashSet<Vector2i> reservedTiles, Random random)
     {
-        var random = new Random(seed);
+        if (!data.Tiles.TryGetValue(DungeonDataKey.FallbackTile, out var tileProto) ||
+            !data.Whitelists.TryGetValue(DungeonDataKey.Rooms, out var roomWhitelist))
+        {
+            LogDataError(typeof(PrefabDunGen));
+            return Dungeon.Empty;
+        }
+
         var preset = prefab.Presets[random.Next(prefab.Presets.Count)];
-        var gen = _prototype.Index<DungeonPresetPrototype>(preset);
+        var gen = _prototype.Index(preset);
 
-        var dungeonRotation = _dungeon.GetDungeonRotation(seed);
-        var dungeonTransform = Matrix3Helpers.CreateTransform(_position, dungeonRotation);
+        var dungeonRotation = _dungeon.GetDungeonRotation(random.Next());
+        var dungeonTransform = Matrix3Helpers.CreateTransform(position, dungeonRotation);
         var roomPackProtos = new Dictionary<Vector2i, List<DungeonRoomPackPrototype>>();
 
         foreach (var pack in _prototype.EnumeratePrototypes<DungeonRoomPackPrototype>())
@@ -42,12 +50,15 @@ private async Task<Dungeon> GeneratePrefabDungeon(PrefabDunGen prefab, EntityUid
         {
             var whitelisted = false;
 
-            foreach (var tag in prefab.RoomWhitelist)
+            if (roomWhitelist?.Tags != null)
             {
-                if (proto.Tags.Contains(tag))
+                foreach (var tag in roomWhitelist.Tags)
                 {
-                    whitelisted = true;
-                    break;
+                    if (proto.Tags.Contains(tag))
+                    {
+                        whitelisted = true;
+                        break;
+                    }
                 }
             }
 
@@ -182,12 +193,16 @@ private async Task<Dungeon> GeneratePrefabDungeon(PrefabDunGen prefab, EntityUid
                         {
                             for (var y = roomSize.Bottom; y < roomSize.Top; y++)
                             {
-                                var index = Vector2.Transform(new Vector2(x, y) + grid.TileSizeHalfVector - packCenter, matty).Floored();
-                                tiles.Add((index, new Tile(_tileDefManager["FloorPlanetGrass"].TileId)));
+                                var index = Vector2.Transform(new Vector2(x, y) + _grid.TileSizeHalfVector - packCenter, matty).Floored();
+
+                                if (reservedTiles.Contains(index))
+                                    continue;
+
+                                tiles.Add((index, new Tile(_tileDefManager[tileProto].TileId)));
                             }
                         }
 
-                        grid.SetTiles(tiles);
+                        _maps.SetTiles(_gridUid, _grid, tiles);
                         tiles.Clear();
                         _sawmill.Error($"Unable to find room variant for {roomDimensions}, leaving empty.");
                         continue;
@@ -215,12 +230,12 @@ private async Task<Dungeon> GeneratePrefabDungeon(PrefabDunGen prefab, EntityUid
                 var dungeonMatty = Matrix3x2.Multiply(matty, dungeonTransform);
 
                 // The expensive bit yippy.
-                _dungeon.SpawnRoom(gridUid, grid, dungeonMatty, room);
+                _dungeon.SpawnRoom(_gridUid, _grid, dungeonMatty, room, reservedTiles);
 
-                var roomCenter = (room.Offset + room.Size / 2f) * grid.TileSize;
+                var roomCenter = (room.Offset + room.Size / 2f) * _grid.TileSize;
                 var roomTiles = new HashSet<Vector2i>(room.Size.X * room.Size.Y);
                 var exterior = new HashSet<Vector2i>(room.Size.X * 2 + room.Size.Y * 2);
-                var tileOffset = -roomCenter + grid.TileSizeHalfVector;
+                var tileOffset = -roomCenter + _grid.TileSizeHalfVector;
                 Box2i? mapBounds = null;
 
                 for (var x = -1; x <= room.Size.X; x++)
@@ -232,8 +247,12 @@ private async Task<Dungeon> GeneratePrefabDungeon(PrefabDunGen prefab, EntityUid
                             continue;
                         }
 
-                        var tilePos = Vector2.Transform(new Vector2i(x + room.Offset.X, y + room.Offset.Y) + tileOffset, dungeonMatty);
-                        exterior.Add(tilePos.Floored());
+                        var tilePos = Vector2.Transform(new Vector2i(x + room.Offset.X, y + room.Offset.Y) + tileOffset, dungeonMatty).Floored();
+
+                        if (reservedTiles.Contains(tilePos))
+                            continue;
+
+                        exterior.Add(tilePos);
                     }
                 }
 
@@ -249,38 +268,36 @@ private async Task<Dungeon> GeneratePrefabDungeon(PrefabDunGen prefab, EntityUid
                         roomTiles.Add(tileIndex);
 
                         mapBounds = mapBounds?.Union(tileIndex) ?? new Box2i(tileIndex, tileIndex);
-                        center += tilePos + grid.TileSizeHalfVector;
+                        center += tilePos + _grid.TileSizeHalfVector;
                     }
                 }
 
                 center /= roomTiles.Count;
 
-                dungeon.Rooms.Add(new DungeonRoom(roomTiles, center, mapBounds!.Value, exterior));
+                dungeon.AddRoom(new DungeonRoom(roomTiles, center, mapBounds!.Value, exterior));
+
+                await SuspendDungeon();
 
-                await SuspendIfOutOfTime();
-                ValidateResume();
+                if (!ValidateResume())
+                    return Dungeon.Empty;
             }
         }
 
         // Calculate center and do entrances
         var dungeonCenter = Vector2.Zero;
 
-        foreach (var room in dungeon.Rooms)
-        {
-            dungeon.RoomTiles.UnionWith(room.Tiles);
-            dungeon.RoomExteriorTiles.UnionWith(room.Exterior);
-        }
-
         foreach (var room in dungeon.Rooms)
         {
             dungeonCenter += room.Center;
-            SetDungeonEntrance(dungeon, room, random);
+            SetDungeonEntrance(dungeon, room, reservedTiles, random);
         }
 
+        dungeon.Rebuild();
+
         return dungeon;
     }
 
-    private void SetDungeonEntrance(Dungeon dungeon, DungeonRoom room, Random random)
+    private void SetDungeonEntrance(Dungeon dungeon, DungeonRoom room, HashSet<Vector2i> reservedTiles, Random random)
     {
         // TODO: Move to dungeonsystem.
 
@@ -323,8 +340,10 @@ private void SetDungeonEntrance(Dungeon dungeon, DungeonRoom room, Random random
                     continue;
                 }
 
+                if (reservedTiles.Contains(entrancePos))
+                    continue;
+
                 room.Entrances.Add(entrancePos);
-                dungeon.Entrances.Add(entrancePos);
                 break;
             }
         }
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.DunGenReplaceTile.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.DunGenReplaceTile.cs
new file mode 100644
index 00000000000..6b36d101095
--- /dev/null
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.DunGenReplaceTile.cs
@@ -0,0 +1,60 @@
+using System.Threading.Tasks;
+using Content.Shared.Procedural;
+using Content.Shared.Procedural.DungeonGenerators;
+using Content.Shared.Procedural.PostGeneration;
+using Robust.Shared.Map;
+using Robust.Shared.Random;
+
+namespace Content.Server.Procedural.DungeonJob;
+
+public sealed partial class DungeonJob
+{
+    /// <summary>
+    /// <see cref="ReplaceTileDunGen"/>
+    /// </summary>
+    private async Task<Dungeon> GenerateTileReplacementDunGen(ReplaceTileDunGen gen, DungeonData data, HashSet<Vector2i> reservedTiles, Random random)
+    {
+        var tiles = _maps.GetAllTilesEnumerator(_gridUid, _grid);
+        var replacements = new List<(Vector2i Index, Tile Tile)>();
+        var reserved = new HashSet<Vector2i>();
+
+        while (tiles.MoveNext(out var tileRef))
+        {
+            var node = tileRef.Value.GridIndices;
+
+            if (reservedTiles.Contains(node))
+                continue;
+
+            foreach (var layer in gen.Layers)
+            {
+                var value = layer.Noise.GetNoise(node.X, node.Y);
+
+                if (value < layer.Threshold)
+                    continue;
+
+                Tile tile;
+
+                if (random.Prob(gen.VariantWeight))
+                {
+                    tile = _tileDefManager.GetVariantTile(_prototype.Index(layer.Tile), random);
+                }
+                else
+                {
+                    tile = new Tile(_prototype.Index(layer.Tile).TileId);
+                }
+
+                replacements.Add((node, tile));
+                reserved.Add(node);
+                break;
+            }
+
+            await SuspendDungeon();
+        }
+
+        _maps.SetTiles(_gridUid, _grid, replacements);
+        return new Dungeon(new List<DungeonRoom>()
+        {
+            new DungeonRoom(reserved, _position, Box2i.Empty, new HashSet<Vector2i>()),
+        });
+    }
+}
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.MobDunGen.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.MobDunGen.cs
new file mode 100644
index 00000000000..150849d2c51
--- /dev/null
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.MobDunGen.cs
@@ -0,0 +1,58 @@
+using System.Threading.Tasks;
+using Content.Server.Ghost.Roles.Components;
+using Content.Server.NPC.Components;
+using Content.Server.NPC.Systems;
+using Content.Shared.Physics;
+using Content.Shared.Procedural;
+using Content.Shared.Procedural.DungeonLayers;
+using Content.Shared.Storage;
+using Robust.Shared.Collections;
+using Robust.Shared.Random;
+
+namespace Content.Server.Procedural.DungeonJob;
+
+public sealed partial class DungeonJob
+{
+    private async Task PostGen(
+        MobsDunGen gen,
+        Dungeon dungeon,
+        Random random)
+    {
+        var availableRooms = new ValueList<DungeonRoom>();
+        availableRooms.AddRange(dungeon.Rooms);
+        var availableTiles = new ValueList<Vector2i>(dungeon.AllTiles);
+
+        var entities = EntitySpawnCollection.GetSpawns(gen.Groups, random);
+        var count = random.Next(gen.MinCount, gen.MaxCount + 1);
+        var npcs = _entManager.System<NPCSystem>();
+
+        for (var i = 0; i < count; i++)
+        {
+            while (availableTiles.Count > 0)
+            {
+                var tile = availableTiles.RemoveSwap(random.Next(availableTiles.Count));
+
+                if (!_anchorable.TileFree(_grid, tile, (int) CollisionGroup.MachineLayer,
+                        (int) CollisionGroup.MachineLayer))
+                {
+                    continue;
+                }
+
+                foreach (var ent in entities)
+                {
+                    var uid = _entManager.SpawnAtPosition(ent, _maps.GridTileToLocal(_gridUid, _grid, tile));
+                    _entManager.RemoveComponent<GhostRoleComponent>(uid);
+                    _entManager.RemoveComponent<GhostTakeoverAvailableComponent>(uid);
+                    npcs.SleepNPC(uid);
+                }
+
+                break;
+            }
+
+            await SuspendDungeon();
+
+            if (!ValidateResume())
+                return;
+        }
+    }
+}
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.OreDunGen.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.OreDunGen.cs
new file mode 100644
index 00000000000..e89c1d7e470
--- /dev/null
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.OreDunGen.cs
@@ -0,0 +1,149 @@
+using System.Threading.Tasks;
+using Content.Shared.Procedural;
+using Content.Shared.Procedural.Components;
+using Content.Shared.Procedural.DungeonLayers;
+using Robust.Shared.Collections;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server.Procedural.DungeonJob;
+
+public sealed partial class DungeonJob
+{
+    /// <summary>
+    /// <see cref="OreDunGen"/>
+    /// </summary>
+    private async Task PostGen(
+        OreDunGen gen,
+        Dungeon dungeon,
+        Random random)
+    {
+        // Doesn't use dungeon data because layers and we don't need top-down support at the moment.
+
+        var emptyTiles = false;
+        var replaceEntities = new Dictionary<Vector2i, EntityUid>();
+        var availableTiles = new List<Vector2i>();
+
+        foreach (var node in dungeon.AllTiles)
+        {
+            // Empty tile, skip if relevant.
+            if (!emptyTiles && (!_maps.TryGetTile(_grid, node, out var tile) || tile.IsEmpty))
+                continue;
+
+            // Check if it's a valid spawn, if so then use it.
+            var enumerator = _maps.GetAnchoredEntitiesEnumerator(_gridUid, _grid, node);
+            var found = false;
+
+            // We use existing entities as a mark to spawn in place
+            // OR
+            // We check for any existing entities to see if we can spawn there.
+            while (enumerator.MoveNext(out var uid))
+            {
+                // We can't replace so just stop here.
+                if (gen.Replacement == null)
+                    break;
+
+                var prototype = _entManager.GetComponent<MetaDataComponent>(uid.Value).EntityPrototype;
+
+                if (prototype?.ID == gen.Replacement)
+                {
+                    replaceEntities[node] = uid.Value;
+                    found = true;
+                    break;
+                }
+            }
+
+            if (!found)
+                continue;
+
+            // Add it to valid nodes.
+            availableTiles.Add(node);
+
+            await SuspendDungeon();
+
+            if (!ValidateResume())
+                return;
+        }
+
+        var remapping = new Dictionary<EntProtoId, EntProtoId>();
+
+        // TODO: Move this to engine
+        if (_prototype.TryIndex(gen.Entity, out var proto) &&
+            proto.Components.TryGetComponent("EntityRemap", out var comps))
+        {
+            var remappingComp = (EntityRemapComponent) comps;
+            remapping = remappingComp.Mask;
+        }
+
+        var frontier = new ValueList<Vector2i>(32);
+
+        // Iterate the group counts and pathfind out each group.
+        for (var i = 0; i < gen.Count; i++)
+        {
+            await SuspendDungeon();
+
+            if (!ValidateResume())
+                return;
+
+            var groupSize = random.Next(gen.MinGroupSize, gen.MaxGroupSize + 1);
+
+            // While we have remaining tiles keep iterating
+            while (groupSize >= 0 && availableTiles.Count > 0)
+            {
+                var startNode = random.PickAndTake(availableTiles);
+                frontier.Clear();
+                frontier.Add(startNode);
+
+                // This essentially may lead to a vein being split in multiple areas but the count matters more than position.
+                while (frontier.Count > 0 && groupSize >= 0)
+                {
+                    // Need to pick a random index so we don't just get straight lines of ores.
+                    var frontierIndex = random.Next(frontier.Count);
+                    var node = frontier[frontierIndex];
+                    frontier.RemoveSwap(frontierIndex);
+                    availableTiles.Remove(node);
+
+                    // Add neighbors if they're valid, worst case we add no more and pick another random seed tile.
+                    for (var x = -1; x <= 1; x++)
+                    {
+                        for (var y = -1; y <= 1; y++)
+                        {
+                            if (x != 0 && y != 0)
+                                continue;
+
+                            var neighbor = new Vector2i(node.X + x, node.Y + y);
+
+                            if (frontier.Contains(neighbor) || !availableTiles.Contains(neighbor))
+                                continue;
+
+                            frontier.Add(neighbor);
+                        }
+                    }
+
+                    var prototype = gen.Entity;
+
+                    if (replaceEntities.TryGetValue(node, out var existingEnt))
+                    {
+                        var existingProto = _entManager.GetComponent<MetaDataComponent>(existingEnt).EntityPrototype;
+                        _entManager.DeleteEntity(existingEnt);
+
+                        if (existingProto != null && remapping.TryGetValue(existingProto.ID, out var remapped))
+                        {
+                            prototype = remapped;
+                        }
+                    }
+
+                    // Tile valid salad so add it.
+                    _entManager.SpawnAtPosition(prototype, _maps.GridTileToLocal(_gridUid, _grid, node));
+
+                    groupSize--;
+                }
+            }
+
+            if (groupSize > 0)
+            {
+                _sawmill.Warning($"Found remaining group size for ore veins!");
+            }
+        }
+    }
+}
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGen.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGen.cs
new file mode 100644
index 00000000000..b1c83346d87
--- /dev/null
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGen.cs
@@ -0,0 +1,134 @@
+using System.Numerics;
+using Content.Shared.Procedural;
+using Robust.Shared.Collections;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Physics.Components;
+
+namespace Content.Server.Procedural.DungeonJob;
+
+public sealed partial class DungeonJob
+{
+    /*
+     * Run after the main dungeon generation
+     */
+
+    private bool HasWall(Vector2i tile)
+    {
+        var anchored = _maps.GetAnchoredEntitiesEnumerator(_gridUid, _grid, tile);
+
+        while (anchored.MoveNext(out var uid))
+        {
+            if (_tags.HasTag(uid.Value, "Wall"))
+                return true;
+        }
+
+        return false;
+    }
+
+    private void BuildCorridorExterior(Dungeon dungeon)
+    {
+        var exterior = dungeon.CorridorExteriorTiles;
+
+        // Just ignore entrances or whatever for now.
+        foreach (var tile in dungeon.CorridorTiles)
+        {
+            for (var x = -1; x <= 1; x++)
+            {
+                for (var y = -1; y <= 1; y++)
+                {
+                    var neighbor = new Vector2i(tile.X + x, tile.Y + y);
+
+                    if (dungeon.CorridorTiles.Contains(neighbor) ||
+                        dungeon.RoomExteriorTiles.Contains(neighbor) ||
+                        dungeon.RoomTiles.Contains(neighbor) ||
+                        dungeon.Entrances.Contains(neighbor))
+                    {
+                        continue;
+                    }
+
+                    exterior.Add(neighbor);
+                }
+            }
+        }
+    }
+
+    private void WidenCorridor(Dungeon dungeon, float width, ICollection<Vector2i> corridorTiles)
+    {
+        var expansion = width - 2;
+
+        // Widen the path
+        if (expansion >= 1)
+        {
+            var toAdd = new ValueList<Vector2i>();
+
+            foreach (var node in corridorTiles)
+            {
+                // Uhhh not sure on the cleanest way to do this but tl;dr we don't want to hug
+                // exterior walls and make the path smaller.
+
+                for (var x = -expansion; x <= expansion; x++)
+                {
+                    for (var y = -expansion; y <= expansion; y++)
+                    {
+                        var neighbor = new Vector2(node.X + x, node.Y + y).Floored();
+
+                        // Diagonals still matter here.
+                        if (dungeon.RoomTiles.Contains(neighbor) ||
+                            dungeon.RoomExteriorTiles.Contains(neighbor))
+                        {
+                            // Try
+
+                            continue;
+                        }
+
+                        toAdd.Add(neighbor);
+                    }
+                }
+            }
+
+            foreach (var node in toAdd)
+            {
+                corridorTiles.Add(node);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Removes any unwanted obstacles around a door tile.
+    /// </summary>
+    private void ClearDoor(Dungeon dungeon, MapGridComponent grid, Vector2i indices, bool strict = false)
+    {
+        var flags = strict
+            ? LookupFlags.Dynamic | LookupFlags.Static | LookupFlags.StaticSundries
+            : LookupFlags.Dynamic | LookupFlags.Static;
+
+        for (var x = -1; x <= 1; x++)
+        {
+            for (var y = -1; y <= 1; y++)
+            {
+                if (x != 0 && y != 0)
+                    continue;
+
+                var neighbor = new Vector2i(indices.X + x, indices.Y + y);
+
+                if (!dungeon.RoomTiles.Contains(neighbor))
+                    continue;
+
+                // Shrink by 0.01 to avoid polygon overlap from neighboring tiles.
+                // TODO: Uhh entityset re-usage.
+                foreach (var ent in _lookup.GetEntitiesIntersecting(_gridUid, new Box2(neighbor * grid.TileSize, (neighbor + 1) * grid.TileSize).Enlarged(-0.1f), flags))
+                {
+                    if (!_physicsQuery.TryGetComponent(ent, out var physics) ||
+                        !physics.Hard ||
+                        (DungeonSystem.CollisionMask & physics.CollisionLayer) == 0x0 &&
+                        (DungeonSystem.CollisionLayer & physics.CollisionMask) == 0x0)
+                    {
+                        continue;
+                    }
+
+                    _entManager.DeleteEntity(ent);
+                }
+            }
+        }
+    }
+}
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenAutoCabling.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenAutoCabling.cs
new file mode 100644
index 00000000000..aaea23ddd56
--- /dev/null
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenAutoCabling.cs
@@ -0,0 +1,162 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Content.Server.NodeContainer;
+using Content.Shared.Procedural;
+using Content.Shared.Procedural.PostGeneration;
+using Robust.Shared.Random;
+
+namespace Content.Server.Procedural.DungeonJob;
+
+public sealed partial class DungeonJob
+{
+    /// <summary>
+    /// <see cref="AutoCablingDunGen"/>
+    /// </summary>
+    private async Task PostGen(AutoCablingDunGen gen, DungeonData data, Dungeon dungeon, HashSet<Vector2i> reservedTiles, Random random)
+    {
+        if (!data.Entities.TryGetValue(DungeonDataKey.Cabling, out var ent))
+        {
+            LogDataError(typeof(AutoCablingDunGen));
+            return;
+        }
+
+        // There's a lot of ways you could do this.
+        // For now we'll just connect every LV cable in the dungeon.
+        var cableTiles = new HashSet<Vector2i>();
+        var allTiles = new HashSet<Vector2i>(dungeon.CorridorTiles);
+        allTiles.UnionWith(dungeon.RoomTiles);
+        allTiles.UnionWith(dungeon.RoomExteriorTiles);
+        allTiles.UnionWith(dungeon.CorridorExteriorTiles);
+        var nodeQuery = _entManager.GetEntityQuery<NodeContainerComponent>();
+
+        // Gather existing nodes
+        foreach (var tile in allTiles)
+        {
+            var anchored = _maps.GetAnchoredEntitiesEnumerator(_gridUid, _grid, tile);
+
+            while (anchored.MoveNext(out var anc))
+            {
+                if (!nodeQuery.TryGetComponent(anc, out var nodeContainer) ||
+                   !nodeContainer.Nodes.ContainsKey("power"))
+                {
+                    continue;
+                }
+
+                cableTiles.Add(tile);
+                break;
+            }
+        }
+
+        // Iterating them all might be expensive.
+        await SuspendDungeon();
+
+        if (!ValidateResume())
+            return;
+
+        var startNodes = new List<Vector2i>(cableTiles);
+        random.Shuffle(startNodes);
+        var start = startNodes[0];
+        var remaining = new HashSet<Vector2i>(startNodes);
+        var frontier = new PriorityQueue<Vector2i, float>();
+        frontier.Enqueue(start, 0f);
+        var cameFrom = new Dictionary<Vector2i, Vector2i>();
+        var costSoFar = new Dictionary<Vector2i, float>();
+        var lastDirection = new Dictionary<Vector2i, Direction>();
+        costSoFar[start] = 0f;
+        lastDirection[start] = Direction.Invalid;
+
+        while (remaining.Count > 0)
+        {
+            if (frontier.Count == 0)
+            {
+                var newStart = remaining.First();
+                frontier.Enqueue(newStart, 0f);
+                lastDirection[newStart] = Direction.Invalid;
+            }
+
+            var node = frontier.Dequeue();
+
+            if (remaining.Remove(node))
+            {
+                var weh = node;
+
+                while (cameFrom.TryGetValue(weh, out var receiver))
+                {
+                    cableTiles.Add(weh);
+                    weh = receiver;
+
+                    if (weh == start)
+                        break;
+                }
+            }
+
+            if (!_maps.TryGetTileRef(_gridUid, _grid, node, out var tileRef) || tileRef.Tile.IsEmpty)
+            {
+                continue;
+            }
+
+            for (var i = 0; i < 4; i++)
+            {
+                var dir = (Direction) (i * 2);
+
+                var neighbor = node + dir.ToIntVec();
+                var tileCost = 1f;
+
+                // Prefer straight lines.
+                if (lastDirection[node] != dir)
+                {
+                    tileCost *= 1.1f;
+                }
+
+                if (cableTiles.Contains(neighbor))
+                {
+                    tileCost *= 0.1f;
+                }
+
+                // Prefer tiles without walls on them
+                if (HasWall(neighbor))
+                {
+                    tileCost *= 20f;
+                }
+
+                var gScore = costSoFar[node] + tileCost;
+
+                if (costSoFar.TryGetValue(neighbor, out var nextValue) && gScore >= nextValue)
+                {
+                    continue;
+                }
+
+                cameFrom[neighbor] = node;
+                costSoFar[neighbor] = gScore;
+                lastDirection[neighbor] = dir;
+                frontier.Enqueue(neighbor, gScore);
+            }
+        }
+
+        foreach (var tile in cableTiles)
+        {
+            if (reservedTiles.Contains(tile))
+                continue;
+
+            var anchored = _maps.GetAnchoredEntitiesEnumerator(_gridUid, _grid, tile);
+            var found = false;
+
+            while (anchored.MoveNext(out var anc))
+            {
+                if (!nodeQuery.TryGetComponent(anc, out var nodeContainer) ||
+                    !nodeContainer.Nodes.ContainsKey("power"))
+                {
+                    continue;
+                }
+
+                found = true;
+                break;
+            }
+
+            if (found)
+                continue;
+
+            _entManager.SpawnEntity(ent, _maps.GridTileToLocal(_gridUid, _grid, tile));
+        }
+    }
+}
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBiome.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBiome.cs
new file mode 100644
index 00000000000..65f6d2d14f9
--- /dev/null
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBiome.cs
@@ -0,0 +1,67 @@
+using System.Threading.Tasks;
+using Content.Server.Parallax;
+using Content.Shared.Parallax.Biomes;
+using Content.Shared.Procedural;
+using Content.Shared.Procedural.PostGeneration;
+using Robust.Shared.Map;
+using Robust.Shared.Utility;
+
+namespace Content.Server.Procedural.DungeonJob;
+
+public sealed partial class DungeonJob
+{
+    /// <summary>
+    /// <see cref="BiomeDunGen"/>
+    /// </summary>
+    private async Task PostGen(BiomeDunGen dunGen, DungeonData data, Dungeon dungeon, HashSet<Vector2i> reservedTiles, Random random)
+    {
+        if (_entManager.TryGetComponent(_gridUid, out BiomeComponent? biomeComp))
+            return;
+
+        biomeComp = _entManager.AddComponent<BiomeComponent>(_gridUid);
+        var biomeSystem = _entManager.System<BiomeSystem>();
+        biomeSystem.SetTemplate(_gridUid, biomeComp, _prototype.Index(dunGen.BiomeTemplate));
+        var seed = random.Next();
+        var xformQuery = _entManager.GetEntityQuery<TransformComponent>();
+
+        foreach (var node in dungeon.RoomTiles)
+        {
+            if (reservedTiles.Contains(node))
+                continue;
+
+            // Need to set per-tile to override data.
+            if (biomeSystem.TryGetTile(node, biomeComp.Layers, seed, _grid, out var tile))
+            {
+                _maps.SetTile(_gridUid, _grid, node, tile.Value);
+            }
+
+            if (biomeSystem.TryGetDecals(node, biomeComp.Layers, seed, _grid, out var decals))
+            {
+                foreach (var decal in decals)
+                {
+                    _decals.TryAddDecal(decal.ID, new EntityCoordinates(_gridUid, decal.Position), out _);
+                }
+            }
+
+            if (biomeSystem.TryGetEntity(node, biomeComp, _grid, out var entityProto))
+            {
+                var ent = _entManager.SpawnEntity(entityProto, new EntityCoordinates(_gridUid, node + _grid.TileSizeHalfVector));
+                var xform = xformQuery.Get(ent);
+
+                if (!xform.Comp.Anchored)
+                {
+                    _transform.AnchorEntity(ent, xform);
+                }
+
+                // TODO: Engine bug with SpawnAtPosition
+                DebugTools.Assert(xform.Comp.Anchored);
+            }
+
+            await SuspendDungeon();
+            if (!ValidateResume())
+                return;
+        }
+
+        biomeComp.Enabled = false;
+    }
+}
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBiomeMarkerLayer.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBiomeMarkerLayer.cs
new file mode 100644
index 00000000000..fb0eaa01573
--- /dev/null
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBiomeMarkerLayer.cs
@@ -0,0 +1,105 @@
+using System.Threading.Tasks;
+using Content.Server.Parallax;
+using Content.Shared.Parallax.Biomes;
+using Content.Shared.Parallax.Biomes.Markers;
+using Content.Shared.Procedural;
+using Content.Shared.Procedural.PostGeneration;
+using Content.Shared.Random.Helpers;
+using Robust.Shared.Map;
+using Robust.Shared.Utility;
+
+namespace Content.Server.Procedural.DungeonJob;
+
+public sealed partial class DungeonJob
+{
+    /// <summary>
+    /// <see cref="BiomeMarkerLayerDunGen"/>
+    /// </summary>
+    private async Task PostGen(BiomeMarkerLayerDunGen dunGen, DungeonData data, Dungeon dungeon, HashSet<Vector2i> reservedTiles, Random random)
+    {
+        // If we're adding biome then disable it and just use for markers.
+        if (_entManager.EnsureComponent(_gridUid, out BiomeComponent biomeComp))
+        {
+            biomeComp.Enabled = false;
+        }
+
+        var biomeSystem = _entManager.System<BiomeSystem>();
+        var weightedRandom = _prototype.Index(dunGen.MarkerTemplate);
+        var xformQuery = _entManager.GetEntityQuery<TransformComponent>();
+        var templates = new Dictionary<string, int>();
+
+        for (var i = 0; i < dunGen.Count; i++)
+        {
+            var template = weightedRandom.Pick(random);
+            var count = templates.GetOrNew(template);
+            count++;
+            templates[template] = count;
+        }
+
+        foreach (var (template, count) in templates)
+        {
+            var markerTemplate = _prototype.Index<BiomeMarkerLayerPrototype>(template);
+
+            var bounds = new Box2i();
+
+            foreach (var tile in dungeon.RoomTiles)
+            {
+                bounds = bounds.UnionTile(tile);
+            }
+
+            await SuspendDungeon();
+            if (!ValidateResume())
+                return;
+
+            biomeSystem.GetMarkerNodes(_gridUid, biomeComp, _grid, markerTemplate, true, bounds, count,
+                random, out var spawnSet, out var existing, false);
+
+            await SuspendDungeon();
+            if (!ValidateResume())
+                return;
+
+            var checkTile = reservedTiles.Count > 0;
+
+            foreach (var ent in existing)
+            {
+                if (checkTile && reservedTiles.Contains(_maps.LocalToTile(_gridUid, _grid, _xformQuery.GetComponent(ent).Coordinates)))
+                {
+                    continue;
+                }
+
+                _entManager.DeleteEntity(ent);
+
+                await SuspendDungeon();
+                if (!ValidateResume())
+                    return;
+            }
+
+            foreach (var (node, mask) in spawnSet)
+            {
+                if (reservedTiles.Contains(node))
+                    continue;
+
+                string? proto;
+
+                if (mask != null && markerTemplate.EntityMask.TryGetValue(mask, out var maskedProto))
+                {
+                    proto = maskedProto;
+                }
+                else
+                {
+                    proto = markerTemplate.Prototype;
+                }
+
+                var ent = _entManager.SpawnAtPosition(proto, new EntityCoordinates(_gridUid, node + _grid.TileSizeHalfVector));
+                var xform = xformQuery.Get(ent);
+
+                if (!xform.Comp.Anchored)
+                    _transform.AnchorEntity(ent, xform);
+
+                await SuspendDungeon();
+                if (!ValidateResume())
+                    return;
+            }
+        }
+    }
+}
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBoundaryWall.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBoundaryWall.cs
new file mode 100644
index 00000000000..84697a56bc7
--- /dev/null
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBoundaryWall.cs
@@ -0,0 +1,113 @@
+using System.Threading.Tasks;
+using Content.Shared.Maps;
+using Content.Shared.Procedural;
+using Content.Shared.Procedural.PostGeneration;
+using Robust.Shared.Map;
+using Robust.Shared.Utility;
+
+namespace Content.Server.Procedural.DungeonJob;
+
+public sealed partial class DungeonJob
+{
+    /// <summary>
+    /// <see cref="BoundaryWallDunGen"/>
+    /// </summary>
+    private async Task PostGen(BoundaryWallDunGen gen, DungeonData data, Dungeon dungeon, HashSet<Vector2i> reservedTiles, Random random)
+    {
+        if (!data.Tiles.TryGetValue(DungeonDataKey.FallbackTile, out var protoTileDef) ||
+            !data.Entities.TryGetValue(DungeonDataKey.Walls, out var wall))
+        {
+            _sawmill.Error($"Error finding dungeon data for {nameof(gen)}");
+            return;
+        }
+
+        var tileDef = _tileDefManager[protoTileDef];
+        var tiles = new List<(Vector2i Index, Tile Tile)>(dungeon.RoomExteriorTiles.Count);
+
+        if (!data.Entities.TryGetValue(DungeonDataKey.CornerWalls, out var cornerWall))
+        {
+            cornerWall = wall;
+        }
+
+        if (cornerWall == default)
+        {
+            cornerWall = wall;
+        }
+
+        // Spawn wall outline
+        // - Tiles first
+        foreach (var neighbor in dungeon.RoomExteriorTiles)
+        {
+            DebugTools.Assert(!dungeon.RoomTiles.Contains(neighbor));
+
+            if (dungeon.Entrances.Contains(neighbor))
+                continue;
+
+            if (!_anchorable.TileFree(_grid, neighbor, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
+                continue;
+
+            tiles.Add((neighbor, _tile.GetVariantTile((ContentTileDefinition) tileDef, random)));
+        }
+
+        foreach (var index in dungeon.CorridorExteriorTiles)
+        {
+            if (dungeon.RoomTiles.Contains(index))
+                continue;
+
+            if (!_anchorable.TileFree(_grid, index, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
+                continue;
+
+            tiles.Add((index, _tile.GetVariantTile((ContentTileDefinition)tileDef, random)));
+        }
+
+        _maps.SetTiles(_gridUid, _grid, tiles);
+
+        // Double iteration coz we bulk set tiles for speed.
+        for (var i = 0; i < tiles.Count; i++)
+        {
+            var index = tiles[i];
+
+            if (!_anchorable.TileFree(_grid, index.Index, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
+                continue;
+
+            // If no cardinal neighbors in dungeon then we're a corner.
+            var isCorner = true;
+
+            for (var x = -1; x <= 1; x++)
+            {
+                for (var y = -1; y <= 1; y++)
+                {
+                    if (x != 0 && y != 0)
+                    {
+                        continue;
+                    }
+
+                    var neighbor = new Vector2i(index.Index.X + x, index.Index.Y + y);
+
+                    if (dungeon.RoomTiles.Contains(neighbor) || dungeon.CorridorTiles.Contains(neighbor))
+                    {
+                        isCorner = false;
+                        break;
+                    }
+                }
+
+                if (!isCorner)
+                    break;
+            }
+
+            if (isCorner)
+                _entManager.SpawnEntity(cornerWall, _maps.GridTileToLocal(_gridUid, _grid, index.Index));
+
+            if (!isCorner)
+                _entManager.SpawnEntity(wall, _maps.GridTileToLocal(_gridUid, _grid, index.Index));
+
+            if (i % 20 == 0)
+            {
+                await SuspendDungeon();
+
+                if (!ValidateResume())
+                    return;
+            }
+        }
+    }
+}
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenCornerClutter.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenCornerClutter.cs
new file mode 100644
index 00000000000..f7858298504
--- /dev/null
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenCornerClutter.cs
@@ -0,0 +1,56 @@
+using System.Threading.Tasks;
+using Content.Shared.Procedural;
+using Content.Shared.Procedural.PostGeneration;
+using Content.Shared.Storage;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Random;
+
+namespace Content.Server.Procedural.DungeonJob;
+
+public sealed partial class DungeonJob
+{
+    /// <summary>
+    /// <see cref="CornerClutterDunGen"/>
+    /// </summary>
+    private async Task PostGen(CornerClutterDunGen gen, DungeonData data, Dungeon dungeon, HashSet<Vector2i> reservedTiles, Random random)
+    {
+        if (!data.SpawnGroups.TryGetValue(DungeonDataKey.CornerClutter, out var corner))
+        {
+            _sawmill.Error(Environment.StackTrace);
+            return;
+        }
+
+        foreach (var tile in dungeon.CorridorTiles)
+        {
+            var blocked = _anchorable.TileFree(_grid, tile, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask);
+
+            if (blocked)
+                continue;
+
+            // If at least 2 adjacent tiles are blocked consider it a corner
+            for (var i = 0; i < 4; i++)
+            {
+                var dir = (Direction) (i * 2);
+                blocked = HasWall(tile + dir.ToIntVec());
+
+                if (!blocked)
+                    continue;
+
+                var nextDir = (Direction) ((i + 1) * 2 % 8);
+                blocked = HasWall(tile + nextDir.ToIntVec());
+
+                if (!blocked)
+                    continue;
+
+                if (random.Prob(gen.Chance))
+                {
+                    var coords = _maps.GridTileToLocal(_gridUid, _grid, tile);
+                    var protos = EntitySpawnCollection.GetSpawns(_prototype.Index(corner).Entries, random);
+                    _entManager.SpawnEntities(coords, protos);
+                }
+
+                break;
+            }
+        }
+    }
+}
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenCorridor.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenCorridor.cs
new file mode 100644
index 00000000000..8ea79ffe54f
--- /dev/null
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenCorridor.cs
@@ -0,0 +1,116 @@
+using System.Numerics;
+using System.Threading.Tasks;
+using Content.Shared.Maps;
+using Content.Shared.Procedural;
+using Content.Shared.Procedural.PostGeneration;
+using Robust.Shared.Map;
+
+namespace Content.Server.Procedural.DungeonJob;
+
+public sealed partial class DungeonJob
+{
+    /// <summary>
+    /// <see cref="CorridorDunGen"/>
+    /// </summary>
+    private async Task PostGen(CorridorDunGen gen, DungeonData data, Dungeon dungeon, HashSet<Vector2i> reservedTiles, Random random)
+    {
+        if (!data.Tiles.TryGetValue(DungeonDataKey.FallbackTile, out var tileProto))
+        {
+            LogDataError(typeof(CorridorDunGen));
+            return;
+        }
+
+        var entrances = new List<Vector2i>(dungeon.Rooms.Count);
+
+        // Grab entrances
+        foreach (var room in dungeon.Rooms)
+        {
+            entrances.AddRange(room.Entrances);
+        }
+
+        var edges = _dungeon.MinimumSpanningTree(entrances, random);
+        await SuspendDungeon();
+
+        if (!ValidateResume())
+            return;
+
+        // TODO: Add in say 1/3 of edges back in to add some cyclic to it.
+
+        var expansion = gen.Width - 2;
+        // Okay so tl;dr is that we don't want to cut close to rooms as it might go from 3 width to 2 width suddenly
+        // So we will add a buffer range around each room to deter pathfinding there unless necessary
+        var deterredTiles = new HashSet<Vector2i>();
+
+        if (expansion >= 1)
+        {
+            foreach (var tile in dungeon.RoomExteriorTiles)
+            {
+                for (var x = -expansion; x <= expansion; x++)
+                {
+                    for (var y = -expansion; y <= expansion; y++)
+                    {
+                        var neighbor = new Vector2(tile.X + x, tile.Y + y).Floored();
+
+                        if (dungeon.RoomTiles.Contains(neighbor) ||
+                            dungeon.RoomExteriorTiles.Contains(neighbor) ||
+                            entrances.Contains(neighbor))
+                        {
+                            continue;
+                        }
+
+                        deterredTiles.Add(neighbor);
+                    }
+                }
+            }
+        }
+
+        foreach (var room in dungeon.Rooms)
+        {
+            foreach (var entrance in room.Entrances)
+            {
+                // Just so we can still actually get in to the entrance we won't deter from a tile away from it.
+                var normal = (entrance + _grid.TileSizeHalfVector - room.Center).ToWorldAngle().GetCardinalDir().ToIntVec();
+                deterredTiles.Remove(entrance + normal);
+            }
+        }
+
+        var excludedTiles = new HashSet<Vector2i>(dungeon.RoomExteriorTiles);
+        excludedTiles.UnionWith(dungeon.RoomTiles);
+        var corridorTiles = new HashSet<Vector2i>();
+
+        _dungeon.GetCorridorNodes(corridorTiles, edges, gen.PathLimit, excludedTiles, tile =>
+        {
+            var mod = 1f;
+
+            if (corridorTiles.Contains(tile))
+            {
+                mod *= 0.1f;
+            }
+
+            if (deterredTiles.Contains(tile))
+            {
+                mod *= 2f;
+            }
+
+            return mod;
+        });
+
+        WidenCorridor(dungeon, gen.Width, corridorTiles);
+
+        var setTiles = new List<(Vector2i, Tile)>();
+        var tileDef = (ContentTileDefinition) _tileDefManager[tileProto];
+
+        foreach (var tile in corridorTiles)
+        {
+            if (reservedTiles.Contains(tile))
+                continue;
+
+            setTiles.Add((tile, _tile.GetVariantTile(tileDef, random)));
+        }
+
+        _maps.SetTiles(_gridUid, _grid, setTiles);
+        dungeon.CorridorTiles.UnionWith(corridorTiles);
+        dungeon.RefreshAllTiles();
+        BuildCorridorExterior(dungeon);
+    }
+}
diff --git a/Content.Server/Procedural/DungeonJob.CorridorClutterPost.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenCorridorClutter.cs
similarity index 83%
rename from Content.Server/Procedural/DungeonJob.CorridorClutterPost.cs
rename to Content.Server/Procedural/DungeonJob/DungeonJob.PostGenCorridorClutter.cs
index 8099157cc50..cb7c4b210c8 100644
--- a/Content.Server/Procedural/DungeonJob.CorridorClutterPost.cs
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenCorridorClutter.cs
@@ -2,16 +2,17 @@
 using Content.Shared.Procedural;
 using Content.Shared.Procedural.PostGeneration;
 using Content.Shared.Storage;
-using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Random;
 
-namespace Content.Server.Procedural;
+namespace Content.Server.Procedural.DungeonJob;
 
 public sealed partial class DungeonJob
 {
-    private async Task PostGen(CorridorClutterPostGen gen, Dungeon dungeon, EntityUid gridUid, MapGridComponent grid,
-        Random random)
+    /// <summary>
+    /// <see cref="CorridorClutterDunGen"/>
+    /// </summary>
+    private async Task PostGen(CorridorClutterDunGen gen, DungeonData data, Dungeon dungeon, HashSet<Vector2i> reservedTiles, Random random)
     {
         var physicsQuery = _entManager.GetEntityQuery<PhysicsComponent>();
         var count = (int) Math.Ceiling(dungeon.CorridorTiles.Count * gen.Chance);
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenCorridorDecalSkirting.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenCorridorDecalSkirting.cs
new file mode 100644
index 00000000000..3b516c3fa8a
--- /dev/null
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenCorridorDecalSkirting.cs
@@ -0,0 +1,124 @@
+using System.Threading.Tasks;
+using Content.Shared.Doors.Components;
+using Content.Shared.Procedural;
+using Content.Shared.Procedural.PostGeneration;
+using Robust.Shared.Collections;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Utility;
+
+namespace Content.Server.Procedural.DungeonJob;
+
+public sealed partial class DungeonJob
+{
+    /// <summary>
+    /// <see cref="CorridorDecalSkirtingDunGen"/>
+    /// </summary>
+    private async Task PostGen(CorridorDecalSkirtingDunGen decks, DungeonData data, Dungeon dungeon, HashSet<Vector2i> reservedTiles, Random random)
+    {
+        if (!data.Colors.TryGetValue(DungeonDataKey.Decals, out var color))
+        {
+            _sawmill.Error(Environment.StackTrace);
+        }
+
+        var directions = new ValueList<DirectionFlag>(4);
+        var pocketDirections = new ValueList<Direction>(4);
+        var doorQuery = _entManager.GetEntityQuery<DoorComponent>();
+        var physicsQuery = _entManager.GetEntityQuery<PhysicsComponent>();
+        var offset = -_grid.TileSizeHalfVector;
+
+        foreach (var tile in dungeon.CorridorTiles)
+        {
+            DebugTools.Assert(!dungeon.RoomTiles.Contains(tile));
+            directions.Clear();
+
+            // Do cardinals 1 step
+            // Do corners the other step
+            for (var i = 0; i < 4; i++)
+            {
+                var dir = (DirectionFlag) Math.Pow(2, i);
+                var neighbor = tile + dir.AsDir().ToIntVec();
+
+                var anc = _maps.GetAnchoredEntitiesEnumerator(_gridUid, _grid, neighbor);
+
+                while (anc.MoveNext(out var ent))
+                {
+                    if (!physicsQuery.TryGetComponent(ent, out var physics) ||
+                        !physics.CanCollide ||
+                        !physics.Hard ||
+                        doorQuery.HasComponent(ent.Value))
+                    {
+                        continue;
+                    }
+
+                    directions.Add(dir);
+                    break;
+                }
+            }
+
+            // Pockets
+            if (directions.Count == 0)
+            {
+                pocketDirections.Clear();
+
+                for (var i = 1; i < 5; i++)
+                {
+                    var dir = (Direction) (i * 2 - 1);
+                    var neighbor = tile + dir.ToIntVec();
+
+                    var anc = _maps.GetAnchoredEntitiesEnumerator(_gridUid, _grid, neighbor);
+
+                    while (anc.MoveNext(out var ent))
+                    {
+                        if (!physicsQuery.TryGetComponent(ent, out var physics) ||
+                            !physics.CanCollide ||
+                            !physics.Hard ||
+                            doorQuery.HasComponent(ent.Value))
+                        {
+                            continue;
+                        }
+
+                        pocketDirections.Add(dir);
+                        break;
+                    }
+                }
+
+                if (pocketDirections.Count == 1)
+                {
+                    if (decks.PocketDecals.TryGetValue(pocketDirections[0], out var cDir))
+                    {
+                        // Decals not being centered biting my ass again
+                        var gridPos = _maps.GridTileToLocal(_gridUid, _grid, tile).Offset(offset);
+                        _decals.TryAddDecal(cDir, gridPos, out _, color: color);
+                    }
+                }
+
+                continue;
+            }
+
+            if (directions.Count == 1)
+            {
+                if (decks.CardinalDecals.TryGetValue(directions[0], out var cDir))
+                {
+                    // Decals not being centered biting my ass again
+                    var gridPos = _maps.GridTileToLocal(_gridUid, _grid, tile).Offset(offset);
+                    _decals.TryAddDecal(cDir, gridPos, out _, color: color);
+                }
+
+                continue;
+            }
+
+            // Corners
+            if (directions.Count == 2)
+            {
+                // Auehghegueugegegeheh help me
+                var dirFlag = directions[0] | directions[1];
+
+                if (decks.CornerDecals.TryGetValue(dirFlag, out var cDir))
+                {
+                    var gridPos = _maps.GridTileToLocal(_gridUid, _grid, tile).Offset(offset);
+                    _decals.TryAddDecal(cDir, gridPos, out _, color: color);
+                }
+            }
+        }
+    }
+}
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenDungeonConnector.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenDungeonConnector.cs
new file mode 100644
index 00000000000..917b1ffc9ca
--- /dev/null
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenDungeonConnector.cs
@@ -0,0 +1,6 @@
+namespace Content.Server.Procedural.DungeonJob;
+
+public sealed partial class DungeonJob
+{
+
+}
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenDungeonEntrance.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenDungeonEntrance.cs
new file mode 100644
index 00000000000..abc52f07c6c
--- /dev/null
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenDungeonEntrance.cs
@@ -0,0 +1,114 @@
+using System.Threading.Tasks;
+using Content.Shared.Maps;
+using Content.Shared.Procedural;
+using Content.Shared.Procedural.PostGeneration;
+using Content.Shared.Storage;
+using Robust.Shared.Random;
+
+namespace Content.Server.Procedural.DungeonJob;
+
+public sealed partial class DungeonJob
+{
+    /// <summary>
+    /// <see cref="DungeonEntranceDunGen"/>
+    /// </summary>
+    private async Task PostGen(DungeonEntranceDunGen gen, DungeonData data, Dungeon dungeon, HashSet<Vector2i> reservedTiles, Random random)
+    {
+        if (!data.Tiles.TryGetValue(DungeonDataKey.FallbackTile, out var tileProto) ||
+            !data.SpawnGroups.TryGetValue(DungeonDataKey.Entrance, out var entrance))
+        {
+            LogDataError(typeof(DungeonEntranceDunGen));
+            return;
+        }
+
+        var rooms = new List<DungeonRoom>(dungeon.Rooms);
+        var roomTiles = new List<Vector2i>();
+        var tileDef = (ContentTileDefinition) _tileDefManager[tileProto];
+
+        for (var i = 0; i < gen.Count; i++)
+        {
+            var roomIndex = random.Next(rooms.Count);
+            var room = rooms[roomIndex];
+
+            // Move out 3 tiles in a direction away from center of the room
+            // If none of those intersect another tile it's probably external
+            // TODO: Maybe need to take top half of furthest rooms in case there's interior exits?
+            roomTiles.AddRange(room.Exterior);
+            random.Shuffle(roomTiles);
+
+            foreach (var tile in roomTiles)
+            {
+                var isValid = false;
+
+                // Check if one side is dungeon and the other side is nothing.
+                for (var j = 0; j < 4; j++)
+                {
+                    var dir = (Direction) (j * 2);
+                    var oppositeDir = dir.GetOpposite();
+                    var dirVec = tile + dir.ToIntVec();
+                    var oppositeDirVec = tile + oppositeDir.ToIntVec();
+
+                    if (!dungeon.RoomTiles.Contains(dirVec))
+                    {
+                        continue;
+                    }
+
+                    if (dungeon.RoomTiles.Contains(oppositeDirVec) ||
+                        dungeon.RoomExteriorTiles.Contains(oppositeDirVec) ||
+                        dungeon.CorridorExteriorTiles.Contains(oppositeDirVec) ||
+                        dungeon.CorridorTiles.Contains(oppositeDirVec))
+                    {
+                        continue;
+                    }
+
+                    // Check if exterior spot free.
+                    if (!_anchorable.TileFree(_grid, tile, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
+                    {
+                        continue;
+                    }
+
+                    // Check if interior spot free (no guarantees on exterior but ClearDoor should handle it)
+                    if (!_anchorable.TileFree(_grid, dirVec, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
+                    {
+                        continue;
+                    }
+
+                    // Valid pick!
+                    isValid = true;
+
+                    // Entrance wew
+                    _maps.SetTile(_gridUid, _grid, tile, _tile.GetVariantTile(tileDef, random));
+                    ClearDoor(dungeon, _grid, tile);
+                    var gridCoords = _maps.GridTileToLocal(_gridUid, _grid, tile);
+                    // Need to offset the spawn to avoid spawning in the room.
+
+                    foreach (var ent in EntitySpawnCollection.GetSpawns(_prototype.Index(entrance).Entries, random))
+                    {
+                        _entManager.SpawnAtPosition(ent, gridCoords);
+                    }
+
+                    // Clear out any biome tiles nearby to avoid blocking it
+                    foreach (var nearTile in _maps.GetLocalTilesIntersecting(_gridUid, _grid, new Circle(gridCoords.Position, 1.5f), false))
+                    {
+                        if (dungeon.RoomTiles.Contains(nearTile.GridIndices) ||
+                            dungeon.RoomExteriorTiles.Contains(nearTile.GridIndices) ||
+                            dungeon.CorridorTiles.Contains(nearTile.GridIndices) ||
+                            dungeon.CorridorExteriorTiles.Contains(nearTile.GridIndices))
+                        {
+                            continue;
+                        }
+
+                        _maps.SetTile(_gridUid, _grid, nearTile.GridIndices, _tile.GetVariantTile(tileDef, random));
+                    }
+
+                    break;
+                }
+
+                if (isValid)
+                    break;
+            }
+
+            roomTiles.Clear();
+        }
+    }
+}
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenEntranceFlank.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenEntranceFlank.cs
new file mode 100644
index 00000000000..3a1c7a37793
--- /dev/null
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenEntranceFlank.cs
@@ -0,0 +1,58 @@
+using System.Threading.Tasks;
+using Content.Shared.Maps;
+using Content.Shared.Procedural;
+using Content.Shared.Procedural.PostGeneration;
+using Content.Shared.Storage;
+using Robust.Shared.Collections;
+using Robust.Shared.Map;
+
+namespace Content.Server.Procedural.DungeonJob;
+
+public sealed partial class DungeonJob
+{
+    /// <summary>
+    /// <see cref="EntranceFlankDunGen"/>
+    /// </summary>
+    private async Task PostGen(EntranceFlankDunGen gen, DungeonData data, Dungeon dungeon, HashSet<Vector2i> reservedTiles, Random random)
+    {
+        if (!data.Tiles.TryGetValue(DungeonDataKey.FallbackTile, out var tileProto) ||
+            !data.SpawnGroups.TryGetValue(DungeonDataKey.EntranceFlank, out var flankProto))
+        {
+            _sawmill.Error($"Unable to get dungeon data for {nameof(gen)}");
+            return;
+        }
+
+        var tiles = new List<(Vector2i Index, Tile)>();
+        var tileDef = _tileDefManager[tileProto];
+        var spawnPositions = new ValueList<Vector2i>(dungeon.Rooms.Count);
+
+        foreach (var room in dungeon.Rooms)
+        {
+            foreach (var entrance in room.Entrances)
+            {
+                for (var i = 0; i < 8; i++)
+                {
+                    var dir = (Direction) i;
+                    var neighbor = entrance + dir.ToIntVec();
+
+                    if (!dungeon.RoomExteriorTiles.Contains(neighbor))
+                        continue;
+
+                    if (reservedTiles.Contains(neighbor))
+                        continue;
+
+                    tiles.Add((neighbor, _tile.GetVariantTile((ContentTileDefinition) tileDef, random)));
+                    spawnPositions.Add(neighbor);
+                }
+            }
+        }
+
+        _maps.SetTiles(_gridUid, _grid, tiles);
+        var entGroup = _prototype.Index(flankProto);
+
+        foreach (var entrance in spawnPositions)
+        {
+            _entManager.SpawnEntities(_maps.GridTileToLocal(_gridUid, _grid, entrance), EntitySpawnCollection.GetSpawns(entGroup.Entries, random));
+        }
+    }
+}
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenExternalWindow.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenExternalWindow.cs
new file mode 100644
index 00000000000..9a1b44ec91b
--- /dev/null
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenExternalWindow.cs
@@ -0,0 +1,138 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Content.Shared.Maps;
+using Content.Shared.Procedural;
+using Content.Shared.Procedural.PostGeneration;
+using Content.Shared.Storage;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Random;
+
+namespace Content.Server.Procedural.DungeonJob;
+
+public sealed partial class DungeonJob
+{
+    // (Comment refers to internal & external).
+
+    /*
+     * You may be wondering why these are different.
+     * It's because for internals we want to force it as it looks nicer and not leave it up to chance.
+     */
+
+    // TODO: Can probably combine these a bit, their differences are in really annoying to pull out spots.
+
+    /// <summary>
+    /// <see cref="ExternalWindowDunGen"/>
+    /// </summary>
+    private async Task PostGen(ExternalWindowDunGen gen, DungeonData data, Dungeon dungeon, HashSet<Vector2i> reservedTiles, Random random)
+    {
+        if (!data.Tiles.TryGetValue(DungeonDataKey.FallbackTile, out var tileProto) ||
+            !data.SpawnGroups.TryGetValue(DungeonDataKey.Window, out var windowGroup))
+        {
+            _sawmill.Error($"Unable to get dungeon data for {nameof(gen)}");
+            return;
+        }
+
+        // Iterate every tile with N chance to spawn windows on that wall per cardinal dir.
+        var chance = 0.25 / 3f;
+
+        var allExterior = new HashSet<Vector2i>(dungeon.CorridorExteriorTiles);
+        allExterior.UnionWith(dungeon.RoomExteriorTiles);
+        var validTiles = allExterior.ToList();
+        random.Shuffle(validTiles);
+
+        var tiles = new List<(Vector2i, Tile)>();
+        var tileDef = _tileDefManager[tileProto];
+        var count = Math.Floor(validTiles.Count * chance);
+        var index = 0;
+        var takenTiles = new HashSet<Vector2i>();
+
+        // There's a bunch of shit here but tl;dr
+        // - don't spawn over cap
+        // - Check if we have 3 tiles in a row that aren't corners and aren't obstructed
+        foreach (var tile in validTiles)
+        {
+            if (index > count)
+                break;
+
+            // Room tile / already used.
+            if (!_anchorable.TileFree(_grid, tile, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask) ||
+                takenTiles.Contains(tile))
+            {
+                continue;
+            }
+
+            // Check we're not on a corner
+            for (var i = 0; i < 2; i++)
+            {
+                var dir = (Direction) (i * 2);
+                var dirVec = dir.ToIntVec();
+                var isValid = true;
+
+                // Check 1 beyond either side to ensure it's not a corner.
+                for (var j = -1; j < 4; j++)
+                {
+                    var neighbor = tile + dirVec * j;
+
+                    if (!allExterior.Contains(neighbor) ||
+                        takenTiles.Contains(neighbor) ||
+                        !_anchorable.TileFree(_grid, neighbor, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
+                    {
+                        isValid = false;
+                        break;
+                    }
+
+                    // Also check perpendicular that it is free
+                    foreach (var k in new [] {2, 6})
+                    {
+                        var perp = (Direction) ((i * 2 + k) % 8);
+                        var perpVec = perp.ToIntVec();
+                        var perpTile = tile + perpVec;
+
+                        if (allExterior.Contains(perpTile) ||
+                            takenTiles.Contains(neighbor) ||
+                            !_anchorable.TileFree(_grid, perpTile, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
+                        {
+                            isValid = false;
+                            break;
+                        }
+                    }
+
+                    if (!isValid)
+                        break;
+                }
+
+                if (!isValid)
+                    continue;
+
+                for (var j = 0; j < 3; j++)
+                {
+                    var neighbor = tile + dirVec * j;
+
+                    if (reservedTiles.Contains(neighbor))
+                        continue;
+
+                    tiles.Add((neighbor, _tile.GetVariantTile((ContentTileDefinition) tileDef, random)));
+                    index++;
+                    takenTiles.Add(neighbor);
+                }
+            }
+        }
+
+        _maps.SetTiles(_gridUid, _grid, tiles);
+        index = 0;
+        var spawnEntry = _prototype.Index(windowGroup);
+
+        foreach (var tile in tiles)
+        {
+            var gridPos = _maps.GridTileToLocal(_gridUid, _grid, tile.Item1);
+
+            index += spawnEntry.Entries.Count;
+            _entManager.SpawnEntities(gridPos, EntitySpawnCollection.GetSpawns(spawnEntry.Entries, random));
+            await SuspendDungeon();
+
+            if (!ValidateResume())
+                return;
+        }
+    }
+}
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenInternalWindow.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenInternalWindow.cs
new file mode 100644
index 00000000000..d3b8c6d2f5d
--- /dev/null
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenInternalWindow.cs
@@ -0,0 +1,108 @@
+using System.Numerics;
+using System.Threading.Tasks;
+using Content.Shared.Maps;
+using Content.Shared.Procedural;
+using Content.Shared.Procedural.PostGeneration;
+using Content.Shared.Storage;
+
+namespace Content.Server.Procedural.DungeonJob;
+
+public sealed partial class DungeonJob
+{
+    /// <summary>
+    /// <see cref="InternalWindowDunGen"/>
+    /// </summary>
+    private async Task PostGen(InternalWindowDunGen gen, DungeonData data, Dungeon dungeon, HashSet<Vector2i> reservedTiles, Random random)
+    {
+        if (!data.Tiles.TryGetValue(DungeonDataKey.FallbackTile, out var tileProto) ||
+            !data.SpawnGroups.TryGetValue(DungeonDataKey.Window, out var windowGroup))
+        {
+            _sawmill.Error($"Unable to find dungeon data keys for {nameof(gen)}");
+            return;
+        }
+
+        // Iterate every room and check if there's a gap beyond it that leads to another room within N tiles
+        // If so then consider windows
+        var minDistance = 4;
+        var maxDistance = 6;
+        var tileDef = _tileDefManager[tileProto];
+        var window = _prototype.Index(windowGroup);
+
+        foreach (var room in dungeon.Rooms)
+        {
+            var validTiles = new List<Vector2i>();
+
+            for (var i = 0; i < 4; i++)
+            {
+                var dir = (DirectionFlag) Math.Pow(2, i);
+                var dirVec = dir.AsDir().ToIntVec();
+
+                foreach (var tile in room.Tiles)
+                {
+                    var tileAngle = (tile + _grid.TileSizeHalfVector - room.Center).ToAngle();
+                    var roundedAngle = Math.Round(tileAngle.Theta / (Math.PI / 2)) * (Math.PI / 2);
+
+                    var tileVec = (Vector2i) new Angle(roundedAngle).ToVec().Rounded();
+
+                    if (!tileVec.Equals(dirVec))
+                        continue;
+
+                    var valid = false;
+
+                    for (var j = 1; j < maxDistance; j++)
+                    {
+                        var edgeNeighbor = tile + dirVec * j;
+
+                        if (dungeon.RoomTiles.Contains(edgeNeighbor))
+                        {
+                            if (j < minDistance)
+                            {
+                                valid = false;
+                            }
+                            else
+                            {
+                                valid = true;
+                            }
+
+                            break;
+                        }
+                    }
+
+                    if (!valid)
+                        continue;
+
+                    var windowTile = tile + dirVec;
+
+                    if (reservedTiles.Contains(windowTile))
+                        continue;
+
+                    if (!_anchorable.TileFree(_grid, windowTile, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
+                        continue;
+
+                    validTiles.Add(windowTile);
+                }
+
+                validTiles.Sort((x, y) => (x + _grid.TileSizeHalfVector - room.Center).LengthSquared().CompareTo((y + _grid.TileSizeHalfVector - room.Center).LengthSquared()));
+
+                for (var j = 0; j < Math.Min(validTiles.Count, 3); j++)
+                {
+                    var tile = validTiles[j];
+                    var gridPos = _maps.GridTileToLocal(_gridUid, _grid, tile);
+                    _maps.SetTile(_gridUid, _grid, tile, _tile.GetVariantTile((ContentTileDefinition) tileDef, random));
+
+                    _entManager.SpawnEntities(gridPos, EntitySpawnCollection.GetSpawns(window.Entries, random));
+                }
+
+                if (validTiles.Count > 0)
+                {
+                    await SuspendDungeon();
+
+                    if (!ValidateResume())
+                        return;
+                }
+
+                validTiles.Clear();
+            }
+        }
+    }
+}
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenJunction.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenJunction.cs
new file mode 100644
index 00000000000..700406eb894
--- /dev/null
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenJunction.cs
@@ -0,0 +1,144 @@
+using System.Threading.Tasks;
+using Content.Shared.Maps;
+using Content.Shared.Procedural;
+using Content.Shared.Procedural.PostGeneration;
+using Content.Shared.Storage;
+using Robust.Shared.Map.Components;
+
+namespace Content.Server.Procedural.DungeonJob;
+
+public sealed partial class DungeonJob
+{
+    /// <summary>
+    /// <see cref="JunctionDunGen"/>
+    /// </summary>
+    private async Task PostGen(JunctionDunGen gen, DungeonData data, Dungeon dungeon, HashSet<Vector2i> reservedTiles, Random random)
+    {
+        if (!data.Tiles.TryGetValue(DungeonDataKey.FallbackTile, out var tileProto) ||
+            !data.SpawnGroups.TryGetValue(DungeonDataKey.Junction, out var junctionProto))
+        {
+            _sawmill.Error($"Dungeon data keys are missing for {nameof(gen)}");
+            return;
+        }
+
+        var tileDef = _tileDefManager[tileProto];
+        var entranceGroup = _prototype.Index(junctionProto);
+
+        // N-wide junctions
+        foreach (var tile in dungeon.CorridorTiles)
+        {
+            if (!_anchorable.TileFree(_grid, tile, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
+                continue;
+
+            // Check each direction:
+            // - Check if immediate neighbors are free
+            // - Check if the neighbors beyond that are not free
+            // - Then check either side if they're slightly more free
+            var exteriorWidth = (int) Math.Floor(gen.Width / 2f);
+            var width = (int) Math.Ceiling(gen.Width / 2f);
+
+            for (var i = 0; i < 2; i++)
+            {
+                var isValid = true;
+                var neighborDir = (Direction) (i * 2);
+                var neighborVec = neighborDir.ToIntVec();
+
+                for (var j = -width; j <= width; j++)
+                {
+                    if (j == 0)
+                        continue;
+
+                    var neighbor = tile + neighborVec * j;
+
+                    // If it's an end tile then check it's occupied.
+                    if (j == -width ||
+                        j == width)
+                    {
+                        if (!HasWall(neighbor))
+                        {
+                            isValid = false;
+                            break;
+                        }
+
+                        continue;
+                    }
+
+                    // If we're not at the end tile then check it + perpendicular are free.
+                    if (!_anchorable.TileFree(_grid, neighbor, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
+                    {
+                        isValid = false;
+                        break;
+                    }
+
+                    var perp1 = tile + neighborVec * j + ((Direction) ((i * 2 + 2) % 8)).ToIntVec();
+                    var perp2 = tile + neighborVec * j + ((Direction) ((i * 2 + 6) % 8)).ToIntVec();
+
+                    if (!_anchorable.TileFree(_grid, perp1, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
+                    {
+                        isValid = false;
+                        break;
+                    }
+
+                    if (!_anchorable.TileFree(_grid, perp2, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
+                    {
+                        isValid = false;
+                        break;
+                    }
+                }
+
+                if (!isValid)
+                    continue;
+
+                // Check corners to see if either side opens up (if it's just a 1x wide corridor do nothing, needs to be a funnel.
+                foreach (var j in new [] {-exteriorWidth, exteriorWidth})
+                {
+                    var freeCount = 0;
+
+                    // Need at least 3 of 4 free
+                    for (var k = 0; k < 4; k++)
+                    {
+                        var cornerDir = (Direction) (k * 2 + 1);
+                        var cornerVec = cornerDir.ToIntVec();
+                        var cornerNeighbor = tile + neighborVec * j + cornerVec;
+
+                        if (_anchorable.TileFree(_grid, cornerNeighbor, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
+                        {
+                            freeCount++;
+                        }
+                    }
+
+                    if (freeCount < gen.Width)
+                        continue;
+
+                    // Valid!
+                    isValid = true;
+
+                    for (var x = -width + 1; x < width; x++)
+                    {
+                        var weh = tile + neighborDir.ToIntVec() * x;
+
+                        if (reservedTiles.Contains(weh))
+                            continue;
+
+                        _maps.SetTile(_gridUid, _grid, weh, _tile.GetVariantTile((ContentTileDefinition) tileDef, random));
+
+                        var coords = _maps.GridTileToLocal(_gridUid, _grid, weh);
+                        _entManager.SpawnEntities(coords, EntitySpawnCollection.GetSpawns(entranceGroup.Entries, random));
+                    }
+
+                    break;
+                }
+
+                if (isValid)
+                {
+                    await SuspendDungeon();
+
+                    if (!ValidateResume())
+                        return;
+                }
+
+                break;
+            }
+        }
+    }
+}
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenMiddleConnection.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenMiddleConnection.cs
new file mode 100644
index 00000000000..15d0f634232
--- /dev/null
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenMiddleConnection.cs
@@ -0,0 +1,147 @@
+using System.Numerics;
+using System.Threading.Tasks;
+using Content.Shared.Maps;
+using Content.Shared.Procedural;
+using Content.Shared.Procedural.PostGeneration;
+using Content.Shared.Storage;
+using Robust.Shared.Utility;
+
+namespace Content.Server.Procedural.DungeonJob;
+
+public sealed partial class DungeonJob
+{
+    /// <summary>
+    /// <see cref="MiddleConnectionDunGen"/>
+    /// </summary>
+    private async Task PostGen(MiddleConnectionDunGen gen, DungeonData data, Dungeon dungeon, HashSet<Vector2i> reservedTiles, Random random)
+    {
+        if (!data.Tiles.TryGetValue(DungeonDataKey.FallbackTile, out var tileProto) ||
+            !data.SpawnGroups.TryGetValue(DungeonDataKey.Entrance, out var entranceProto) ||
+            !_prototype.TryIndex(entranceProto, out var entrance))
+        {
+            _sawmill.Error($"Tried to run {nameof(MiddleConnectionDunGen)} without any dungeon data set which is unsupported");
+            return;
+        }
+
+        data.SpawnGroups.TryGetValue(DungeonDataKey.EntranceFlank, out var flankProto);
+        _prototype.TryIndex(flankProto, out var flank);
+
+        // Grab all of the room bounds
+        // Then, work out connections between them
+        var roomBorders = new Dictionary<DungeonRoom, HashSet<Vector2i>>(dungeon.Rooms.Count);
+
+        foreach (var room in dungeon.Rooms)
+        {
+            var roomEdges = new HashSet<Vector2i>();
+
+            foreach (var index in room.Tiles)
+            {
+                for (var x = -1; x <= 1; x++)
+                {
+                    for (var y = -1; y <= 1; y++)
+                    {
+                        // Cardinals only
+                        if (x != 0 && y != 0 ||
+                            x == 0 && y == 0)
+                        {
+                            continue;
+                        }
+
+                        var neighbor = new Vector2i(index.X + x, index.Y + y);
+
+                        if (dungeon.RoomTiles.Contains(neighbor))
+                            continue;
+
+                        if (!_anchorable.TileFree(_grid, neighbor, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
+                            continue;
+
+                        roomEdges.Add(neighbor);
+                    }
+                }
+            }
+
+            roomBorders.Add(room, roomEdges);
+        }
+
+        // Do pathfind from first room to work out graph.
+        // TODO: Optional loops
+
+        var roomConnections = new Dictionary<DungeonRoom, List<DungeonRoom>>();
+        var tileDef = _tileDefManager[tileProto];
+
+        foreach (var (room, border) in roomBorders)
+        {
+            var conns = roomConnections.GetOrNew(room);
+
+            foreach (var (otherRoom, otherBorders) in roomBorders)
+            {
+                if (room.Equals(otherRoom) ||
+                    conns.Contains(otherRoom))
+                {
+                    continue;
+                }
+
+                var flipp = new HashSet<Vector2i>(border);
+                flipp.IntersectWith(otherBorders);
+
+                if (flipp.Count == 0 ||
+                    gen.OverlapCount != -1 && flipp.Count != gen.OverlapCount)
+                    continue;
+
+                var center = Vector2.Zero;
+
+                foreach (var node in flipp)
+                {
+                    center += node + _grid.TileSizeHalfVector;
+                }
+
+                center /= flipp.Count;
+                // Weight airlocks towards center more.
+                var nodeDistances = new List<(Vector2i Node, float Distance)>(flipp.Count);
+
+                foreach (var node in flipp)
+                {
+                    nodeDistances.Add((node, (node + _grid.TileSizeHalfVector - center).LengthSquared()));
+                }
+
+                nodeDistances.Sort((x, y) => x.Distance.CompareTo(y.Distance));
+
+                var width = gen.Count;
+
+                for (var i = 0; i < nodeDistances.Count; i++)
+                {
+                    var node = nodeDistances[i].Node;
+                    var gridPos = _maps.GridTileToLocal(_gridUid, _grid, node);
+                    if (!_anchorable.TileFree(_grid, node, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
+                        continue;
+
+                    width--;
+                    _maps.SetTile(_gridUid, _grid, node, _tile.GetVariantTile((ContentTileDefinition) tileDef, random));
+
+                    if (flank != null && nodeDistances.Count - i <= 2)
+                    {
+                        _entManager.SpawnEntities(gridPos, EntitySpawnCollection.GetSpawns(flank.Entries, random));
+                    }
+                    else
+                    {
+                        // Iterate neighbors and check for blockers, if so bulldoze
+                        ClearDoor(dungeon, _grid, node);
+
+                        _entManager.SpawnEntities(gridPos, EntitySpawnCollection.GetSpawns(entrance.Entries, random));
+                    }
+
+                    if (width == 0)
+                        break;
+                }
+
+                conns.Add(otherRoom);
+                var otherConns = roomConnections.GetOrNew(otherRoom);
+                otherConns.Add(room);
+                await SuspendDungeon();
+
+                if (!ValidateResume())
+                    return;
+            }
+        }
+    }
+}
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenRoomEntrance.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenRoomEntrance.cs
new file mode 100644
index 00000000000..09d223e86cf
--- /dev/null
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenRoomEntrance.cs
@@ -0,0 +1,48 @@
+using System.Threading.Tasks;
+using Content.Shared.Maps;
+using Content.Shared.Procedural;
+using Content.Shared.Procedural.PostGeneration;
+using Content.Shared.Storage;
+using Robust.Shared.Map;
+
+namespace Content.Server.Procedural.DungeonJob;
+
+public sealed partial class DungeonJob
+{
+    /// <summary>
+    /// <see cref="RoomEntranceDunGen"/>
+    /// </summary>
+    private async Task PostGen(RoomEntranceDunGen gen, DungeonData data, Dungeon dungeon, HashSet<Vector2i> reservedTiles, Random random)
+    {
+        if (!data.Tiles.TryGetValue(DungeonDataKey.FallbackTile, out var tileProto) ||
+            !data.SpawnGroups.TryGetValue(DungeonDataKey.Entrance, out var entranceProtos) ||
+            !_prototype.TryIndex(entranceProtos, out var entranceIn))
+        {
+            LogDataError(typeof(RoomEntranceDunGen));
+            return;
+        }
+
+        var setTiles = new List<(Vector2i, Tile)>();
+        var tileDef = _tileDefManager[tileProto];
+
+        foreach (var room in dungeon.Rooms)
+        {
+            foreach (var entrance in room.Entrances)
+            {
+                setTiles.Add((entrance, _tile.GetVariantTile((ContentTileDefinition) tileDef, random)));
+            }
+        }
+
+        _maps.SetTiles(_gridUid, _grid, setTiles);
+
+        foreach (var room in dungeon.Rooms)
+        {
+            foreach (var entrance in room.Entrances)
+            {
+                _entManager.SpawnEntities(
+                    _maps.GridTileToLocal(_gridUid, _grid, entrance),
+                    EntitySpawnCollection.GetSpawns(entranceIn.Entries, random));
+            }
+        }
+    }
+}
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenSplineDungeonConnector.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenSplineDungeonConnector.cs
new file mode 100644
index 00000000000..8fe2f36665f
--- /dev/null
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenSplineDungeonConnector.cs
@@ -0,0 +1,147 @@
+using System.Numerics;
+using System.Threading.Tasks;
+using Content.Server.NPC.Pathfinding;
+using Content.Shared.Procedural;
+using Content.Shared.Procedural.PostGeneration;
+using Robust.Shared.Map;
+using Robust.Shared.Random;
+
+namespace Content.Server.Procedural.DungeonJob;
+
+public sealed partial class DungeonJob
+{
+    /// <summary>
+    /// <see cref="SplineDungeonConnectorDunGen"/>
+    /// </summary>
+    private async Task<Dungeon> PostGen(
+        SplineDungeonConnectorDunGen gen,
+        DungeonData data,
+        List<Dungeon> dungeons,
+        HashSet<Vector2i> reservedTiles,
+        Random random)
+    {
+        // TODO: The path itself use the tile
+        // Widen it randomly (probably for each tile offset it by some changing amount).
+
+        // NOOP
+        if (dungeons.Count <= 1)
+            return Dungeon.Empty;
+
+        if (!data.Tiles.TryGetValue(DungeonDataKey.FallbackTile, out var fallback) ||
+            !data.Tiles.TryGetValue(DungeonDataKey.WidenTile, out var widen))
+        {
+            LogDataError(typeof(SplineDungeonConnectorDunGen));
+            return Dungeon.Empty;
+        }
+
+        var nodes = new List<Vector2i>();
+
+        foreach (var dungeon in dungeons)
+        {
+            foreach (var room in dungeon.Rooms)
+            {
+                if (room.Entrances.Count == 0)
+                    continue;
+
+                nodes.Add(room.Entrances[0]);
+                break;
+            }
+        }
+
+        var tree = _dungeon.MinimumSpanningTree(nodes, random);
+        await SuspendDungeon();
+
+        if (!ValidateResume())
+            return Dungeon.Empty;
+
+        var tiles = new List<(Vector2i Index, Tile Tile)>();
+        var pathfinding = _entManager.System<PathfindingSystem>();
+        var allTiles = new HashSet<Vector2i>();
+        var fallbackTile = new Tile(_prototype.Index(fallback).TileId);
+
+        foreach (var pair in tree)
+        {
+            var path = pathfinding.GetSplinePath(new PathfindingSystem.SplinePathArgs()
+            {
+                Distance = gen.DivisionDistance,
+                MaxRatio = gen.VarianceMax,
+                Args = new PathfindingSystem.SimplePathArgs()
+                {
+                    Start = pair.Start,
+                    End = pair.End,
+                    TileCost = node =>
+                    {
+                        // We want these to get prioritised internally and into space if it's a space dungeon.
+                        if (_maps.TryGetTile(_grid, node, out var tile) && !tile.IsEmpty)
+                            return 1f;
+
+                        return 5f;
+                    }
+                },
+            },
+            random);
+
+            // Welp
+            if (path.Path.Count == 0)
+            {
+                _sawmill.Error($"Unable to connect spline dungeon path for {_entManager.ToPrettyString(_gridUid)} between {pair.Start} and {pair.End}");
+                continue;
+            }
+
+            await SuspendDungeon();
+
+            if (!ValidateResume())
+                return Dungeon.Empty;
+
+            var wide = pathfinding.GetWiden(new PathfindingSystem.WidenArgs()
+            {
+                Path = path.Path,
+            },
+            random);
+
+            tiles.Clear();
+            allTiles.EnsureCapacity(allTiles.Count + wide.Count);
+
+            foreach (var node in wide)
+            {
+                if (reservedTiles.Contains(node))
+                    continue;
+
+                allTiles.Add(node);
+                Tile tile;
+
+                if (random.Prob(0.9f))
+                {
+                    tile = new Tile(_prototype.Index(widen).TileId);
+                }
+                else
+                {
+                    tile = _tileDefManager.GetVariantTile(widen, random);
+                }
+
+                tiles.Add((node, tile));
+            }
+
+            _maps.SetTiles(_gridUid, _grid, tiles);
+            tiles.Clear();
+            allTiles.EnsureCapacity(allTiles.Count + path.Path.Count);
+
+            foreach (var node in path.Path)
+            {
+                if (reservedTiles.Contains(node))
+                    continue;
+
+                allTiles.Add(node);
+                tiles.Add((node, fallbackTile));
+            }
+
+            _maps.SetTiles(_gridUid, _grid, tiles);
+        }
+
+        var dungy = new Dungeon();
+        var dungyRoom = new DungeonRoom(allTiles, Vector2.Zero, Box2i.Empty, new HashSet<Vector2i>());
+        dungy.AddRoom(dungyRoom);
+
+        return dungy;
+    }
+}
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenWallMount.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenWallMount.cs
new file mode 100644
index 00000000000..afc7608d64a
--- /dev/null
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenWallMount.cs
@@ -0,0 +1,56 @@
+using System.Threading.Tasks;
+using Content.Shared.Procedural;
+using Content.Shared.Procedural.PostGeneration;
+using Content.Shared.Storage;
+using Robust.Shared.Random;
+
+namespace Content.Server.Procedural.DungeonJob;
+
+public sealed partial class DungeonJob
+{
+    /// <summary>
+    /// <see cref="WallMountDunGen"/>
+    /// </summary>
+    private async Task PostGen(WallMountDunGen gen, DungeonData data, Dungeon dungeon, HashSet<Vector2i> reservedTiles, Random random)
+    {
+        if (!data.Tiles.TryGetValue(DungeonDataKey.FallbackTile, out var tileProto))
+        {
+            _sawmill.Error($"Tried to run {nameof(WallMountDunGen)} without any dungeon data set which is unsupported");
+            return;
+        }
+
+        var tileDef = _prototype.Index(tileProto);
+        data.SpawnGroups.TryGetValue(DungeonDataKey.WallMounts, out var spawnProto);
+
+        var checkedTiles = new HashSet<Vector2i>();
+        var allExterior = new HashSet<Vector2i>(dungeon.CorridorExteriorTiles);
+        allExterior.UnionWith(dungeon.RoomExteriorTiles);
+        var count = 0;
+
+        foreach (var neighbor in allExterior)
+        {
+            // Occupado
+            if (dungeon.RoomTiles.Contains(neighbor) || checkedTiles.Contains(neighbor) || !_anchorable.TileFree(_grid, neighbor, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
+                continue;
+
+            if (!random.Prob(gen.Prob) || !checkedTiles.Add(neighbor))
+                continue;
+
+            _maps.SetTile(_gridUid, _grid, neighbor, _tile.GetVariantTile(tileDef, random));
+            var gridPos = _maps.GridTileToLocal(_gridUid, _grid, neighbor);
+            var protoNames = EntitySpawnCollection.GetSpawns(_prototype.Index(spawnProto).Entries, random);
+
+            _entManager.SpawnEntities(gridPos, protoNames);
+            count += protoNames.Count;
+
+            if (count > 20)
+            {
+                count -= 20;
+                await SuspendDungeon();
+
+                if (!ValidateResume())
+                    return;
+            }
+        }
+    }
+}
diff --git a/Content.Server/Procedural/DungeonJob.WormPost.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenWorm.cs
similarity index 88%
rename from Content.Server/Procedural/DungeonJob.WormPost.cs
rename to Content.Server/Procedural/DungeonJob/DungeonJob.PostGenWorm.cs
index 5d2271cae65..6fd00e54824 100644
--- a/Content.Server/Procedural/DungeonJob.WormPost.cs
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenWorm.cs
@@ -1,23 +1,27 @@
 using System.Linq;
-using System.Numerics;
 using System.Threading.Tasks;
 using Content.Shared.Procedural;
 using Content.Shared.Procedural.PostGeneration;
 using Robust.Shared.Collections;
 using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
-namespace Content.Server.Procedural;
+namespace Content.Server.Procedural.DungeonJob;
 
 public sealed partial class DungeonJob
 {
     /// <summary>
-    /// Tries to connect rooms via worm-like corridors.
+    /// <see cref="WormCorridorDunGen"/>
     /// </summary>
-    private async Task PostGen(WormCorridorPostGen gen, Dungeon dungeon, EntityUid gridUid, MapGridComponent grid, Random random)
+    private async Task PostGen(WormCorridorDunGen gen, DungeonData data, Dungeon dungeon, HashSet<Vector2i> reservedTiles, Random random)
     {
+        if (!data.Tiles.TryGetValue(DungeonDataKey.FallbackTile, out var tileProto) || !_prototype.TryIndex(tileProto, out var tileDef))
+        {
+            _sawmill.Error($"Tried to run {nameof(WormCorridorDunGen)} without any dungeon data set which is unsupported");
+            return;
+        }
+
         var networks = new List<(Vector2i Start, HashSet<Vector2i> Network)>();
 
         // List of places to start from.
@@ -32,7 +36,7 @@ private async Task PostGen(WormCorridorPostGen gen, Dungeon dungeon, EntityUid g
                 networks.Add((entrance, network));
 
                 // Point away from the room to start with.
-                startAngles.Add(entrance, (entrance + grid.TileSizeHalfVector - room.Center).ToAngle());
+                startAngles.Add(entrance, (entrance + _grid.TileSizeHalfVector - room.Center).ToAngle());
             }
         }
 
@@ -46,7 +50,7 @@ private async Task PostGen(WormCorridorPostGen gen, Dungeon dungeon, EntityUid g
             // Find a random network to worm from.
             var startIndex = (i % networks.Count);
             var startPos = networks[startIndex].Start;
-            var position = startPos + grid.TileSizeHalfVector;
+            var position = startPos + _grid.TileSizeHalfVector;
 
             var remainingLength = gen.Length;
             worm.Clear();
@@ -108,7 +112,7 @@ private async Task PostGen(WormCorridorPostGen gen, Dungeon dungeon, EntityUid g
                 costSoFar[startNode] = 0f;
                 var count = 0;
 
-                await SuspendIfOutOfTime();
+                await SuspendDungeon();
                 if (!ValidateResume())
                     return;
 
@@ -174,9 +178,9 @@ private async Task PostGen(WormCorridorPostGen gen, Dungeon dungeon, EntityUid g
         WidenCorridor(dungeon, gen.Width, main.Network);
         dungeon.CorridorTiles.UnionWith(main.Network);
         BuildCorridorExterior(dungeon);
+        dungeon.RefreshAllTiles();
 
         var tiles = new List<(Vector2i Index, Tile Tile)>();
-        var tileDef = _prototype.Index(gen.Tile);
 
         foreach (var tile in dungeon.CorridorTiles)
         {
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.cs
new file mode 100644
index 00000000000..1468a80902c
--- /dev/null
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.cs
@@ -0,0 +1,309 @@
+using System.Threading;
+using System.Threading.Tasks;
+using Content.Server.Decals;
+using Content.Server.NPC.Components;
+using Content.Server.NPC.HTN;
+using Content.Server.NPC.Systems;
+using Content.Shared.Construction.EntitySystems;
+using Content.Shared.Maps;
+using Content.Shared.Procedural;
+using Content.Shared.Procedural.DungeonGenerators;
+using Content.Shared.Procedural.DungeonLayers;
+using Content.Shared.Procedural.PostGeneration;
+using Content.Shared.Tag;
+using JetBrains.Annotations;
+using Robust.Server.Physics;
+using Robust.Shared.CPUJob.JobQueues;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using Robust.Shared.Utility;
+using IDunGenLayer = Content.Shared.Procedural.IDunGenLayer;
+
+namespace Content.Server.Procedural.DungeonJob;
+
+public sealed partial class DungeonJob : Job<List<Dungeon>>
+{
+    public bool TimeSlice = true;
+
+    private readonly IEntityManager _entManager;
+    private readonly IPrototypeManager _prototype;
+    private readonly ITileDefinitionManager _tileDefManager;
+
+    private readonly AnchorableSystem _anchorable;
+    private readonly DecalSystem _decals;
+    private readonly DungeonSystem _dungeon;
+    private readonly EntityLookupSystem _lookup;
+    private readonly TagSystem _tags;
+    private readonly TileSystem _tile;
+    private readonly SharedMapSystem _maps;
+    private readonly SharedTransformSystem _transform;
+
+    private EntityQuery<PhysicsComponent> _physicsQuery;
+    private EntityQuery<TransformComponent> _xformQuery;
+
+    private readonly DungeonConfigPrototype _gen;
+    private readonly int _seed;
+    private readonly Vector2i _position;
+
+    private readonly EntityUid _gridUid;
+    private readonly MapGridComponent _grid;
+
+    private readonly ISawmill _sawmill;
+
+    public DungeonJob(
+        ISawmill sawmill,
+        double maxTime,
+        IEntityManager entManager,
+        IPrototypeManager prototype,
+        ITileDefinitionManager tileDefManager,
+        AnchorableSystem anchorable,
+        DecalSystem decals,
+        DungeonSystem dungeon,
+        EntityLookupSystem lookup,
+        TileSystem tile,
+        SharedTransformSystem transform,
+        DungeonConfigPrototype gen,
+        MapGridComponent grid,
+        EntityUid gridUid,
+        int seed,
+        Vector2i position,
+        CancellationToken cancellation = default) : base(maxTime, cancellation)
+    {
+        _sawmill = sawmill;
+        _entManager = entManager;
+        _prototype = prototype;
+        _tileDefManager = tileDefManager;
+
+        _anchorable = anchorable;
+        _decals = decals;
+        _dungeon = dungeon;
+        _lookup = lookup;
+        _tile = tile;
+        _tags = _entManager.System<TagSystem>();
+        _maps = _entManager.System<SharedMapSystem>();
+        _transform = transform;
+
+        _physicsQuery = _entManager.GetEntityQuery<PhysicsComponent>();
+        _xformQuery = _entManager.GetEntityQuery<TransformComponent>();
+
+        _gen = gen;
+        _grid = grid;
+        _gridUid = gridUid;
+        _seed = seed;
+        _position = position;
+    }
+
+    /// <summary>
+    /// Gets the relevant dungeon, running recursively as relevant.
+    /// </summary>
+    /// <param name="reserve">Should we reserve tiles even if the config doesn't specify.</param>
+    private async Task<List<Dungeon>> GetDungeons(
+        Vector2i position,
+        DungeonConfigPrototype config,
+        DungeonData data,
+        List<IDunGenLayer> layers,
+        HashSet<Vector2i> reservedTiles,
+        int seed,
+        Random random)
+    {
+        var dungeons = new List<Dungeon>();
+        var count = random.Next(config.MinCount, config.MaxCount + 1);
+
+        for (var i = 0; i < count; i++)
+        {
+            position += random.NextPolarVector2(config.MinOffset, config.MaxOffset).Floored();
+
+            foreach (var layer in layers)
+            {
+                await RunLayer(dungeons, data, position, layer, reservedTiles, seed, random);
+
+                if (config.ReserveTiles)
+                {
+                    foreach (var dungeon in dungeons)
+                    {
+                        reservedTiles.UnionWith(dungeon.AllTiles);
+                    }
+                }
+
+                await SuspendDungeon();
+                if (!ValidateResume())
+                    return new List<Dungeon>();
+            }
+        }
+
+        return dungeons;
+    }
+
+    protected override async Task<List<Dungeon>?> Process()
+    {
+        _sawmill.Info($"Generating dungeon {_gen.ID} with seed {_seed} on {_entManager.ToPrettyString(_gridUid)}");
+        _grid.CanSplit = false;
+        var random = new Random(_seed);
+        var position = (_position + random.NextPolarVector2(_gen.MinOffset, _gen.MaxOffset)).Floored();
+
+        // Tiles we can no longer generate on due to being reserved elsewhere.
+        var reservedTiles = new HashSet<Vector2i>();
+
+        var dungeons = await GetDungeons(position, _gen, _gen.Data, _gen.Layers, reservedTiles, _seed, random);
+        // To make it slightly more deterministic treat this RNG as separate ig.
+
+        // Post-processing after finishing loading.
+
+        // Defer splitting so they don't get spammed and so we don't have to worry about tracking the grid along the way.
+        _grid.CanSplit = true;
+        _entManager.System<GridFixtureSystem>().CheckSplits(_gridUid);
+        var npcSystem = _entManager.System<NPCSystem>();
+        var npcs = new HashSet<Entity<HTNComponent>>();
+
+        _lookup.GetChildEntities(_gridUid, npcs);
+
+        foreach (var npc in npcs)
+        {
+            npcSystem.WakeNPC(npc.Owner, npc.Comp);
+        }
+
+        return dungeons;
+    }
+
+    private async Task RunLayer(
+        List<Dungeon> dungeons,
+        DungeonData data,
+        Vector2i position,
+        IDunGenLayer layer,
+        HashSet<Vector2i> reservedTiles,
+        int seed,
+        Random random)
+    {
+        _sawmill.Debug($"Doing postgen {layer.GetType()} for {_gen.ID} with seed {_seed}");
+
+        // If there's a way to just call the methods directly for the love of god tell me.
+        // Some of these don't care about reservedtiles because they only operate on dungeon tiles (which should
+        // never be reserved)
+
+        // Some may or may not return dungeons.
+        // It's clamplicated but yeah procgen layering moment I'll take constructive feedback.
+
+        switch (layer)
+        {
+            case AutoCablingDunGen cabling:
+                await PostGen(cabling, data, dungeons[^1], reservedTiles, random);
+                break;
+            case BiomeMarkerLayerDunGen markerPost:
+                await PostGen(markerPost, data, dungeons[^1], reservedTiles, random);
+                break;
+            case BiomeDunGen biome:
+                await PostGen(biome, data, dungeons[^1], reservedTiles, random);
+                break;
+            case BoundaryWallDunGen boundary:
+                await PostGen(boundary, data, dungeons[^1], reservedTiles, random);
+                break;
+            case CornerClutterDunGen clutter:
+                await PostGen(clutter, data, dungeons[^1], reservedTiles, random);
+                break;
+            case CorridorClutterDunGen corClutter:
+                await PostGen(corClutter, data, dungeons[^1], reservedTiles, random);
+                break;
+            case CorridorDunGen cordor:
+                await PostGen(cordor, data, dungeons[^1], reservedTiles, random);
+                break;
+            case CorridorDecalSkirtingDunGen decks:
+                await PostGen(decks, data, dungeons[^1], reservedTiles, random);
+                break;
+            case EntranceFlankDunGen flank:
+                await PostGen(flank, data, dungeons[^1], reservedTiles, random);
+                break;
+            case ExteriorDunGen exterior:
+                dungeons.AddRange(await GenerateExteriorDungen(position, exterior, reservedTiles, random));
+                break;
+            case FillGridDunGen fill:
+                dungeons.Add(await GenerateFillDunGen(data, reservedTiles));
+                break;
+            case JunctionDunGen junc:
+                await PostGen(junc, data, dungeons[^1], reservedTiles, random);
+                break;
+            case MiddleConnectionDunGen dordor:
+                await PostGen(dordor, data, dungeons[^1], reservedTiles, random);
+                break;
+            case DungeonEntranceDunGen entrance:
+                await PostGen(entrance, data, dungeons[^1], reservedTiles, random);
+                break;
+            case ExternalWindowDunGen externalWindow:
+                await PostGen(externalWindow, data, dungeons[^1], reservedTiles, random);
+                break;
+            case InternalWindowDunGen internalWindow:
+                await PostGen(internalWindow, data, dungeons[^1], reservedTiles, random);
+                break;
+            case MobsDunGen mob:
+                await PostGen(mob, dungeons[^1], random);
+                break;
+            case NoiseDistanceDunGen distance:
+                dungeons.Add(await GenerateNoiseDistanceDunGen(position, distance, reservedTiles, seed, random));
+                break;
+            case NoiseDunGen noise:
+                dungeons.Add(await GenerateNoiseDunGen(position, noise, reservedTiles, seed, random));
+                break;
+            case OreDunGen ore:
+                await PostGen(ore, dungeons[^1], random);
+                break;
+            case PrefabDunGen prefab:
+                dungeons.Add(await GeneratePrefabDunGen(position, data, prefab, reservedTiles, random));
+                break;
+            case PrototypeDunGen prototypo:
+                var groupConfig = _prototype.Index(prototypo.Proto);
+                position = (position + random.NextPolarVector2(groupConfig.MinOffset, groupConfig.MaxOffset)).Floored();
+
+                var dataCopy = groupConfig.Data.Clone();
+                dataCopy.Apply(data);
+
+                dungeons.AddRange(await GetDungeons(position, groupConfig, dataCopy, groupConfig.Layers, reservedTiles, seed, random));
+                break;
+            case ReplaceTileDunGen replace:
+                dungeons.Add(await GenerateTileReplacementDunGen(replace, data, reservedTiles, random));
+                break;
+            case RoomEntranceDunGen rEntrance:
+                await PostGen(rEntrance, data, dungeons[^1], reservedTiles, random);
+                break;
+            case SplineDungeonConnectorDunGen spline:
+                dungeons.Add(await PostGen(spline, data, dungeons, reservedTiles, random));
+                break;
+            case WallMountDunGen wall:
+                await PostGen(wall, data, dungeons[^1], reservedTiles, random);
+                break;
+            case WormCorridorDunGen worm:
+                await PostGen(worm, data, dungeons[^1], reservedTiles, random);
+                break;
+            default:
+                throw new NotImplementedException();
+        }
+    }
+
+    private void LogDataError(Type type)
+    {
+        _sawmill.Error($"Unable to find dungeon data keys for {type}");
+    }
+
+    [Pure]
+    private bool ValidateResume()
+    {
+        if (_entManager.Deleted(_gridUid))
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    /// <summary>
+    /// Wrapper around <see cref="Job{T}.SuspendIfOutOfTime"/>
+    /// </summary>
+    private async Task SuspendDungeon()
+    {
+        if (!TimeSlice)
+            return;
+
+        await SuspendIfOutOfTime();
+    }
+}
diff --git a/Content.Server/Procedural/DungeonSystem.Commands.cs b/Content.Server/Procedural/DungeonSystem.Commands.cs
index d783eb60c63..51a6a57bbeb 100644
--- a/Content.Server/Procedural/DungeonSystem.Commands.cs
+++ b/Content.Server/Procedural/DungeonSystem.Commands.cs
@@ -51,6 +51,8 @@ private async void GenerateDungeon(IConsoleShell shell, string argstr, string[]
             dungeonUid = EntityManager.CreateEntityUninitialized(null, new EntityCoordinates(dungeonUid, position));
             dungeonGrid = EntityManager.AddComponent<MapGridComponent>(dungeonUid);
             EntityManager.InitializeAndStartEntity(dungeonUid, mapId);
+            // If we created a grid (e.g. space dungen) then offset it so we don't double-apply positions
+            position = Vector2i.Zero;
         }
 
         int seed;
diff --git a/Content.Server/Procedural/DungeonSystem.Rooms.cs b/Content.Server/Procedural/DungeonSystem.Rooms.cs
index ddd4a4732f8..20d64acff15 100644
--- a/Content.Server/Procedural/DungeonSystem.Rooms.cs
+++ b/Content.Server/Procedural/DungeonSystem.Rooms.cs
@@ -64,6 +64,7 @@ public void SpawnRoom(
         Vector2i origin,
         DungeonRoomPrototype room,
         Random random,
+        HashSet<Vector2i>? reservedTiles,
         bool clearExisting = false,
         bool rotation = false)
     {
@@ -78,7 +79,7 @@ public void SpawnRoom(
         var roomTransform = Matrix3Helpers.CreateTransform((Vector2) room.Size / 2f, roomRotation);
         var finalTransform = Matrix3x2.Multiply(roomTransform, originTransform);
 
-        SpawnRoom(gridUid, grid, finalTransform, room, clearExisting);
+        SpawnRoom(gridUid, grid, finalTransform, room, reservedTiles, clearExisting);
     }
 
     public Angle GetRoomRotation(DungeonRoomPrototype room, Random random)
@@ -103,6 +104,7 @@ public void SpawnRoom(
         MapGridComponent grid,
         Matrix3x2 roomTransform,
         DungeonRoomPrototype room,
+        HashSet<Vector2i>? reservedTiles = null,
         bool clearExisting = false)
     {
         // Ensure the underlying template exists.
@@ -116,7 +118,7 @@ public void SpawnRoom(
         // go BRRNNTTT on existing stuff
         if (clearExisting)
         {
-            var gridBounds = new Box2(Vector2.Transform(Vector2.Zero, roomTransform), Vector2.Transform(room.Size, roomTransform));
+            var gridBounds = new Box2(Vector2.Transform(-room.Size/2, roomTransform), Vector2.Transform(room.Size/2, roomTransform));
             _entitySet.Clear();
             // Polygon skin moment
             gridBounds = gridBounds.Enlarged(-0.05f);
@@ -150,6 +152,10 @@ public void SpawnRoom(
 
                 var tilePos = Vector2.Transform(indices + tileOffset, roomTransform);
                 var rounded = tilePos.Floored();
+
+                if (!clearExisting && reservedTiles?.Contains(rounded) == true)
+                    continue;
+
                 _tiles.Add((rounded, tileRef.Tile));
             }
         }
@@ -165,6 +171,10 @@ public void SpawnRoom(
         {
             var templateXform = _xformQuery.GetComponent(templateEnt);
             var childPos = Vector2.Transform(templateXform.LocalPosition - roomCenter, roomTransform);
+
+            if (!clearExisting && reservedTiles?.Contains(childPos.Floored()) == true)
+                continue;
+
             var childRot = templateXform.LocalRotation + finalRoomRotation;
             var protoId = _metaQuery.GetComponent(templateEnt).EntityPrototype?.ID;
 
@@ -192,8 +202,11 @@ public void SpawnRoom(
                 // Offset by 0.5 because decals are offset from bot-left corner
                 // So we convert it to center of tile then convert it back again after transform.
                 // Do these shenanigans because 32x32 decals assume as they are centered on bottom-left of tiles.
-                var position = Vector2.Transform(decal.Coordinates + Vector2Helpers.Half - roomCenter, roomTransform);
-                position -= Vector2Helpers.Half;
+                var position = Vector2.Transform(decal.Coordinates + grid.TileSizeHalfVector - roomCenter, roomTransform);
+                position -= grid.TileSizeHalfVector;
+
+                if (!clearExisting && reservedTiles?.Contains(position.Floored()) == true)
+                    continue;
 
                 // Umm uhh I love decals so uhhhh idk what to do about this
                 var angle = (decal.Angle + finalRoomRotation).Reduced();
diff --git a/Content.Server/Procedural/DungeonSystem.cs b/Content.Server/Procedural/DungeonSystem.cs
index 36009896a2c..9a7abb7e334 100644
--- a/Content.Server/Procedural/DungeonSystem.cs
+++ b/Content.Server/Procedural/DungeonSystem.cs
@@ -12,6 +12,7 @@
 using Content.Shared.Procedural;
 using Content.Shared.Tag;
 using Robust.Server.GameObjects;
+using Robust.Shared.Collections;
 using Robust.Shared.Configuration;
 using Robust.Shared.Console;
 using Robust.Shared.Map;
@@ -32,7 +33,6 @@ public sealed partial class DungeonSystem : SharedDungeonSystem
     [Dependency] private readonly AnchorableSystem _anchorable = default!;
     [Dependency] private readonly DecalSystem _decals = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
-    [Dependency] private readonly TagSystem _tag = default!;
     [Dependency] private readonly TileSystem _tile = default!;
     [Dependency] private readonly MapLoaderSystem _loader = default!;
     [Dependency] private readonly SharedMapSystem _maps = default!;
@@ -49,7 +49,7 @@ public sealed partial class DungeonSystem : SharedDungeonSystem
     public const int CollisionLayer = (int) CollisionGroup.Impassable;
 
     private readonly JobQueue _dungeonJobQueue = new(DungeonJobTime);
-    private readonly Dictionary<DungeonJob, CancellationTokenSource> _dungeonJobs = new();
+    private readonly Dictionary<DungeonJob.DungeonJob, CancellationTokenSource> _dungeonJobs = new();
 
     [ValidatePrototypeId<ContentTileDefinition>]
     public const string FallbackTileId = "FloorSteel";
@@ -190,18 +190,16 @@ public void GenerateDungeon(DungeonConfigPrototype gen,
         int seed)
     {
         var cancelToken = new CancellationTokenSource();
-        var job = new DungeonJob(
+        var job = new DungeonJob.DungeonJob(
             Log,
             DungeonJobTime,
             EntityManager,
-            _mapManager,
             _prototype,
             _tileDefManager,
             _anchorable,
             _decals,
             this,
             _lookup,
-            _tag,
             _tile,
             _transform,
             gen,
@@ -215,7 +213,7 @@ public void GenerateDungeon(DungeonConfigPrototype gen,
         _dungeonJobQueue.EnqueueJob(job);
     }
 
-    public async Task<Dungeon> GenerateDungeonAsync(
+    public async Task<List<Dungeon>> GenerateDungeonAsync(
         DungeonConfigPrototype gen,
         EntityUid gridUid,
         MapGridComponent grid,
@@ -223,18 +221,16 @@ public async Task<Dungeon> GenerateDungeonAsync(
         int seed)
     {
         var cancelToken = new CancellationTokenSource();
-        var job = new DungeonJob(
+        var job = new DungeonJob.DungeonJob(
             Log,
             DungeonJobTime,
             EntityManager,
-            _mapManager,
             _prototype,
             _tileDefManager,
             _anchorable,
             _decals,
             this,
             _lookup,
-            _tag,
             _tile,
             _transform,
             gen,
diff --git a/Content.Server/Procedural/RoomFillSystem.cs b/Content.Server/Procedural/RoomFillSystem.cs
index 20ffa98586d..b539cc9780e 100644
--- a/Content.Server/Procedural/RoomFillSystem.cs
+++ b/Content.Server/Procedural/RoomFillSystem.cs
@@ -35,6 +35,7 @@ private void OnRoomFillMapInit(EntityUid uid, RoomFillComponent component, MapIn
                     _maps.LocalToTile(xform.GridUid.Value, mapGrid, xform.Coordinates),
                     room,
                     random,
+                    null,
                     clearExisting: component.ClearExisting,
                     rotation: component.Rotation);
             }
diff --git a/Content.Server/Radiation/Components/RadiationProtectionComponent.cs b/Content.Server/Radiation/Components/RadiationProtectionComponent.cs
new file mode 100644
index 00000000000..44b11af8347
--- /dev/null
+++ b/Content.Server/Radiation/Components/RadiationProtectionComponent.cs
@@ -0,0 +1,18 @@
+using Robust.Shared.Prototypes;
+using Content.Shared.Damage.Prototypes;
+
+namespace Content.Server.Radiation.Components;
+
+/// <summary>
+///     Exists for use as a status effect.
+///     Adds the DamageProtectionBuffComponent to the entity and adds the specified DamageModifierSet to its list of modifiers.
+/// </summary>
+[RegisterComponent]
+public sealed partial class RadiationProtectionComponent : Component
+{
+    /// <summary>
+    ///     The radiation damage modifier for entities with this component.
+    /// </summary>
+    [DataField("modifier")]
+    public ProtoId<DamageModifierSetPrototype> RadiationProtectionModifierSetId = "PotassiumIodide";
+}
diff --git a/Content.Server/Radiation/Systems/RadiationProtectionSystem.cs b/Content.Server/Radiation/Systems/RadiationProtectionSystem.cs
new file mode 100644
index 00000000000..5222c31bfe6
--- /dev/null
+++ b/Content.Server/Radiation/Systems/RadiationProtectionSystem.cs
@@ -0,0 +1,38 @@
+using Content.Server.Radiation.Components;
+using Content.Shared.Damage.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Radiation.EntitySystems;
+
+public sealed class RadiationProtectionSystem : EntitySystem
+{
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<RadiationProtectionComponent, ComponentInit>(OnInit);
+        SubscribeLocalEvent<RadiationProtectionComponent, ComponentShutdown>(OnShutdown);
+    }
+
+    private void OnInit(EntityUid uid, RadiationProtectionComponent component, ComponentInit args)
+    {
+        if (!_prototypeManager.TryIndex(component.RadiationProtectionModifierSetId, out var modifier))
+            return;
+        var buffComp = EnsureComp<DamageProtectionBuffComponent>(uid);
+        // add the damage modifier if it isn't in the dict yet
+        if (!buffComp.Modifiers.ContainsKey(component.RadiationProtectionModifierSetId))
+            buffComp.Modifiers.Add(component.RadiationProtectionModifierSetId, modifier);
+    }
+
+    private void OnShutdown(EntityUid uid, RadiationProtectionComponent component, ComponentShutdown args)
+    {
+        if (!TryComp<DamageProtectionBuffComponent>(uid, out var buffComp))
+            return;
+        // remove the damage modifier from the dict
+        buffComp.Modifiers.Remove(component.RadiationProtectionModifierSetId);
+        // if the dict is empty now, remove the buff component
+        if (buffComp.Modifiers.Count == 0)
+            RemComp<DamageProtectionBuffComponent>(uid);
+    }
+}
diff --git a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
index 8484fb23363..1258e0b8c7e 100644
--- a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Server.Chat.Systems;
 using Content.Server.Interaction;
 using Content.Server.Popups;
@@ -6,13 +7,10 @@
 using Content.Server.Radio.Components;
 using Content.Server.Speech;
 using Content.Server.Speech.Components;
-using Content.Shared.UserInterface;
-using Content.Shared.Chat;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Radio;
 using Content.Shared.Radio.Components;
-using Robust.Server.GameObjects;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Radio.EntitySystems;
@@ -28,7 +26,6 @@ public sealed class RadioDeviceSystem : EntitySystem
     [Dependency] private readonly RadioSystem _radio = default!;
     [Dependency] private readonly InteractionSystem _interaction = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-    [Dependency] private readonly UserInterfaceSystem _ui = default!;
 
     // Used to prevent a shitter from using a bunch of radios to spam chat.
     private HashSet<(string, EntityUid)> _recentlySent = new();
@@ -47,7 +44,7 @@ public override void Initialize()
         SubscribeLocalEvent<RadioSpeakerComponent, ActivateInWorldEvent>(OnActivateSpeaker);
         SubscribeLocalEvent<RadioSpeakerComponent, RadioReceiveEvent>(OnReceiveRadio);
 
-        SubscribeLocalEvent<IntercomComponent, BeforeActivatableUIOpenEvent>(OnBeforeIntercomUiOpen);
+        SubscribeLocalEvent<IntercomComponent, EncryptionChannelsChangedEvent>(OnIntercomEncryptionChannelsChanged);
         SubscribeLocalEvent<IntercomComponent, ToggleIntercomMicMessage>(OnToggleIntercomMic);
         SubscribeLocalEvent<IntercomComponent, ToggleIntercomSpeakerMessage>(OnToggleIntercomSpeaker);
         SubscribeLocalEvent<IntercomComponent, SelectIntercomChannelMessage>(OnSelectIntercomChannel);
@@ -150,18 +147,18 @@ public void ToggleRadioSpeaker(EntityUid uid, EntityUid user, bool quiet = false
         SetSpeakerEnabled(uid, user, !component.Enabled, quiet, component);
     }
 
-    public void SetSpeakerEnabled(EntityUid uid, EntityUid user, bool enabled, bool quiet = false, RadioSpeakerComponent? component = null)
+    public void SetSpeakerEnabled(EntityUid uid, EntityUid? user, bool enabled, bool quiet = false, RadioSpeakerComponent? component = null)
     {
         if (!Resolve(uid, ref component))
             return;
 
         component.Enabled = enabled;
 
-        if (!quiet)
+        if (!quiet && user != null)
         {
             var state = Loc.GetString(component.Enabled ? "handheld-radio-component-on-state" : "handheld-radio-component-off-state");
             var message = Loc.GetString("handheld-radio-component-on-use", ("radioState", state));
-            _popup.PopupEntity(message, user, user);
+            _popup.PopupEntity(message, user.Value, user.Value);
         }
 
         _appearance.SetData(uid, RadioDeviceVisuals.Speaker, component.Enabled);
@@ -213,61 +210,74 @@ private void OnReceiveRadio(EntityUid uid, RadioSpeakerComponent component, ref
         var nameEv = new TransformSpeakerNameEvent(args.MessageSource, Name(args.MessageSource));
         RaiseLocalEvent(args.MessageSource, nameEv);
 
-        var name = Loc.GetString("speech-name-relay", ("speaker", Name(uid)),
+        var name = Loc.GetString("speech-name-relay",
+            ("speaker", Name(uid)),
             ("originalName", nameEv.Name));
 
         // log to chat so people can identity the speaker/source, but avoid clogging ghost chat if there are many radios
         _chat.TrySendInGameICMessage(uid, args.Message, InGameICChatType.Whisper, ChatTransmitRange.GhostRangeLimit, nameOverride: name, checkRadioPrefix: false);
     }
 
-    private void OnBeforeIntercomUiOpen(EntityUid uid, IntercomComponent component, BeforeActivatableUIOpenEvent args)
+    private void OnIntercomEncryptionChannelsChanged(Entity<IntercomComponent> ent, ref EncryptionChannelsChangedEvent args)
     {
-        UpdateIntercomUi(uid, component);
+        ent.Comp.SupportedChannels = args.Component.Channels.Select(p => new ProtoId<RadioChannelPrototype>(p)).ToList();
+
+        var channel = args.Component.DefaultChannel;
+        if (ent.Comp.CurrentChannel != null && ent.Comp.SupportedChannels.Contains(ent.Comp.CurrentChannel.Value))
+            channel = ent.Comp.CurrentChannel;
+
+        SetIntercomChannel(ent, channel);
     }
 
-    private void OnToggleIntercomMic(EntityUid uid, IntercomComponent component, ToggleIntercomMicMessage args)
+    private void OnToggleIntercomMic(Entity<IntercomComponent> ent, ref ToggleIntercomMicMessage args)
     {
-        if (component.RequiresPower && !this.IsPowered(uid, EntityManager))
+        if (ent.Comp.RequiresPower && !this.IsPowered(ent, EntityManager))
             return;
 
-        SetMicrophoneEnabled(uid, args.Actor, args.Enabled, true);
-        UpdateIntercomUi(uid, component);
+        SetMicrophoneEnabled(ent, args.Actor, args.Enabled, true);
+        ent.Comp.MicrophoneEnabled = args.Enabled;
+        Dirty(ent);
     }
 
-    private void OnToggleIntercomSpeaker(EntityUid uid, IntercomComponent component, ToggleIntercomSpeakerMessage args)
+    private void OnToggleIntercomSpeaker(Entity<IntercomComponent> ent, ref ToggleIntercomSpeakerMessage args)
     {
-        if (component.RequiresPower && !this.IsPowered(uid, EntityManager))
+        if (ent.Comp.RequiresPower && !this.IsPowered(ent, EntityManager))
             return;
 
-        SetSpeakerEnabled(uid, args.Actor, args.Enabled, true);
-        UpdateIntercomUi(uid, component);
+        SetSpeakerEnabled(ent, args.Actor, args.Enabled, true);
+        ent.Comp.SpeakerEnabled = args.Enabled;
+        Dirty(ent);
     }
 
-    private void OnSelectIntercomChannel(EntityUid uid, IntercomComponent component, SelectIntercomChannelMessage args)
+    private void OnSelectIntercomChannel(Entity<IntercomComponent> ent, ref SelectIntercomChannelMessage args)
     {
-        if (component.RequiresPower && !this.IsPowered(uid, EntityManager))
+        if (ent.Comp.RequiresPower && !this.IsPowered(ent, EntityManager))
             return;
 
-        if (!_protoMan.TryIndex<RadioChannelPrototype>(args.Channel, out _) || !component.SupportedChannels.Contains(args.Channel))
+        if (!_protoMan.HasIndex<RadioChannelPrototype>(args.Channel) || !ent.Comp.SupportedChannels.Contains(args.Channel))
             return;
 
-        if (TryComp<RadioMicrophoneComponent>(uid, out var mic))
-            mic.BroadcastChannel = args.Channel;
-        if (TryComp<RadioSpeakerComponent>(uid, out var speaker))
-            speaker.Channels = new(){ args.Channel };
-        UpdateIntercomUi(uid, component);
+        SetIntercomChannel(ent, args.Channel);
     }
 
-    private void UpdateIntercomUi(EntityUid uid, IntercomComponent component)
+    private void SetIntercomChannel(Entity<IntercomComponent> ent, ProtoId<RadioChannelPrototype>? channel)
     {
-        var micComp = CompOrNull<RadioMicrophoneComponent>(uid);
-        var speakerComp = CompOrNull<RadioSpeakerComponent>(uid);
-
-        var micEnabled = micComp?.Enabled ?? false;
-        var speakerEnabled = speakerComp?.Enabled ?? false;
-        var availableChannels = component.SupportedChannels;
-        var selectedChannel = micComp?.BroadcastChannel ?? SharedChatSystem.CommonChannel;
-        var state = new IntercomBoundUIState(micEnabled, speakerEnabled, availableChannels, selectedChannel);
-        _ui.SetUiState(uid, IntercomUiKey.Key, state);
+        ent.Comp.CurrentChannel = channel;
+
+        if (channel == null)
+        {
+            SetSpeakerEnabled(ent, null, false);
+            SetMicrophoneEnabled(ent, null, false);
+            ent.Comp.MicrophoneEnabled = false;
+            ent.Comp.SpeakerEnabled = false;
+            Dirty(ent);
+            return;
+        }
+
+        if (TryComp<RadioMicrophoneComponent>(ent, out var mic))
+            mic.BroadcastChannel = channel;
+        if (TryComp<RadioSpeakerComponent>(ent, out var speaker))
+            speaker.Channels = new(){ channel };
+        Dirty(ent);
     }
 }
diff --git a/Content.Server/Radio/EntitySystems/RadioSystem.cs b/Content.Server/Radio/EntitySystems/RadioSystem.cs
index 100fb7201f7..283b5972817 100644
--- a/Content.Server/Radio/EntitySystems/RadioSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioSystem.cs
@@ -33,11 +33,15 @@ public sealed class RadioSystem : EntitySystem
     // set used to prevent radio feedback loops.
     private readonly HashSet<string> _messages = new();
 
+    private EntityQuery<TelecomExemptComponent> _exemptQuery;
+
     public override void Initialize()
     {
         base.Initialize();
         SubscribeLocalEvent<IntrinsicRadioReceiverComponent, RadioReceiveEvent>(OnIntrinsicReceive);
         SubscribeLocalEvent<IntrinsicRadioTransmitterComponent, EntitySpokeEvent>(OnIntrinsicSpeak);
+
+        _exemptQuery = GetEntityQuery<TelecomExemptComponent>();
     }
 
     private void OnIntrinsicSpeak(EntityUid uid, IntrinsicRadioTransmitterComponent component, EntitySpokeEvent args)
@@ -125,9 +129,8 @@ public void SendRadioMessage(EntityUid messageSource, string message, RadioChann
 
         var sourceMapId = Transform(radioSource).MapID;
         var hasActiveServer = HasActiveServer(sourceMapId, channel.ID);
-        var hasMicro = HasComp<RadioMicrophoneComponent>(radioSource);
+        var sourceServerExempt = _exemptQuery.HasComp(radioSource);
 
-        var speakerQuery = GetEntityQuery<RadioSpeakerComponent>();
         var radioQuery = EntityQueryEnumerator<ActiveRadioComponent, TransformComponent>();
         while (canSend && radioQuery.MoveNext(out var receiver, out var radio, out var transform))
         {
@@ -142,7 +145,7 @@ public void SendRadioMessage(EntityUid messageSource, string message, RadioChann
                 continue;
 
             // don't need telecom server for long range channels or handheld radios and intercoms
-            var needServer = !channel.LongRange && (!hasMicro || !speakerQuery.HasComponent(receiver));
+            var needServer = !channel.LongRange && !sourceServerExempt;
             if (needServer && !hasActiveServer)
                 continue;
 
diff --git a/Content.Server/Resist/EscapeInventorySystem.cs b/Content.Server/Resist/EscapeInventorySystem.cs
index fc474b0cb81..93a83465861 100644
--- a/Content.Server/Resist/EscapeInventorySystem.cs
+++ b/Content.Server/Resist/EscapeInventorySystem.cs
@@ -53,7 +53,7 @@ private void OnRelayMovement(EntityUid uid, CanEscapeInventoryComponent componen
         if (!args.HasDirectionalMovement)
             return;
 
-        if (!_containerSystem.TryGetContainingContainer(uid, out var container) || !_actionBlockerSystem.CanInteract(uid, container.Owner))
+        if (!_containerSystem.TryGetContainingContainer((uid, null, null), out var container) || !_actionBlockerSystem.CanInteract(uid, container.Owner))
             return;
 
         // Make sure there's nothing stopped the removal (like being glued)
diff --git a/Content.Server/Resist/ResistLockerSystem.cs b/Content.Server/Resist/ResistLockerSystem.cs
index 2ab277d0f1a..597f3ee8d09 100644
--- a/Content.Server/Resist/ResistLockerSystem.cs
+++ b/Content.Server/Resist/ResistLockerSystem.cs
@@ -8,6 +8,7 @@
 using Content.Shared.Resist;
 using Content.Shared.Tools.Components;
 using Content.Shared.Tools.Systems;
+using Content.Shared.ActionBlocker;
 
 namespace Content.Server.Resist;
 
@@ -18,6 +19,7 @@ public sealed class ResistLockerSystem : EntitySystem
     [Dependency] private readonly PopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
     [Dependency] private readonly WeldableSystem _weldable = default!;
+    [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
 
     public override void Initialize()
     {
@@ -34,6 +36,9 @@ private void OnRelayMovement(EntityUid uid, ResistLockerComponent component, ref
         if (!TryComp(uid, out EntityStorageComponent? storageComponent))
             return;
 
+        if (!_actionBlocker.CanMove(args.Entity))
+            return;
+
         if (TryComp<LockComponent>(uid, out var lockComponent) && lockComponent.Locked || _weldable.IsWelded(uid))
         {
             AttemptResist(args.Entity, uid, storageComponent, component);
@@ -49,7 +54,7 @@ private void AttemptResist(EntityUid user, EntityUid target, EntityStorageCompon
         {
             BreakOnMove = true,
             BreakOnDamage = true,
-            NeedHand = false //No hands 'cause we be kickin'
+            NeedHand = false, //No hands 'cause we be kickin'
         };
 
         resistLockerComponent.IsResisting = true;
diff --git a/Content.Server/Respawn/SpecialRespawnSystem.cs b/Content.Server/Respawn/SpecialRespawnSystem.cs
index 6c7bb5c9234..cbda98f2638 100644
--- a/Content.Server/Respawn/SpecialRespawnSystem.cs
+++ b/Content.Server/Respawn/SpecialRespawnSystem.cs
@@ -1,8 +1,8 @@
-using Content.Server.Administration.Logs;
+using Content.Server.Administration.Logs;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Chat.Managers;
 using Content.Server.GameTicking;
-using Content.Server.Station.Components;
+using Content.Shared.Station.Components;
 using Content.Server.Station.Systems;
 using Content.Shared.Database;
 using Content.Shared.Maps;
@@ -157,7 +157,7 @@ public bool TryFindRandomTile(EntityUid targetGrid, EntityUid targetMap, int max
         var tile = tileRef.GridIndices;
 
         var found = false;
-        var (gridPos, _, gridMatrix) = xform.GetWorldPositionRotationMatrix();
+        var (gridPos, _, gridMatrix) = _transform.GetWorldPositionRotationMatrix(xform);
         var gridBounds = gridMatrix.TransformBox(grid.LocalAABB);
 
         //Obviously don't put anything ridiculous in here
diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
index c889d59f155..f972865509e 100644
--- a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
+++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
@@ -42,6 +42,7 @@ public sealed partial class RevenantSystem
     [Dependency] private readonly GhostSystem _ghost = default!;
     [Dependency] private readonly TileSystem _tile = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+    [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
 
     private void InitializeAbilities()
     {
@@ -227,7 +228,7 @@ private void OnDefileAction(EntityUid uid, RevenantComponent component, Revenant
         var xform = Transform(uid);
         if (!TryComp<MapGridComponent>(xform.GridUid, out var map))
             return;
-        var tiles = map.GetTilesIntersecting(Box2.CenteredAround(xform.WorldPosition,
+        var tiles = map.GetTilesIntersecting(Box2.CenteredAround(_transformSystem.GetWorldPosition(xform),
             new Vector2(component.DefileRadius * 2, component.DefileRadius))).ToArray();
 
         _random.Shuffle(tiles);
diff --git a/Content.Server/Salvage/SalvageSystem.Magnet.cs b/Content.Server/Salvage/SalvageSystem.Magnet.cs
index 3fe4baca8b6..5e85fdb573a 100644
--- a/Content.Server/Salvage/SalvageSystem.Magnet.cs
+++ b/Content.Server/Salvage/SalvageSystem.Magnet.cs
@@ -8,6 +8,7 @@
 using Content.Shared.Salvage.Magnet;
 using Robust.Server.Maps;
 using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 
 namespace Content.Server.Salvage;
 
@@ -253,7 +254,8 @@ private async Task TakeMagnetOffer(Entity<SalvageMagnetDataComponent> data, int
         var seed = data.Comp.Offered[index];
 
         var offering = GetSalvageOffering(seed);
-        var salvMap = _mapManager.CreateMap();
+        var salvMap = _mapSystem.CreateMap();
+        var salvMapXform = Transform(salvMap);
 
         // Set values while awaiting asteroid dungeon if relevant so we can't double-take offers.
         data.Comp.ActiveSeed = seed;
@@ -264,8 +266,8 @@ private async Task TakeMagnetOffer(Entity<SalvageMagnetDataComponent> data, int
         switch (offering)
         {
             case AsteroidOffering asteroid:
-                var grid = _mapManager.CreateGrid(salvMap);
-                await _dungeon.GenerateDungeonAsync(asteroid.DungeonConfig, grid.Owner, grid, Vector2i.Zero, seed);
+                var grid = _mapManager.CreateGridEntity(salvMap);
+                await _dungeon.GenerateDungeonAsync(asteroid.DungeonConfig, grid.Owner, grid.Comp, Vector2i.Zero, seed);
                 break;
             case SalvageOffering wreck:
                 var salvageProto = wreck.SalvageMap;
@@ -275,10 +277,10 @@ private async Task TakeMagnetOffer(Entity<SalvageMagnetDataComponent> data, int
                     Offset = new Vector2(0, 0)
                 };
 
-                if (!_map.TryLoad(salvMap, salvageProto.MapPath.ToString(), out var roots, opts))
+                if (!_map.TryLoad(salvMapXform.MapID, salvageProto.MapPath.ToString(), out _, opts))
                 {
                     Report(magnet, MagnetChannel, "salvage-system-announcement-spawn-debris-disintegrated");
-                    _mapManager.DeleteMap(salvMap);
+                    _mapManager.DeleteMap(salvMapXform.MapID);
                     return;
                 }
 
@@ -288,15 +290,14 @@ private async Task TakeMagnetOffer(Entity<SalvageMagnetDataComponent> data, int
         }
 
         Box2? bounds = null;
-        var mapXform = _xformQuery.GetComponent(_mapManager.GetMapEntityId(salvMap));
 
-        if (mapXform.ChildCount == 0)
+        if (salvMapXform.ChildCount == 0)
         {
             Report(magnet.Owner, MagnetChannel, "salvage-system-announcement-spawn-no-debris-available");
             return;
         }
 
-        var mapChildren = mapXform.ChildEnumerator;
+        var mapChildren = salvMapXform.ChildEnumerator;
 
         while (mapChildren.MoveNext(out var mapChild))
         {
@@ -340,19 +341,25 @@ private async Task TakeMagnetOffer(Entity<SalvageMagnetDataComponent> data, int
         if (!TryGetSalvagePlacementLocation(mapId, attachedBounds, bounds!.Value, worldAngle, out var spawnLocation, out var spawnAngle))
         {
             Report(magnet.Owner, MagnetChannel, "salvage-system-announcement-spawn-no-debris-available");
-            _mapManager.DeleteMap(salvMap);
+            _mapManager.DeleteMap(salvMapXform.MapID);
             return;
         }
 
+        // I have no idea if we want to return on failure or not
+        // but I assume trying to set the parent with a null value wouldn't have worked out anyways
+        if (!_mapSystem.TryGetMap(spawnLocation.MapId, out var spawnUid))
+            return;
+
         data.Comp.ActiveEntities = null;
-        mapChildren = mapXform.ChildEnumerator;
+        mapChildren = salvMapXform.ChildEnumerator;
 
         // It worked, move it into position and cleanup values.
         while (mapChildren.MoveNext(out var mapChild))
         {
             var salvXForm = _xformQuery.GetComponent(mapChild);
             var localPos = salvXForm.LocalPosition;
-            _transform.SetParent(mapChild, salvXForm, _mapManager.GetMapEntityId(spawnLocation.MapId));
+
+            _transform.SetParent(mapChild, salvXForm, spawnUid.Value);
             _transform.SetWorldPositionRotation(mapChild, spawnLocation.Position + localPos, spawnAngle, salvXForm);
 
             data.Comp.ActiveEntities ??= new List<EntityUid>();
@@ -371,7 +378,7 @@ private async Task TakeMagnetOffer(Entity<SalvageMagnetDataComponent> data, int
         }
 
         Report(magnet.Owner, MagnetChannel, "salvage-system-announcement-arrived", ("timeLeft", data.Comp.ActiveTime.TotalSeconds));
-        _mapManager.DeleteMap(salvMap);
+        _mapManager.DeleteMap(salvMapXform.MapID);
 
         data.Comp.Announced = false;
 
diff --git a/Content.Server/Salvage/SalvageSystem.Runner.cs b/Content.Server/Salvage/SalvageSystem.Runner.cs
index 161b7910844..23a575413ed 100644
--- a/Content.Server/Salvage/SalvageSystem.Runner.cs
+++ b/Content.Server/Salvage/SalvageSystem.Runner.cs
@@ -9,6 +9,7 @@
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Salvage.Expeditions;
 using Content.Shared.Shuttles.Components;
+using Content.Shared.Localizations;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Player;
 
@@ -103,8 +104,10 @@ private void OnFTLCompleted(ref FTLCompletedEvent args)
 
         Announce(args.MapUid, Loc.GetString("salvage-expedition-announcement-countdown-minutes", ("duration", (component.EndTime - _timing.CurTime).Minutes)));
 
+         var directionLocalization = ContentLocalizationManager.FormatDirection(component.DungeonLocation.GetDir()).ToLower();
+
         if (component.DungeonLocation != Vector2.Zero)
-            Announce(args.MapUid, Loc.GetString("salvage-expedition-announcement-dungeon", ("direction", component.DungeonLocation.GetDir())));
+            Announce(args.MapUid, Loc.GetString("salvage-expedition-announcement-dungeon", ("direction", directionLocalization)));
 
         component.Stage = ExpeditionStage.Running;
         Dirty(args.MapUid, component);
diff --git a/Content.Server/Salvage/SpawnSalvageMissionJob.cs b/Content.Server/Salvage/SpawnSalvageMissionJob.cs
index ce844e57a13..e9318792b72 100644
--- a/Content.Server/Salvage/SpawnSalvageMissionJob.cs
+++ b/Content.Server/Salvage/SpawnSalvageMissionJob.cs
@@ -176,9 +176,11 @@ protected override async Task<bool> Process()
         dungeonOffset = dungeonRotation.RotateVec(dungeonOffset);
         var dungeonMod = _prototypeManager.Index<SalvageDungeonModPrototype>(mission.Dungeon);
         var dungeonConfig = _prototypeManager.Index<DungeonConfigPrototype>(dungeonMod.Proto);
-        var dungeon = await WaitAsyncTask(_dungeon.GenerateDungeonAsync(dungeonConfig, mapUid, grid, (Vector2i) dungeonOffset,
+        var dungeons = await WaitAsyncTask(_dungeon.GenerateDungeonAsync(dungeonConfig, mapUid, grid, (Vector2i) dungeonOffset,
             _missionParams.Seed));
 
+        var dungeon = dungeons.First();
+
         // Aborty
         if (dungeon.Rooms.Count == 0)
         {
diff --git a/Content.Server/Sandbox/Commands/ColorNetworkCommand.cs b/Content.Server/Sandbox/Commands/ColorNetworkCommand.cs
index d5dca64eaac..1fc207058d8 100644
--- a/Content.Server/Sandbox/Commands/ColorNetworkCommand.cs
+++ b/Content.Server/Sandbox/Commands/ColorNetworkCommand.cs
@@ -9,21 +9,19 @@
 namespace Content.Server.Sandbox.Commands
 {
     [AnyCommand]
-    public sealed class ColorNetworkCommand : IConsoleCommand
+    public sealed class ColorNetworkCommand : LocalizedCommands
     {
         [Dependency] private readonly IEntityManager _entManager = default!;
 
-        public string Command => "colornetwork";
-        public string Description => Loc.GetString("color-network-command-description");
-        public string Help => Loc.GetString("color-network-command-help-text", ("command",Command));
+        public override string Command => "colornetwork";
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             var sandboxManager = _entManager.System<SandboxSystem>();
             var adminManager = IoCManager.Resolve<IAdminManager>();
             if (shell.IsClient && (!sandboxManager.IsSandboxEnabled && !adminManager.HasAdminFlag(shell.Player!, AdminFlags.Mapping)))
             {
-                shell.WriteError("You are not currently able to use mapping commands.");
+                shell.WriteError(Loc.GetString("cmd-colornetwork-no-access"));
             }
 
             if (args.Length != 3)
diff --git a/Content.Server/Shuttles/Components/GridSpawnComponent.cs b/Content.Server/Shuttles/Components/GridSpawnComponent.cs
index 5f0fa7dd624..430c9c8df28 100644
--- a/Content.Server/Shuttles/Components/GridSpawnComponent.cs
+++ b/Content.Server/Shuttles/Components/GridSpawnComponent.cs
@@ -1,4 +1,6 @@
 using Content.Server.Shuttles.Systems;
+using Content.Shared.Dataset;
+using Content.Shared.Procedural;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
@@ -14,39 +16,103 @@ public sealed partial class GridSpawnComponent : Component
     /// Dictionary of groups where each group will have entries selected.
     /// String is just an identifier to make yaml easier.
     /// </summary>
-    [DataField(required: true)] public Dictionary<string, GridSpawnGroup> Groups = new();
+    [DataField(required: true)] public Dictionary<string, IGridSpawnGroup> Groups = new();
 }
 
-[DataRecord]
-public record struct GridSpawnGroup
+public interface IGridSpawnGroup
 {
-    public List<ResPath> Paths = new();
-    public int MinCount = 1;
-    public int MaxCount = 1;
+    /// <summary>
+    /// Minimum distance to spawn away from the station.
+    /// </summary>
+    public float MinimumDistance { get; }
+
+    /// <summary>
+    /// Maximum distance to spawn away from the station.
+    /// </summary>
+    public float MaximumDistance { get;  }
+
+    /// <inheritdoc />
+    public ProtoId<DatasetPrototype>? NameDataset { get; }
+
+    /// <inheritdoc />
+    int MinCount { get; set; }
+
+    /// <inheritdoc />
+    int MaxCount { get; set; }
 
     /// <summary>
     /// Components to be added to any spawned grids.
     /// </summary>
-    public ComponentRegistry AddComponents = new();
+    public ComponentRegistry AddComponents { get; set; }
 
     /// <summary>
     /// Hide the IFF label of the grid.
     /// </summary>
-    public bool Hide = false;
+    public bool Hide { get; set; }
 
     /// <summary>
     /// Should we set the metadata name of a grid. Useful for admin purposes.
     /// </summary>
-    public bool NameGrid = false;
+    public bool NameGrid { get; set; }
 
     /// <summary>
     /// Should we add this to the station's grids (if possible / relevant).
     /// </summary>
-    public bool StationGrid = true;
+    public bool StationGrid { get; set; }
+}
+
+[DataRecord]
+public sealed class DungeonSpawnGroup : IGridSpawnGroup
+{
+    /// <summary>
+    /// Prototypes we can choose from to spawn.
+    /// </summary>
+    public List<ProtoId<DungeonConfigPrototype>> Protos = new();
+
+    /// <inheritdoc />
+    public float MinimumDistance { get; }
+
+    public float MaximumDistance { get; }
+
+    /// <inheritdoc />
+    public ProtoId<DatasetPrototype>? NameDataset { get; }
+
+    /// <inheritdoc />
+    public int MinCount { get; set; } = 1;
+
+    /// <inheritdoc />
+    public int MaxCount { get; set; } = 1;
+
+    /// <inheritdoc />
+    public ComponentRegistry AddComponents { get; set; } = new();
+
+    /// <inheritdoc />
+    public bool Hide { get; set; } = false;
+
+    /// <inheritdoc />
+    public bool NameGrid { get; set; } = false;
+
+    /// <inheritdoc />
+    public bool StationGrid { get; set; } = false;
+}
+
+[DataRecord]
+public sealed class GridSpawnGroup : IGridSpawnGroup
+{
+    public List<ResPath> Paths = new();
+
+    /// <inheritdoc />
+    public float MinimumDistance { get; }
 
-    public GridSpawnGroup()
-    {
-    }
+    /// <inheritdoc />
+    public float MaximumDistance { get; }
+    public ProtoId<DatasetPrototype>? NameDataset { get; }
+    public int MinCount { get; set; } = 1;
+    public int MaxCount { get; set; } = 1;
+    public ComponentRegistry AddComponents { get; set; } = new();
+    public bool Hide { get; set; } = false;
+    public bool NameGrid { get; set; } = true;
+    public bool StationGrid { get; set; } = true;
 }
 
 
diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
index 47ccc3c3c41..0cbbc46a4fd 100644
--- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
+++ b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using System.Numerics;
 using Content.Server.Administration;
+using Content.Server.Chat.Managers;
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.GameTicking;
@@ -28,6 +29,7 @@
 using Robust.Shared.Configuration;
 using Robust.Shared.Console;
 using Robust.Shared.Map;
+using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
@@ -46,6 +48,7 @@ public sealed class ArrivalsSystem : EntitySystem
     [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IPrototypeManager _protoManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly IChatManager _chat = default!;
     [Dependency] private readonly BiomeSystem _biomes = default!;
     [Dependency] private readonly GameTicker _ticker = default!;
     [Dependency] private readonly MapLoaderSystem _loader = default!;
@@ -54,6 +57,7 @@ public sealed class ArrivalsSystem : EntitySystem
     [Dependency] private readonly ShuttleSystem _shuttles = default!;
     [Dependency] private readonly StationSpawningSystem _stationSpawning = default!;
     [Dependency] private readonly StationSystem _station = default!;
+    [Dependency] private readonly ActorSystem _actor = default!;
 
     private EntityQuery<PendingClockInComponent> _pendingQuery;
     private EntityQuery<ArrivalsBlacklistComponent> _blacklistQuery;
@@ -293,16 +297,20 @@ private void OnArrivalsDocked(EntityUid uid, ArrivalsShuttleComponent component,
     private void DumpChildren(EntityUid uid, ref FTLStartedEvent args)
     {
         var toDump = new List<Entity<TransformComponent>>();
-        DumpChildren(uid, ref args, toDump);
+        FindDumpChildren(uid, toDump);
         foreach (var (ent, xform) in toDump)
         {
             var rotation = xform.LocalRotation;
             _transform.SetCoordinates(ent, new EntityCoordinates(args.FromMapUid!.Value, Vector2.Transform(xform.LocalPosition, args.FTLFrom)));
             _transform.SetWorldRotation(ent, args.FromRotation + rotation);
+            if (_actor.TryGetSession(ent, out var session))
+            {
+                _chat.DispatchServerMessage(session!, Loc.GetString("latejoin-arrivals-dumped-from-shuttle"));
+            }
         }
     }
 
-    private void DumpChildren(EntityUid uid, ref FTLStartedEvent args, List<Entity<TransformComponent>> toDump)
+    private void FindDumpChildren(EntityUid uid, List<Entity<TransformComponent>> toDump)
     {
         if (_pendingQuery.HasComponent(uid))
             return;
@@ -318,7 +326,7 @@ private void DumpChildren(EntityUid uid, ref FTLStartedEvent args, List<Entity<T
         var children = xform.ChildEnumerator;
         while (children.MoveNext(out var child))
         {
-            DumpChildren(child, ref args, toDump);
+            FindDumpChildren(child, toDump);
         }
     }
 
@@ -392,6 +400,10 @@ private bool TryTeleportToMapSpawn(EntityUid player, EntityUid stationId, Transf
         {
             // Move the player to a random late-join spawnpoint.
             _transform.SetCoordinates(player, transform, _random.Pick(possiblePositions));
+            if (_actor.TryGetSession(player, out var session))
+            {
+                _chat.DispatchServerMessage(session!, Loc.GetString("latejoin-arrivals-teleport-to-spawn"));
+            }
             return true;
         }
 
diff --git a/Content.Server/Shuttles/Systems/DockingSystem.cs b/Content.Server/Shuttles/Systems/DockingSystem.cs
index 59a030e83c9..f46c3980e58 100644
--- a/Content.Server/Shuttles/Systems/DockingSystem.cs
+++ b/Content.Server/Shuttles/Systems/DockingSystem.cs
@@ -281,24 +281,24 @@ public void Dock(Entity<DockingComponent> dockA, Entity<DockingComponent> dockB)
             {
                 if (_doorSystem.TryOpen(dockAUid, doorA))
                 {
-                    doorA.ChangeAirtight = false;
                     if (TryComp<DoorBoltComponent>(dockAUid, out var airlockA))
                     {
                         _doorSystem.SetBoltsDown((dockAUid, airlockA), true);
                     }
                 }
+                doorA.ChangeAirtight = false;
             }
 
             if (TryComp(dockBUid, out DoorComponent? doorB))
             {
                 if (_doorSystem.TryOpen(dockBUid, doorB))
                 {
-                    doorB.ChangeAirtight = false;
                     if (TryComp<DoorBoltComponent>(dockBUid, out var airlockB))
                     {
                         _doorSystem.SetBoltsDown((dockBUid, airlockB), true);
                     }
                 }
+                doorB.ChangeAirtight = false;
             }
 
             if (_pathfinding.TryCreatePortal(dockAXform.Coordinates, dockBXform.Coordinates, out var handle))
diff --git a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.Drone.cs b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.Drone.cs
index 3af461bedac..eb5e11b8ebe 100644
--- a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.Drone.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.Drone.cs
@@ -1,6 +1,6 @@
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Events;
-using Content.Server.Station.Components;
+using Content.Shared.Station.Components;
 using Content.Shared.UserInterface;
 
 namespace Content.Server.Shuttles.Systems;
diff --git a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
index 7a19fd13b2e..00a913aad86 100644
--- a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
@@ -71,6 +71,7 @@ public override void Initialize()
         SubscribeLocalEvent<UndockEvent>(OnUndock);
 
         SubscribeLocalEvent<PilotComponent, ComponentGetState>(OnGetState);
+        SubscribeLocalEvent<PilotComponent, StopPilotingAlertEvent>(OnStopPilotingAlert);
 
         SubscribeLocalEvent<FTLDestinationComponent, ComponentStartup>(OnFtlDestStartup);
         SubscribeLocalEvent<FTLDestinationComponent, ComponentShutdown>(OnFtlDestShutdown);
@@ -196,6 +197,14 @@ private void OnGetState(EntityUid uid, PilotComponent component, ref ComponentGe
         args.State = new PilotComponentState(GetNetEntity(component.Console));
     }
 
+    private void OnStopPilotingAlert(Entity<PilotComponent> ent, ref StopPilotingAlertEvent args)
+    {
+        if (ent.Comp.Console != null)
+        {
+            RemovePilot(ent, ent);
+        }
+    }
+
     /// <summary>
     /// Returns the position and angle of all dockingcomponents.
     /// </summary>
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
index 28f784f1dda..518867b5558 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
@@ -82,6 +82,8 @@ public sealed partial class ShuttleSystem
     private void InitializeFTL()
     {
         SubscribeLocalEvent<StationPostInitEvent>(OnStationPostInit);
+        SubscribeLocalEvent<FTLComponent, ComponentShutdown>(OnFtlShutdown);
+
         _bodyQuery = GetEntityQuery<BodyComponent>();
         _buckleQuery = GetEntityQuery<BuckleComponent>();
         _beaconQuery = GetEntityQuery<FTLBeaconComponent>();
@@ -98,6 +100,12 @@ private void InitializeFTL()
         _cfg.OnValueChanged(CCVars.HyperspaceKnockdownTime, time => _hyperspaceKnockdownTime = TimeSpan.FromSeconds(time), true);
     }
 
+    private void OnFtlShutdown(Entity<FTLComponent> ent, ref ComponentShutdown args)
+    {
+        Del(ent.Comp.VisualizerEntity);
+        ent.Comp.VisualizerEntity = null;
+    }
+
     private void OnStationPostInit(ref StationPostInitEvent ev)
     {
         // Add all grid maps as ftl destinations that anyone can FTL to.
@@ -422,8 +430,16 @@ private void UpdateFTLTravelling(Entity<FTLComponent, ShuttleComponent> entity)
         var comp = entity.Comp1;
         comp.StateTime = StartEndTime.FromCurTime(_gameTiming, DefaultArrivalTime);
         comp.State = FTLState.Arriving;
-        // TODO: Arrival effects
-        // For now we'll just use the ss13 bubbles but we can do fancier.
+
+        if (entity.Comp1.VisualizerProto != null)
+        {
+            comp.VisualizerEntity = SpawnAtPosition(entity.Comp1.VisualizerProto, entity.Comp1.TargetCoordinates);
+            var visuals = Comp<FtlVisualizerComponent>(comp.VisualizerEntity.Value);
+            visuals.Grid = entity.Owner;
+            Dirty(comp.VisualizerEntity.Value, visuals);
+            _transform.SetLocalRotation(comp.VisualizerEntity.Value, entity.Comp1.TargetAngle);
+            _pvs.AddGlobalOverride(comp.VisualizerEntity.Value);
+        }
 
         _thruster.DisableLinearThrusters(shuttle);
         _thruster.EnableLinearThrustDirection(shuttle, DirectionFlag.South);
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs
index 853548add37..c0eff119314 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs
@@ -1,9 +1,14 @@
+using System.Numerics;
 using Content.Server.Shuttles.Components;
 using Content.Server.Station.Components;
 using Content.Server.Station.Events;
-using Content.Shared.Cargo.Components;
 using Content.Shared.CCVar;
+using Content.Shared.Salvage;
 using Content.Shared.Shuttles.Components;
+using Content.Shared.Station.Components;
+using Robust.Shared.Collections;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
@@ -65,11 +70,11 @@ private void CargoSpawn(EntityUid uid, StationCargoShuttleComponent component)
         if (targetGrid == null)
             return;
 
-        var mapId = _mapManager.CreateMap();
+        _mapSystem.CreateMap(out var mapId);
 
         if (_loader.TryLoad(mapId, component.Path.ToString(), out var ent) && ent.Count > 0)
         {
-            if (TryComp<ShuttleComponent>(ent[0], out var shuttle))
+            if (HasComp<ShuttleComponent>(ent[0]))
             {
                 TryFTLProximity(ent[0], targetGrid.Value);
             }
@@ -80,6 +85,84 @@ private void CargoSpawn(EntityUid uid, StationCargoShuttleComponent component)
         _mapManager.DeleteMap(mapId);
     }
 
+    private bool TryDungeonSpawn(Entity<MapGridComponent?> targetGrid, MapId mapId, DungeonSpawnGroup group, out EntityUid spawned)
+    {
+        spawned = EntityUid.Invalid;
+
+        if (!_gridQuery.Resolve(targetGrid.Owner, ref targetGrid.Comp))
+        {
+            return false;
+        }
+
+        var dungeonProtoId = _random.Pick(group.Protos);
+
+        if (!_protoManager.TryIndex(dungeonProtoId, out var dungeonProto))
+        {
+            return false;
+        }
+
+        var targetPhysics = _physicsQuery.Comp(targetGrid);
+        var spawnCoords = new EntityCoordinates(targetGrid, targetPhysics.LocalCenter);
+
+        if (group.MinimumDistance > 0f)
+        {
+            var distancePadding = MathF.Max(targetGrid.Comp.LocalAABB.Width, targetGrid.Comp.LocalAABB.Height);
+            spawnCoords = spawnCoords.Offset(_random.NextVector2(distancePadding + group.MinimumDistance, distancePadding + group.MaximumDistance));
+        }
+
+        var spawnMapCoords = _transform.ToMapCoordinates(spawnCoords);
+        var spawnedGrid = _mapManager.CreateGridEntity(mapId);
+
+        _transform.SetMapCoordinates(spawnedGrid, spawnMapCoords);
+        _dungeon.GenerateDungeon(dungeonProto, spawnedGrid.Owner, spawnedGrid.Comp, Vector2i.Zero, _random.Next());
+
+        spawned = spawnedGrid.Owner;
+        return true;
+    }
+
+    private bool TryGridSpawn(EntityUid targetGrid, EntityUid stationUid, MapId mapId, GridSpawnGroup group, out EntityUid spawned)
+    {
+        spawned = EntityUid.Invalid;
+
+        if (group.Paths.Count == 0)
+        {
+            Log.Error($"Found no paths for GridSpawn");
+            return false;
+        }
+
+        var paths = new ValueList<ResPath>();
+
+        // Round-robin so we try to avoid dupes where possible.
+        if (paths.Count == 0)
+        {
+            paths.AddRange(group.Paths);
+            _random.Shuffle(paths);
+        }
+
+        var path = paths[^1];
+        paths.RemoveAt(paths.Count - 1);
+
+        if (_loader.TryLoad(mapId, path.ToString(), out var ent) && ent.Count == 1)
+        {
+            if (HasComp<ShuttleComponent>(ent[0]))
+            {
+                TryFTLProximity(ent[0], targetGrid);
+            }
+
+            if (group.NameGrid)
+            {
+                var name = path.FilenameWithoutExtension;
+                _metadata.SetEntityName(ent[0], name);
+            }
+
+            spawned = ent[0];
+            return true;
+        }
+
+        Log.Error($"Error loading gridspawn for {ToPrettyString(stationUid)} / {path}");
+        return false;
+    }
+
     private void GridSpawns(EntityUid uid, GridSpawnComponent component)
     {
         if (!_cfg.GetCVar(CCVars.GridFill))
@@ -96,82 +179,50 @@ private void GridSpawns(EntityUid uid, GridSpawnComponent component)
             return;
 
         // Spawn on a dummy map and try to FTL if possible, otherwise dump it.
-        var mapId = _mapManager.CreateMap();
-        var valid = true;
-        var paths = new List<ResPath>();
+        _mapSystem.CreateMap(out var mapId);
 
         foreach (var group in component.Groups.Values)
         {
-            if (group.Paths.Count == 0)
-            {
-                Log.Error($"Found no paths for GridSpawn");
-                continue;
-            }
-
-            var count = _random.Next(group.MinCount, group.MaxCount);
-            paths.Clear();
+            var count = _random.Next(group.MinCount, group.MaxCount + 1);
 
             for (var i = 0; i < count; i++)
             {
-                // Round-robin so we try to avoid dupes where possible.
-                if (paths.Count == 0)
-                {
-                    paths.AddRange(group.Paths);
-                    _random.Shuffle(paths);
-                }
-
-                var path = paths[^1];
-                paths.RemoveAt(paths.Count - 1);
+                EntityUid spawned;
 
-                if (_loader.TryLoad(mapId, path.ToString(), out var ent) && ent.Count == 1)
+                switch (group)
                 {
-                    if (TryComp<ShuttleComponent>(ent[0], out var shuttle))
-                    {
-                        TryFTLProximity(ent[0], targetGrid.Value);
-                    }
-                    else
-                    {
-                        valid = false;
-                    }
-
-                    if (group.Hide)
-                    {
-                        var iffComp = EnsureComp<IFFComponent>(ent[0]);
-                        iffComp.Flags |= IFFFlags.HideLabel;
-                        Dirty(ent[0], iffComp);
-                    }
-
-                    if (group.StationGrid)
-                    {
-                        _station.AddGridToStation(uid, ent[0]);
-                    }
-
-                    if (group.NameGrid)
-                    {
-                        var name = path.FilenameWithoutExtension;
-                        _metadata.SetEntityName(ent[0], name);
-                    }
-
-                    foreach (var compReg in group.AddComponents.Values)
-                    {
-                        var compType = compReg.Component.GetType();
+                    case DungeonSpawnGroup dungeon:
+                        if (!TryDungeonSpawn(targetGrid.Value, mapId, dungeon, out spawned))
+                            continue;
 
-                        if (HasComp(ent[0], compType))
+                        break;
+                    case GridSpawnGroup grid:
+                        if (!TryGridSpawn(targetGrid.Value, uid, mapId, grid, out spawned))
                             continue;
 
-                        var comp = _factory.GetComponent(compType);
-                        AddComp(ent[0], comp, true);
-                    }
+                        break;
+                    default:
+                        throw new NotImplementedException();
+                }
+
+                if (_protoManager.TryIndex(group.NameDataset, out var dataset))
+                {
+                    _metadata.SetEntityName(spawned, SharedSalvageSystem.GetFTLName(dataset, _random.Next()));
                 }
-                else
+
+                if (group.Hide)
                 {
-                    valid = false;
+                    var iffComp = EnsureComp<IFFComponent>(spawned);
+                    iffComp.Flags |= IFFFlags.HideLabel;
+                    Dirty(spawned, iffComp);
                 }
 
-                if (!valid)
+                if (group.StationGrid)
                 {
-                    Log.Error($"Error loading gridspawn for {ToPrettyString(uid)} / {path}");
+                    _station.AddGridToStation(uid, spawned);
                 }
+
+                EntityManager.AddComponents(spawned, group.AddComponents);
             }
         }
 
@@ -191,7 +242,7 @@ private void OnGridFillMapInit(EntityUid uid, GridFillComponent component, MapIn
         }
 
         // Spawn on a dummy map and try to dock if possible, otherwise dump it.
-        var mapId = _mapManager.CreateMap();
+        _mapSystem.CreateMap(out var mapId);
         var valid = false;
 
         if (_loader.TryLoad(mapId, component.Path.ToString(), out var ent) &&
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.IFF.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.IFF.cs
index ed5d109e852..5e746fd4953 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.IFF.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.IFF.cs
@@ -1,4 +1,5 @@
 using Content.Server.Shuttles.Components;
+using Content.Shared.CCVar;
 using Content.Shared.Shuttles.BUIStates;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Shuttles.Events;
@@ -12,6 +13,26 @@ private void InitializeIFF()
         SubscribeLocalEvent<IFFConsoleComponent, AnchorStateChangedEvent>(OnIFFConsoleAnchor);
         SubscribeLocalEvent<IFFConsoleComponent, IFFShowIFFMessage>(OnIFFShow);
         SubscribeLocalEvent<IFFConsoleComponent, IFFShowVesselMessage>(OnIFFShowVessel);
+        SubscribeLocalEvent<GridSplitEvent>(OnGridSplit);
+    }
+
+    private void OnGridSplit(ref GridSplitEvent ev)
+    {
+        var splitMass = _cfg.GetCVar(CCVars.HideSplitGridsUnder);
+
+        if (splitMass < 0)
+            return;
+
+        foreach (var grid in ev.NewGrids)
+        {
+            if (!_physicsQuery.TryGetComponent(grid, out var physics) ||
+                physics.Mass > splitMass)
+            {
+                continue;
+            }
+
+            AddIFFFlag(grid, IFFFlags.HideLabel);
+        }
     }
 
     private void OnIFFShow(EntityUid uid, IFFConsoleComponent component, IFFShowIFFMessage args)
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
index bbafef022c8..6ae4aff2f4a 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
@@ -2,6 +2,7 @@
 using Content.Server.Body.Systems;
 using Content.Server.Doors.Systems;
 using Content.Server.Parallax;
+using Content.Server.Procedural;
 using Content.Server.Shuttles.Components;
 using Content.Server.Station.Systems;
 using Content.Server.Stunnable;
@@ -11,6 +12,7 @@
 using Content.Shared.Throwing;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
+using Robust.Server.GameStates;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
@@ -19,6 +21,7 @@
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Systems;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
@@ -27,19 +30,24 @@ namespace Content.Server.Shuttles.Systems;
 [UsedImplicitly]
 public sealed partial class ShuttleSystem : SharedShuttleSystem
 {
+    [Dependency] private readonly IAdminLogManager _logger = default!;
     [Dependency] private readonly IComponentFactory _factory = default!;
     [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly MapSystem _mapSystem = default!;
     [Dependency] private readonly IMapManager _mapManager = default!;
+    [Dependency] private readonly IPrototypeManager _protoManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly ITileDefinitionManager _tileDefManager = default!;
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly BiomeSystem _biomes = default!;
     [Dependency] private readonly BodySystem _bobby = default!;
     [Dependency] private readonly DockingSystem _dockSystem = default!;
+    [Dependency] private readonly DungeonSystem _dungeon = 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 PvsOverrideSystem _pvs = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedMapSystem _maps = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
@@ -50,7 +58,8 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
     [Dependency] private readonly ThrowingSystem _throwing = default!;
     [Dependency] private readonly ThrusterSystem _thruster = default!;
     [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
-    [Dependency] private readonly IAdminLogManager _logger = default!;
+
+    private EntityQuery<MapGridComponent> _gridQuery;
 
     public const float TileMassMultiplier = 0.5f;
 
@@ -58,6 +67,8 @@ public override void Initialize()
     {
         base.Initialize();
 
+        _gridQuery = GetEntityQuery<MapGridComponent>();
+
         InitializeFTL();
         InitializeGridFills();
         InitializeIFF();
diff --git a/Content.Server/Shuttles/Systems/ThrusterSystem.cs b/Content.Server/Shuttles/Systems/ThrusterSystem.cs
index e82235e44f5..fd149630814 100644
--- a/Content.Server/Shuttles/Systems/ThrusterSystem.cs
+++ b/Content.Server/Shuttles/Systems/ThrusterSystem.cs
@@ -18,6 +18,7 @@
 using Robust.Shared.Physics.Systems;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
+using Content.Shared.Localizations;
 
 namespace Content.Server.Shuttles.Systems;
 
@@ -67,8 +68,9 @@ private void OnThrusterExamine(EntityUid uid, ThrusterComponent component, Exami
                 EntityManager.TryGetComponent(uid, out TransformComponent? xform) &&
                 xform.Anchored)
             {
+                var nozzleLocalization = ContentLocalizationManager.FormatDirection(xform.LocalRotation.Opposite().ToWorldVec().GetDir()).ToLower();
                 var nozzleDir = Loc.GetString("thruster-comp-nozzle-direction",
-                    ("direction", xform.LocalRotation.Opposite().ToWorldVec().GetDir().ToString().ToLowerInvariant()));
+                    ("direction", nozzleLocalization));
 
                 args.PushMarkup(nozzleDir);
 
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
index 746d75f0d85..f289752b7cf 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
@@ -29,7 +29,7 @@ private void OnModuleGotInserted(EntityUid uid, BorgModuleComponent component, E
 
         if (!TryComp<BorgChassisComponent>(chassis, out var chassisComp) ||
             args.Container != chassisComp.ModuleContainer ||
-            !chassisComp.Activated)
+            !Toggle.IsActivated(chassis))
             return;
 
         if (!_powerCell.HasDrawCharge(uid))
@@ -143,6 +143,7 @@ public void SelectModule(EntityUid chassis,
         var ev = new BorgModuleSelectedEvent(chassis);
         RaiseLocalEvent(moduleUid, ref ev);
         chassisComp.SelectedModule = moduleUid;
+        Dirty(chassis, chassisComp);
     }
 
     /// <summary>
@@ -162,6 +163,7 @@ public void UnselectModule(EntityUid chassis, BorgChassisComponent? chassisComp
         var ev = new BorgModuleUnselectedEvent(chassis);
         RaiseLocalEvent(chassisComp.SelectedModule.Value, ref ev);
         chassisComp.SelectedModule = null;
+        Dirty(chassis, chassisComp);
     }
 
     private void OnItemModuleSelected(EntityUid uid, ItemBorgModuleComponent component, ref BorgModuleSelectedEvent args)
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.cs b/Content.Server/Silicons/Borgs/BorgSystem.cs
index c97ca9cbc0d..3f32afbffbd 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.cs
@@ -10,6 +10,7 @@
 using Content.Shared.Database;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
+using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 using Content.Shared.Mobs;
@@ -39,7 +40,6 @@ public sealed partial class BorgSystem : SharedBorgSystem
     [Dependency] private readonly IBanManager _banManager = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly SharedAccessSystem _access = default!;
     [Dependency] private readonly ActionsSystem _actions = default!;
     [Dependency] private readonly AlertsSystem _alerts = default!;
     [Dependency] private readonly DeviceNetworkSystem _deviceNetwork = default!;
@@ -73,6 +73,7 @@ public override void Initialize()
         SubscribeLocalEvent<BorgChassisComponent, PowerCellChangedEvent>(OnPowerCellChanged);
         SubscribeLocalEvent<BorgChassisComponent, PowerCellSlotEmptyEvent>(OnPowerCellSlotEmpty);
         SubscribeLocalEvent<BorgChassisComponent, GetCharactedDeadIcEvent>(OnGetDeadIC);
+        SubscribeLocalEvent<BorgChassisComponent, ItemToggledEvent>(OnToggled);
 
         SubscribeLocalEvent<BorgBrainComponent, MindAddedMessage>(OnBrainMindAdded);
         SubscribeLocalEvent<BorgBrainComponent, PointAttemptEvent>(OnBrainPointAttempt);
@@ -173,11 +174,11 @@ private void OnMobStateChanged(EntityUid uid, BorgChassisComponent component, Mo
         if (args.NewMobState == MobState.Alive)
         {
             if (_mind.TryGetMind(uid, out _, out _))
-                _powerCell.SetPowerCellDrawEnabled(uid, true);
+                _powerCell.SetDrawEnabled(uid, true);
         }
         else
         {
-            _powerCell.SetPowerCellDrawEnabled(uid, false);
+            _powerCell.SetDrawEnabled(uid, false);
         }
     }
 
@@ -185,24 +186,10 @@ private void OnPowerCellChanged(EntityUid uid, BorgChassisComponent component, P
     {
         UpdateBatteryAlert((uid, component));
 
-        if (!TryComp<PowerCellDrawComponent>(uid, out var draw))
-            return;
-
-        // if we eject the battery or run out of charge, then disable
-        if (args.Ejected || !_powerCell.HasDrawCharge(uid))
-        {
-            DisableBorgAbilities(uid, component);
-            return;
-        }
-
         // if we aren't drawing and suddenly get enough power to draw again, reeanble.
-        if (_powerCell.HasDrawCharge(uid, draw))
+        if (_powerCell.HasDrawCharge(uid))
         {
-            // only reenable the powerdraw if a player has the role.
-            if (!draw.Drawing && _mind.TryGetMind(uid, out _, out _) && _mobState.IsAlive(uid))
-                _powerCell.SetPowerCellDrawEnabled(uid, true);
-
-            EnableBorgAbilities(uid, component);
+            Toggle.TryActivate(uid);
         }
 
         UpdateUI(uid, component);
@@ -210,7 +197,7 @@ private void OnPowerCellChanged(EntityUid uid, BorgChassisComponent component, P
 
     private void OnPowerCellSlotEmpty(EntityUid uid, BorgChassisComponent component, ref PowerCellSlotEmptyEvent args)
     {
-        DisableBorgAbilities(uid, component);
+        Toggle.TryDeactivate(uid);
         UpdateUI(uid, component);
     }
 
@@ -219,6 +206,23 @@ private void OnGetDeadIC(EntityUid uid, BorgChassisComponent component, ref GetC
         args.Dead = true;
     }
 
+    private void OnToggled(Entity<BorgChassisComponent> ent, ref ItemToggledEvent args)
+    {
+        var (uid, comp) = ent;
+        if (args.Activated)
+            InstallAllModules(uid, comp);
+        else
+            DisableAllModules(uid, comp);
+
+        // only enable the powerdraw if there is a player in the chassis
+        var drawing = _mind.TryGetMind(uid, out _, out _) && _mobState.IsAlive(ent);
+        _powerCell.SetDrawEnabled(uid, drawing);
+
+        UpdateUI(uid, comp);
+
+        _movementSpeedModifier.RefreshMovementSpeedModifiers(uid);
+    }
+
     private void OnBrainMindAdded(EntityUid uid, BorgBrainComponent component, MindAddedMessage args)
     {
         if (!Container.TryGetOuterContainer(uid, Transform(uid), out var container))
@@ -271,44 +275,14 @@ private void UpdateBatteryAlert(Entity<BorgChassisComponent> ent, PowerCellSlotC
         _alerts.ShowAlert(ent, ent.Comp.BatteryAlert, chargePercent);
     }
 
-    /// <summary>
-    /// Activates the borg, enabling all of its modules.
-    /// </summary>
-    public void EnableBorgAbilities(EntityUid uid, BorgChassisComponent component, PowerCellDrawComponent? powerCell = null)
-    {
-        if (component.Activated)
-            return;
-
-        component.Activated = true;
-        InstallAllModules(uid, component);
-        Dirty(uid, component);
-        _movementSpeedModifier.RefreshMovementSpeedModifiers(uid);
-    }
-
-    /// <summary>
-    /// Deactivates the borg, disabling all of its modules and decreasing its speed.
-    /// </summary>
-    public void DisableBorgAbilities(EntityUid uid, BorgChassisComponent component)
-    {
-        if (!component.Activated)
-            return;
-
-        component.Activated = false;
-        DisableAllModules(uid, component);
-        Dirty(uid, component);
-        _movementSpeedModifier.RefreshMovementSpeedModifiers(uid);
-    }
-
     /// <summary>
     /// Activates a borg when a player occupies it
     /// </summary>
     public void BorgActivate(EntityUid uid, BorgChassisComponent component)
     {
         Popup.PopupEntity(Loc.GetString("borg-mind-added", ("name", Identity.Name(uid, EntityManager))), uid);
-        _powerCell.SetPowerCellDrawEnabled(uid, true);
-        _access.SetAccessEnabled(uid, true);
+        Toggle.TryActivate(uid);
         _appearance.SetData(uid, BorgVisuals.HasPlayer, true);
-        Dirty(uid, component);
     }
 
     /// <summary>
@@ -317,10 +291,8 @@ public void BorgActivate(EntityUid uid, BorgChassisComponent component)
     public void BorgDeactivate(EntityUid uid, BorgChassisComponent component)
     {
         Popup.PopupEntity(Loc.GetString("borg-mind-removed", ("name", Identity.Name(uid, EntityManager))), uid);
-        _powerCell.SetPowerCellDrawEnabled(uid, false);
-        _access.SetAccessEnabled(uid, false);
+        Toggle.TryDeactivate(uid);
         _appearance.SetData(uid, BorgVisuals.HasPlayer, false);
-        Dirty(uid, component);
     }
 
     /// <summary>
diff --git a/Content.Server/Silicons/Laws/SiliconLawEui.cs b/Content.Server/Silicons/Laws/SiliconLawEui.cs
new file mode 100644
index 00000000000..d5a5c4f4091
--- /dev/null
+++ b/Content.Server/Silicons/Laws/SiliconLawEui.cs
@@ -0,0 +1,70 @@
+using Content.Server.Administration.Managers;
+using Content.Server.EUI;
+using Content.Shared.Administration;
+using Content.Shared.Eui;
+using Content.Shared.Silicons.Laws;
+using Content.Shared.Silicons.Laws.Components;
+
+namespace Content.Server.Silicons.Laws;
+
+public sealed class SiliconLawEui : BaseEui
+{
+    private readonly SiliconLawSystem _siliconLawSystem;
+    private readonly EntityManager _entityManager;
+    private readonly IAdminManager _adminManager;
+
+    private List<SiliconLaw> _laws = new();
+    private ISawmill _sawmill = default!;
+    private EntityUid _target;
+
+    public SiliconLawEui(SiliconLawSystem siliconLawSystem, EntityManager entityManager, IAdminManager manager)
+    {
+        _siliconLawSystem = siliconLawSystem;
+        _adminManager = manager;
+        _entityManager = entityManager;
+        _sawmill = Logger.GetSawmill("silicon-law-eui");
+    }
+
+    public override EuiStateBase GetNewState()
+    {
+        return new SiliconLawsEuiState(_laws, _entityManager.GetNetEntity(_target));
+    }
+
+    public void UpdateLaws(SiliconLawBoundComponent? lawBoundComponent, EntityUid player)
+    {
+        if (!IsAllowed())
+            return;
+
+        var laws = _siliconLawSystem.GetLaws(player, lawBoundComponent);
+        _laws = laws.Laws;
+        _target = player;
+        StateDirty();
+    }
+
+    public override void HandleMessage(EuiMessageBase msg)
+    {
+        if (msg is not SiliconLawsSaveMessage message)
+        {
+            return;
+        }
+
+        if (!IsAllowed())
+            return;
+
+        var player = _entityManager.GetEntity(message.Target);
+
+        _siliconLawSystem.SetLaws(message.Laws, player);
+    }
+
+    private bool IsAllowed()
+    {
+        var adminData = _adminManager.GetAdminData(Player);
+        if (adminData == null || !adminData.HasFlag(AdminFlags.Moderator))
+        {
+            _sawmill.Warning("Player {0} tried to open / use silicon law UI without permission.", Player.UserId);
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/Content.Server/Silicons/Laws/SiliconLawSystem.cs b/Content.Server/Silicons/Laws/SiliconLawSystem.cs
index bc7a7b35c27..0c0f68c23f3 100644
--- a/Content.Server/Silicons/Laws/SiliconLawSystem.cs
+++ b/Content.Server/Silicons/Laws/SiliconLawSystem.cs
@@ -22,6 +22,7 @@
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Toolshed;
+using Robust.Shared.Utility;
 
 namespace Content.Server.Silicons.Laws;
 
@@ -278,6 +279,21 @@ public SiliconLawset GetLawset(string lawset)
 
         return laws;
     }
+
+    /// <summary>
+    /// Set the laws of a silicon entity while notifying the player.
+    /// </summary>
+    public void SetLaws(List<SiliconLaw> newLaws, EntityUid target)
+    {
+        if (!TryComp<SiliconLawProviderComponent>(target, out var component))
+            return;
+
+        if (component.Lawset == null)
+            component.Lawset = new SiliconLawset();
+
+        component.Lawset.Laws = newLaws;
+        NotifyLawsChanged(target);
+    }
 }
 
 [ToolshedCommand, AdminCommand(AdminFlags.Admin)]
diff --git a/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs b/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
index e575b0403b6..ca32beb8dbb 100644
--- a/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
@@ -22,6 +22,7 @@ public sealed class ContainmentFieldGeneratorSystem : EntitySystem
     [Dependency] private readonly PhysicsSystem _physics = default!;
     [Dependency] private readonly PopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedPointLightSystem _light = default!;
+    [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
     [Dependency] private readonly TagSystem _tags = default!;
 
     public override void Initialize()
@@ -116,7 +117,7 @@ private void OnReanchorEvent(Entity<ContainmentFieldGeneratorComponent> generato
     private void OnUnanchorAttempt(EntityUid uid, ContainmentFieldGeneratorComponent component,
         UnanchorAttemptEvent args)
     {
-        if (component.Enabled)
+        if (component.Enabled || component.IsConnected)
         {
             _popupSystem.PopupEntity(Loc.GetString("comp-containment-anchor-warning"), args.User, args.User, PopupType.LargeCaution);
             args.Cancel();
@@ -234,7 +235,7 @@ private bool TryGenerateFieldConnection(Direction dir, Entity<ContainmentFieldGe
         if (!gen1XForm.Anchored)
             return false;
 
-        var genWorldPosRot = gen1XForm.GetWorldPositionRotation();
+        var genWorldPosRot = _transformSystem.GetWorldPositionRotation(gen1XForm);
         var dirRad = dir.ToAngle() + genWorldPosRot.WorldRotation; //needs to be like this for the raycast to work properly
 
         var ray = new CollisionRay(genWorldPosRot.WorldPosition, dirRad.ToVec(), component.CollisionMask);
diff --git a/Content.Server/Singularity/EntitySystems/ContainmentFieldSystem.cs b/Content.Server/Singularity/EntitySystems/ContainmentFieldSystem.cs
index 3944e94c20d..d3a32f50064 100644
--- a/Content.Server/Singularity/EntitySystems/ContainmentFieldSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/ContainmentFieldSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Popups;
+using Content.Server.Popups;
 using Content.Server.Shuttles.Components;
 using Content.Server.Singularity.Events;
 using Content.Shared.Popups;
@@ -13,6 +13,7 @@ public sealed class ContainmentFieldSystem : EntitySystem
 {
     [Dependency] private readonly ThrowingSystem _throwing = default!;
     [Dependency] private readonly PopupSystem _popupSystem = default!;
+    [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
 
     public override void Initialize()
     {
@@ -34,10 +35,10 @@ private void HandleFieldCollide(EntityUid uid, ContainmentFieldComponent compone
 
         if (TryComp<PhysicsComponent>(otherBody, out var physics) && physics.Mass <= component.MaxMass && physics.Hard)
         {
-            var fieldDir = Transform(uid).WorldPosition;
-            var playerDir = Transform(otherBody).WorldPosition;
+            var fieldDir = _transformSystem.GetWorldPosition(uid);
+            var playerDir = _transformSystem.GetWorldPosition(otherBody);
 
-            _throwing.TryThrow(otherBody, playerDir-fieldDir, strength: component.ThrowForce);
+            _throwing.TryThrow(otherBody, playerDir-fieldDir, baseThrowSpeed: component.ThrowForce);
         }
     }
 
diff --git a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
index 5384b8b25d7..584f6b4a8f6 100644
--- a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
@@ -97,7 +97,7 @@ public void Update(EntityUid uid, EventHorizonComponent? eventHorizon = null, Tr
             return;
 
         // Handle singularities some admin smited into a locker.
-        if (_containerSystem.TryGetContainingContainer(uid, out var container, transform: xform)
+        if (_containerSystem.TryGetContainingContainer((uid, xform, null), out var container)
         && !AttemptConsumeEntity(uid, container.Owner, eventHorizon))
         {
             // Locker is indestructible. Consume everything else in the locker instead of magically teleporting out.
@@ -216,7 +216,7 @@ public void ConsumeEntitiesInContainer(EntityUid hungry, BaseContainer container
                 if (_containerSystem.Insert(entity, target_container))
                     break;
 
-                _containerSystem.TryGetContainingContainer(target_container.Owner, out target_container);
+                _containerSystem.TryGetContainingContainer((target_container.Owner, null, null), out target_container);
             }
 
             // If we couldn't or there was no container to insert into just dump them to the map/grid.
@@ -472,7 +472,7 @@ private void OnContainerConsumed(EntityUid uid, ContainerManagerComponent comp,
     {
         var drop_container = args.Container;
         if (drop_container is null)
-            _containerSystem.TryGetContainingContainer(uid, out drop_container);
+            _containerSystem.TryGetContainingContainer((uid, null, null), out drop_container);
 
         foreach (var container in comp.GetAllContainers())
         {
diff --git a/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs b/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs
index f53d658ebd7..8c884d023c4 100644
--- a/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs
@@ -156,7 +156,7 @@ public void GravPulse(EntityUid uid, float maxRange, float minRange, float baseR
     /// <param name="minRange">The minimum distance at which entities can be affected by the gravity pulse.</param>
     /// <param name="baseMatrixDeltaV">The base velocity added to any entities within affected by the gravity pulse scaled by the displacement of those entities from the epicenter.</param>
     public void GravPulse(EntityCoordinates entityPos, float maxRange, float minRange, in Matrix3x2 baseMatrixDeltaV)
-        => GravPulse(entityPos.ToMap(EntityManager, _transform), maxRange, minRange, in baseMatrixDeltaV);
+        => GravPulse(_transform.ToMapCoordinates(entityPos), maxRange, minRange, in baseMatrixDeltaV);
 
     /// <summary>
     /// Greates a gravitational pulse, shoving around all entities within some distance of an epicenter.
@@ -167,7 +167,7 @@ public void GravPulse(EntityCoordinates entityPos, float maxRange, float minRang
     /// <param name="baseRadialDeltaV">The base radial velocity that will be added to entities within range towards the center of the gravitational pulse.</param>
     /// <param name="baseTangentialDeltaV">The base tangential velocity that will be added to entities within countrclockwise around the center of the gravitational pulse.</param>
     public void GravPulse(EntityCoordinates entityPos, float maxRange, float minRange, float baseRadialDeltaV = 0.0f, float baseTangentialDeltaV = 0.0f)
-        => GravPulse(entityPos.ToMap(EntityManager, _transform), maxRange, minRange, baseRadialDeltaV, baseTangentialDeltaV);
+        => GravPulse(_transform.ToMapCoordinates(entityPos), maxRange, minRange, baseRadialDeltaV, baseTangentialDeltaV);
 
     /// <summary>
     /// Causes a gravitational pulse, shoving around all entities within some distance of an epicenter.
@@ -206,7 +206,7 @@ public void GravPulse(MapCoordinates mapPos, float maxRange, float minRange, in
                 continue;
 
             var scaling = (1f / distance2) * physics.Mass; // TODO: Variable falloff gradiants.
-            _physics.ApplyLinearImpulse(entity, Vector2.Transform(displacement, baseMatrixDeltaV) * scaling, body: physics);
+            _physics.ApplyLinearImpulse(entity, Vector2.TransformNormal(displacement, baseMatrixDeltaV) * scaling, body: physics);
         }
     }
 
@@ -219,10 +219,7 @@ public void GravPulse(MapCoordinates mapPos, float maxRange, float minRange, in
     /// <param name="baseRadialDeltaV">The base amount of velocity that will be added to entities in range towards the epicenter of the pulse.</param>
     /// <param name="baseTangentialDeltaV">The base amount of velocity that will be added to entities in range counterclockwise relative to the epicenter of the pulse.</param>
     public void GravPulse(MapCoordinates mapPos, float maxRange, float minRange = 0.0f, float baseRadialDeltaV = 0.0f, float baseTangentialDeltaV = 0.0f)
-        => GravPulse(mapPos, maxRange, minRange, new Matrix3x2(
-            baseRadialDeltaV, -baseTangentialDeltaV, 0.0f,
-            +baseTangentialDeltaV, baseRadialDeltaV, 0.0f
-        ));
+        => GravPulse(mapPos, maxRange, minRange, new Matrix3x2(baseRadialDeltaV, -baseTangentialDeltaV, baseTangentialDeltaV, baseRadialDeltaV, 0.0f, 0.0f));
 
     #endregion GravPulse
 
diff --git a/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs b/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs
index 9107ff2e32e..c262988c869 100644
--- a/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs
@@ -137,13 +137,22 @@ private void PostSync(NetworkBatteryPostSync ev)
 
     private void OnExamined(EntityUid uid, RadiationCollectorComponent component, ExaminedEvent args)
     {
-        if (!TryGetLoadedGasTank(uid, out var gasTank))
+        using (args.PushGroup(nameof(RadiationCollectorComponent)))
         {
-            args.PushMarkup(Loc.GetString("power-radiation-collector-gas-tank-missing"));
-            return;
-        }
+            args.PushMarkup(Loc.GetString("power-radiation-collector-enabled", ("state", component.Enabled)));
+
+            if (!TryGetLoadedGasTank(uid, out var gasTank))
+            {
+                args.PushMarkup(Loc.GetString("power-radiation-collector-gas-tank-missing"));
+            }
+            else
+            {
+                _appearance.TryGetData<int>(uid, RadiationCollectorVisuals.PressureState, out var state);
 
-        args.PushMarkup(Loc.GetString("power-radiation-collector-gas-tank-present"));
+                args.PushMarkup(Loc.GetString("power-radiation-collector-gas-tank-present",
+                    ("fullness", state)));
+            }
+        }
     }
 
     private void OnAnalyzed(EntityUid uid, RadiationCollectorComponent component, GasAnalyzerScanEvent args)
diff --git a/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs b/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs
index 6a8fc68d976..4f1cdb0eb0e 100644
--- a/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs
+++ b/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs
@@ -18,6 +18,7 @@ internal sealed class PowerSolarSystem : EntitySystem
     {
         [Dependency] private readonly IRobustRandom _robustRandom = default!;
         [Dependency] private readonly SharedPhysicsSystem _physicsSystem = default!;
+        [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
 
         /// <summary>
         /// Maximum panel angular velocity range - used to stop people rotating panels fast enough that the lag prevention becomes noticable
@@ -112,7 +113,7 @@ public override void Update(float frameTime)
                 while (query.MoveNext(out var uid, out var panel, out var xform))
                 {
                     TotalPanelPower += panel.MaxSupply * panel.Coverage;
-                    xform.WorldRotation = TargetPanelRotation;
+                    _transformSystem.SetWorldRotation(xform, TargetPanelRotation);
                     _updateQueue.Enqueue((uid, panel));
                 }
             }
@@ -135,7 +136,7 @@ private void UpdatePanelCoverage(Entity<SolarPanelComponent> panel)
             // directly downwards (abs(theta) = pi) = coverage -1
             // as TowardsSun + = CCW,
             // panelRelativeToSun should - = CW
-            var panelRelativeToSun = xform.WorldRotation - TowardsSun;
+            var panelRelativeToSun = _transformSystem.GetWorldRotation(xform) - TowardsSun;
             // essentially, given cos = X & sin = Y & Y is 'downwards',
             // then for the first 90 degrees of rotation in either direction,
             // this plots the lower-right quadrant of a circle.
@@ -153,7 +154,7 @@ private void UpdatePanelCoverage(Entity<SolarPanelComponent> panel)
             if (coverage > 0)
             {
                 // Determine if the solar panel is occluded, and zero out coverage if so.
-                var ray = new CollisionRay(xform.WorldPosition, TowardsSun.ToWorldVec(), (int) CollisionGroup.Opaque);
+                var ray = new CollisionRay(_transformSystem.GetWorldPosition(xform), TowardsSun.ToWorldVec(), (int) CollisionGroup.Opaque);
                 var rayCastResults = _physicsSystem.IntersectRayWithPredicate(
                     xform.MapID,
                     ray,
diff --git a/Content.Server/Spawners/Components/ConditionalSpawnerComponent.cs b/Content.Server/Spawners/Components/ConditionalSpawnerComponent.cs
index 1b06367b0d8..c6f4871b7e6 100644
--- a/Content.Server/Spawners/Components/ConditionalSpawnerComponent.cs
+++ b/Content.Server/Spawners/Components/ConditionalSpawnerComponent.cs
@@ -6,14 +6,25 @@ namespace Content.Server.Spawners.Components
     [Virtual]
     public partial class ConditionalSpawnerComponent : Component
     {
+        /// <summary>
+        /// A list of entities, one of which can spawn in after calling Spawn()
+        /// </summary>
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField]
         public List<EntProtoId> Prototypes { get; set; } = new();
 
+        /// <summary>
+        /// A list of game rules.
+        /// If at least one of them was launched in the game,
+        /// an attempt will occur to spawn one of the objects in the Prototypes list
+        /// </summary>
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField]
         public List<EntProtoId> GameRules = new();
 
+        /// <summary>
+        /// Chance of spawning an entity
+        /// </summary>
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField]
         public float Chance { get; set; } = 1.0f;
diff --git a/Content.Server/Spawners/Components/RandomSpawnerComponent.cs b/Content.Server/Spawners/Components/RandomSpawnerComponent.cs
index e6a597f3658..ec1b3249a90 100644
--- a/Content.Server/Spawners/Components/RandomSpawnerComponent.cs
+++ b/Content.Server/Spawners/Components/RandomSpawnerComponent.cs
@@ -5,18 +5,33 @@ namespace Content.Server.Spawners.Components
     [RegisterComponent, EntityCategory("Spawner")]
     public sealed partial class RandomSpawnerComponent : ConditionalSpawnerComponent
     {
+        /// <summary>
+        /// A list of rarer entities that can spawn with the RareChance
+        /// instead of one of the entities in the Prototypes list.
+        /// </summary>
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField]
         public List<EntProtoId> RarePrototypes { get; set; } = new();
 
+        /// <summary>
+        /// The chance that a rare prototype may spawn instead of a common prototype
+        /// </summary>
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField]
         public float RareChance { get; set; } = 0.05f;
 
+        /// <summary>
+        /// Scatter of entity spawn coordinates
+        /// </summary>
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField]
         public float Offset { get; set; } = 0.2f;
 
+        /// <summary>
+        /// A variable meaning whether the spawn will
+        /// be able to be used again or whether
+        /// it will be destroyed after the first use
+        /// </summary>
         [DataField]
         public bool DeleteSpawnerAfterSpawn = true;
     }
diff --git a/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs b/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs
index 75f86187989..f57481b05b6 100644
--- a/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs
+++ b/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs
@@ -1,8 +1,8 @@
 using System.Numerics;
 using Content.Server.GameTicking;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Spawners.Components;
+using Content.Shared.GameTicking.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Random;
 
diff --git a/Content.Server/Speech/AccentSystem.cs b/Content.Server/Speech/AccentSystem.cs
index 13f174c01ef..7e29f02caec 100644
--- a/Content.Server/Speech/AccentSystem.cs
+++ b/Content.Server/Speech/AccentSystem.cs
@@ -6,7 +6,7 @@ namespace Content.Server.Speech
 {
     public sealed class AccentSystem : EntitySystem
     {
-        public static readonly Regex SentenceRegex = new(@"(?<=[\.!\?])", RegexOptions.Compiled);
+        public static readonly Regex SentenceRegex = new(@"(?<=[\.!\?‽])(?![\.!\?‽])", RegexOptions.Compiled);
 
         public override void Initialize()
         {
diff --git a/Content.Server/Speech/Components/FrenchAccentComponent.cs b/Content.Server/Speech/Components/FrenchAccentComponent.cs
index f696c35ea03..dfe584e2670 100644
--- a/Content.Server/Speech/Components/FrenchAccentComponent.cs
+++ b/Content.Server/Speech/Components/FrenchAccentComponent.cs
@@ -7,5 +7,4 @@ namespace Content.Server.Speech.Components;
 /// </summary>
 [RegisterComponent]
 [Access(typeof(FrenchAccentSystem))]
-public sealed partial class FrenchAccentComponent : Component
-{ }
+public sealed partial class FrenchAccentComponent : Component {}
diff --git a/Content.Server/Speech/Components/SpanishAccentComponent.cs b/Content.Server/Speech/Components/SpanishAccentComponent.cs
index 16a2d188b68..b2eeddc0db2 100644
--- a/Content.Server/Speech/Components/SpanishAccentComponent.cs
+++ b/Content.Server/Speech/Components/SpanishAccentComponent.cs
@@ -1,7 +1,4 @@
-namespace Content.Server.Speech.Components
-{
-    [RegisterComponent]
-    public sealed partial class SpanishAccentComponent : Component
-    {
-    }
-}
+namespace Content.Server.Speech.Components;
+
+[RegisterComponent]
+public sealed partial class SpanishAccentComponent : Component {}
diff --git a/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs b/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs
index f6d259c1153..d71655569cb 100644
--- a/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs
@@ -27,10 +27,10 @@ public string Accentuate(string message, FrenchAccentComponent component)
 
         msg = _replacement.ApplyReplacements(msg, "french");
 
-        // replaces th with dz
+        // replaces th with z
         msg = RegexTh.Replace(msg, "'z");
 
-        // removes the letter h from the start of words.
+        // replaces h with ' at the start of words.
         msg = RegexStartH.Replace(msg, "'");
 
         // spaces out ! ? : and ;.
diff --git a/Content.Server/Speech/EntitySystems/OwOAccentSystem.cs b/Content.Server/Speech/EntitySystems/OwOAccentSystem.cs
index cac3debe819..2b3d5aa3d49 100644
--- a/Content.Server/Speech/EntitySystems/OwOAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/OwOAccentSystem.cs
@@ -8,7 +8,7 @@ public sealed class OwOAccentSystem : EntitySystem
         [Dependency] private readonly IRobustRandom _random = default!;
 
         private static readonly IReadOnlyList<string> Faces = new List<string>{
-            " (・`ω´・)", " ;;w;;", " owo", " UwU", " >w<", " ^w^"
+            " (•`ω´•)", " ;;w;;", " owo", " UwU", " >w<", " ^w^"
         }.AsReadOnly();
 
         private static readonly IReadOnlyDictionary<string, string> SpecialWords = new Dictionary<string, string>()
diff --git a/Content.Server/Speech/EntitySystems/RussianAccentSystem.cs b/Content.Server/Speech/EntitySystems/RussianAccentSystem.cs
index 33e4513d93f..49aab38e2b7 100644
--- a/Content.Server/Speech/EntitySystems/RussianAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/RussianAccentSystem.cs
@@ -5,14 +5,15 @@ namespace Content.Server.Speech.EntitySystems;
 
 public sealed class RussianAccentSystem : EntitySystem
 {
+    [Dependency] private readonly ReplacementAccentSystem _replacement = default!;
     public override void Initialize()
     {
         SubscribeLocalEvent<RussianAccentComponent, AccentGetEvent>(OnAccent);
     }
 
-    public static string Accentuate(string message)
+    public string Accentuate(string message)
     {
-        var accentedMessage = new StringBuilder(message);
+        var accentedMessage = new StringBuilder(_replacement.ApplyReplacements(message, "russian"));
 
         for (var i = 0; i < accentedMessage.Length; i++)
         {
@@ -20,6 +21,7 @@ public static string Accentuate(string message)
 
             accentedMessage[i] = c switch
             {
+                'A' => 'Д',
                 'b' => 'в',
                 'N' => 'И',
                 'n' => 'и',
diff --git a/Content.Server/Speech/EntitySystems/SpanishAccentSystem.cs b/Content.Server/Speech/EntitySystems/SpanishAccentSystem.cs
index c8ac24a450e..08642014c90 100644
--- a/Content.Server/Speech/EntitySystems/SpanishAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/SpanishAccentSystem.cs
@@ -1,3 +1,4 @@
+using System.Text;
 using Content.Server.Speech.Components;
 
 namespace Content.Server.Speech.EntitySystems
@@ -14,7 +15,7 @@ public string Accentuate(string message)
             // Insert E before every S
             message = InsertS(message);
             // If a sentence ends with ?, insert a reverse ? at the beginning of the sentence
-            message = ReplaceQuestionMark(message);
+            message = ReplacePunctuation(message);
             return message;
         }
 
@@ -36,24 +37,32 @@ private string InsertS(string message)
             return msg;
         }
 
-        private string ReplaceQuestionMark(string message)
+        private string ReplacePunctuation(string message)
         {
             var sentences = AccentSystem.SentenceRegex.Split(message);
-            var msg = "";
+            var msg = new StringBuilder();
             foreach (var s in sentences)
             {
-                if (s.EndsWith("?", StringComparison.Ordinal)) // We've got a question => add ¿ to the beginning
+                var toInsert = new StringBuilder();
+                for (var i = s.Length - 1; i >= 0 && "?!‽".Contains(s[i]); i--)
                 {
-                    // Because we don't split by whitespace, we may have some spaces in front of the sentence.
-                    // So we add the symbol before the first non space char
-                    msg += s.Insert(s.Length - s.TrimStart().Length, "¿");
+                    toInsert.Append(s[i] switch
+                    {
+                        '?' => '¿',
+                        '!' => '¡',
+                        '‽' => '⸘',
+                        _ => ' '
+                    });
                 }
-                else
+                if (toInsert.Length == 0)
                 {
-                    msg += s;
+                    msg.Append(s);
+                } else
+                {
+                    msg.Append(s.Insert(s.Length - s.TrimStart().Length, toInsert.ToString()));
                 }
             }
-            return msg;
+            return msg.ToString();
         }
 
         private void OnAccent(EntityUid uid, SpanishAccentComponent component, AccentGetEvent args)
diff --git a/Content.Server/SprayPainter/SprayPainterSystem.cs b/Content.Server/SprayPainter/SprayPainterSystem.cs
index a8024e2d77b..9f6da20fda1 100644
--- a/Content.Server/SprayPainter/SprayPainterSystem.cs
+++ b/Content.Server/SprayPainter/SprayPainterSystem.cs
@@ -57,10 +57,9 @@ private void OnPipeInteract(Entity<AtmosPipeColorComponent> ent, ref InteractUsi
         {
             BreakOnMove = true,
             BreakOnDamage = true,
-            CancelDuplicate = true,
             // multiple pipes can be sprayed at once just not the same one
             DuplicateCondition = DuplicateConditions.SameTarget,
-            NeedHand = true
+            NeedHand = true,
         };
 
         args.Handled = DoAfter.TryStartDoAfter(doAfterEventArgs);
diff --git a/Content.Server/Spreader/SpreaderSystem.cs b/Content.Server/Spreader/SpreaderSystem.cs
index 7de8a43d354..50f5d81183b 100644
--- a/Content.Server/Spreader/SpreaderSystem.cs
+++ b/Content.Server/Spreader/SpreaderSystem.cs
@@ -2,6 +2,7 @@
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Shuttles.Components;
 using Content.Shared.Atmos;
+using Content.Shared.Maps;
 using Content.Shared.Spreader;
 using Content.Shared.Tag;
 using Robust.Shared.Collections;
@@ -175,11 +176,12 @@ private void Spread(EntityUid uid, TransformComponent xform, ProtoId<EdgeSpreade
     /// </summary>
     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(prototype));
         freeTiles = [];
         occupiedTiles = [];
         neighbors = [];
+        // TODO remove occupiedTiles -- its currently unused and just slows this method down.
+        if (!_prototype.TryIndex(prototype, out var spreaderPrototype))
+            return;
 
         if (!TryComp<MapGridComponent>(comp.GridUid, out var grid))
             return;
@@ -244,6 +246,9 @@ public void GetNeighbors(EntityUid uid, TransformComponent comp, ProtoId<EdgeSpr
             if (!_map.TryGetTileRef(neighborEnt, neighborGrid, neighborPos, out var tileRef) || tileRef.Tile.IsEmpty)
                 continue;
 
+            if (spreaderPrototype.PreventSpreadOnSpaced && tileRef.Tile.IsSpace())
+                continue;
+
             var directionEnumerator = _map.GetAnchoredEntitiesEnumerator(neighborEnt, neighborGrid, neighborPos);
             var occupied = false;
 
@@ -335,4 +340,12 @@ public void ActivateSpreadableNeighbors(EntityUid uid, (EntityUid Grid, Vector2i
             }
         }
     }
+
+    public bool RequiresFloorToSpread(EntProtoId<EdgeSpreaderComponent> spreader)
+    {
+        if (!_prototype.Index(spreader).TryGetComponent<EdgeSpreaderComponent>(out var spreaderComp, EntityManager.ComponentFactory))
+            return false;
+
+        return _prototype.Index(spreaderComp.Id).PreventSpreadOnSpaced;
+    }
 }
diff --git a/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs b/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
index e145e233e9e..8a918bd2fd0 100644
--- a/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
+++ b/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
@@ -17,7 +17,6 @@ public sealed partial class StationJobsSystem
 {
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IBanManager _banManager = default!;
-    [Dependency] private readonly PlayTimeTrackingSystem _playTime = default!;
 
     private Dictionary<int, HashSet<string>> _jobsByWeight = default!;
     private List<int> _orderedWeights = default!;
diff --git a/Content.Server/Station/Systems/StationJobsSystem.cs b/Content.Server/Station/Systems/StationJobsSystem.cs
index 307610d136f..91a8b7ade4a 100644
--- a/Content.Server/Station/Systems/StationJobsSystem.cs
+++ b/Content.Server/Station/Systems/StationJobsSystem.cs
@@ -24,9 +24,9 @@ namespace Content.Server.Station.Systems;
 public sealed partial class StationJobsSystem : EntitySystem
 {
     [Dependency] private readonly IConfigurationManager _configurationManager = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly GameTicker _gameTicker = default!;
-    [Dependency] private readonly IPlayerManager _playerManager = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -56,7 +56,7 @@ public override void Update(float _)
         if (_availableJobsDirty)
         {
             _cachedAvailableJobs = GenerateJobsAvailableEvent();
-            RaiseNetworkEvent(_cachedAvailableJobs, Filter.Empty().AddPlayers(_playerManager.Sessions));
+            RaiseNetworkEvent(_cachedAvailableJobs, Filter.Empty().AddPlayers(_player.Sessions));
             _availableJobsDirty = false;
         }
     }
diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs
index 885791197d5..55eef587fb6 100644
--- a/Content.Server/Station/Systems/StationSpawningSystem.cs
+++ b/Content.Server/Station/Systems/StationSpawningSystem.cs
@@ -191,13 +191,6 @@ public EntityUid SpawnPlayerMob(
             profile = HumanoidCharacterProfile.RandomWithSpecies(speciesId);
         }
 
-        if (prototype?.StartingGear != null)
-        {
-            var startingGear = _prototypeManager.Index<StartingGearPrototype>(prototype.StartingGear);
-            EquipStartingGear(entity.Value, startingGear, raiseEvent: false);
-        }
-
-        // Run loadouts after so stuff like storage loadouts can get
         var jobLoadout = LoadoutSystem.GetJobPrototype(prototype?.ID);
 
         if (_prototypeManager.TryIndex(jobLoadout, out RoleLoadoutPrototype? roleProto))
@@ -215,6 +208,12 @@ public EntityUid SpawnPlayerMob(
             EquipRoleLoadout(entity.Value, loadout, roleProto);
         }
 
+        if (prototype?.StartingGear != null)
+        {
+            var startingGear = _prototypeManager.Index<StartingGearPrototype>(prototype.StartingGear);
+            EquipStartingGear(entity.Value, startingGear, raiseEvent: false);
+        }
+
         var gearEquippedEv = new StartingGearEquippedEvent(entity.Value);
         RaiseLocalEvent(entity.Value, ref gearEquippedEv);
 
@@ -270,11 +269,12 @@ public void SetPdaAndIdCardData(EntityUid entity, string characterName, JobCompo
             return;
 
         _cardSystem.TryChangeFullName(cardId, characterName, card);
-        _cardSystem.TryChangeJobTitle(cardId, job.VirtualJobLocalizedName ?? jobPrototype.LocalizedName, card); // DeltaV #1425 - Use VirtualJobLocalizedName if possible
+        if (card.JobTitle == null) // DeltaV
+            _cardSystem.TryChangeJobTitle(cardId, jobPrototype.LocalizedName, card);
 
-        _prototypeManager.TryIndex<StatusIconPrototype>(job.VirtualJobIcon ?? string.Empty, out var virtualJobIcon);
-        if (_prototypeManager.TryIndex(jobPrototype.Icon, out var jobIcon))
-            _cardSystem.TryChangeJobIcon(cardId, virtualJobIcon ?? jobIcon, card); // DeltaV #1425 - Use VirtualJobIcon if possible
+        // DeltaV
+        if (card.JobIcon == "JobIconUnknown" && _prototypeManager.TryIndex(jobPrototype.Icon, out var jobIcon))
+            _cardSystem.TryChangeJobIcon(cardId, jobIcon, card);
 
         var extendedAccess = false;
         if (station != null)
diff --git a/Content.Server/Station/Systems/StationSystem.cs b/Content.Server/Station/Systems/StationSystem.cs
index 84e44b6469c..22c0cba3f78 100644
--- a/Content.Server/Station/Systems/StationSystem.cs
+++ b/Content.Server/Station/Systems/StationSystem.cs
@@ -5,6 +5,7 @@
 using Content.Server.Station.Events;
 using Content.Shared.CCVar;
 using Content.Shared.Station;
+using Content.Shared.Station.Components;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
@@ -27,12 +28,9 @@ namespace Content.Server.Station.Systems;
 [PublicAPI]
 public sealed class StationSystem : EntitySystem
 {
-    [Dependency] private readonly IConfigurationManager _cfgManager = default!;
     [Dependency] private readonly ILogManager _logManager = default!;
     [Dependency] private readonly IPlayerManager _player = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly ChatSystem _chatSystem = default!;
-    [Dependency] private readonly GameTicker _ticker = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly MetaDataSystem _metaData = default!;
     [Dependency] private readonly MapSystem _map = default!;
diff --git a/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs b/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
index 2cd3d617b21..1df5eaaeb88 100644
--- a/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
+++ b/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
@@ -1,10 +1,11 @@
 using System.Linq;
 using Content.Server.Administration;
-using Content.Server.GameTicking.Components;
+using Content.Server.GameTicking;
 using Content.Server.GameTicking.Rules;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
 using Content.Shared.Administration;
+using Content.Shared.GameTicking.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Random;
 using Robust.Shared.Toolshed;
diff --git a/Content.Server/StationEvents/Components/MassHallucinationsComponent.cs b/Content.Server/StationEvents/Components/MassHallucinationsComponent.cs
deleted file mode 100644
index 99b893cad51..00000000000
--- a/Content.Server/StationEvents/Components/MassHallucinationsComponent.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Content.Server.StationEvents.Events;
-
-namespace Content.Server.StationEvents.Components;
-
-/// <summary>
-/// This is used to keep track of hallucinated entities to remove effects when event ends
-/// </summary>
-[RegisterComponent, Access(typeof(MassHallucinationsRule))]
-public sealed partial class MassHallucinationsComponent : Component
-{
-}
diff --git a/Content.Server/StationEvents/Components/MassHallucinationsRuleComponent.cs b/Content.Server/StationEvents/Components/MassHallucinationsRuleComponent.cs
index 63a1f872513..a5268f97a62 100644
--- a/Content.Server/StationEvents/Components/MassHallucinationsRuleComponent.cs
+++ b/Content.Server/StationEvents/Components/MassHallucinationsRuleComponent.cs
@@ -1,5 +1,6 @@
 using Content.Server.StationEvents.Events;
 using Robust.Shared.Audio;
+using Robust.Shared.Collections;
 
 namespace Content.Server.StationEvents.Components;
 
@@ -23,4 +24,7 @@ public sealed partial class MassHallucinationsRuleComponent : Component
 
     [DataField("sounds", required: true)]
     public SoundSpecifier Sounds = default!;
+
+    [DataField, ViewVariables(VVAccess.ReadOnly)]
+    public List<EntityUid> AffectedEntities = new();
 }
diff --git a/Content.Server/StationEvents/Components/NinjaSpawnRuleComponent.cs b/Content.Server/StationEvents/Components/NinjaSpawnRuleComponent.cs
deleted file mode 100644
index d758247eca2..00000000000
--- a/Content.Server/StationEvents/Components/NinjaSpawnRuleComponent.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Content.Server.StationEvents.Events;
-
-namespace Content.Server.StationEvents.Components;
-
-/// <summary>
-/// Configuration component for the Space Ninja antag.
-/// </summary>
-[RegisterComponent, Access(typeof(NinjaSpawnRule))]
-public sealed partial class NinjaSpawnRuleComponent : Component
-{
-    /// <summary>
-    /// Distance that the ninja spawns from the station's half AABB radius
-    /// </summary>
-    [DataField("spawnDistance")]
-    public float SpawnDistance = 20f;
-}
diff --git a/Content.Server/StationEvents/Components/SpaceSpawnRuleComponent.cs b/Content.Server/StationEvents/Components/SpaceSpawnRuleComponent.cs
new file mode 100644
index 00000000000..a0168077fd6
--- /dev/null
+++ b/Content.Server/StationEvents/Components/SpaceSpawnRuleComponent.cs
@@ -0,0 +1,25 @@
+using Content.Server.StationEvents.Events;
+using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.StationEvents.Components;
+
+/// <summary>
+/// Component for spawning antags in space around a station.
+/// Requires <c>AntagSelectionComponent</c>.
+/// </summary>
+[RegisterComponent, Access(typeof(SpaceSpawnRule))]
+public sealed partial class SpaceSpawnRuleComponent : Component
+{
+    /// <summary>
+    /// Distance that the entity spawns from the station's half AABB radius
+    /// </summary>
+    [DataField]
+    public float SpawnDistance = 20f;
+
+    /// <summary>
+    /// Location that was picked.
+    /// </summary>
+    [DataField]
+    public MapCoordinates? Coords;
+}
diff --git a/Content.Server/StationEvents/Components/StationEventComponent.cs b/Content.Server/StationEvents/Components/StationEventComponent.cs
index cc17007d90e..a188d5c052c 100644
--- a/Content.Server/StationEvents/Components/StationEventComponent.cs
+++ b/Content.Server/StationEvents/Components/StationEventComponent.cs
@@ -24,6 +24,12 @@ public sealed partial class StationEventComponent : Component
     [DataField]
     public string? EndAnnouncement;
 
+    [DataField]
+    public Color StartAnnouncementColor = Color.Gold;
+
+    [DataField]
+    public Color EndAnnouncementColor = Color.Gold;
+
     [DataField]
     public SoundSpecifier? StartAudio;
 
@@ -42,12 +48,6 @@ public sealed partial class StationEventComponent : Component
     [DataField]
     public int ReoccurrenceDelay = 30;
 
-    /// <summary>
-    ///     How long after being added does the event start
-    /// </summary>
-    [DataField]
-    public TimeSpan StartDelay = TimeSpan.Zero;
-
     /// <summary>
     ///     How long the event lasts.
     /// </summary>
@@ -75,17 +75,16 @@ public sealed partial class StationEventComponent : Component
     [DataField]
     public int? MaxOccurrences;
 
-    /// <summary>
-    /// 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;
+
+    /// <summary>
+    /// If false, the event won't trigger during ongoing evacuation.
+    /// </summary>
+    [DataField]
+    public bool OccursDuringRoundEnd = true;
 }
diff --git a/Content.Server/StationEvents/EventManagerSystem.cs b/Content.Server/StationEvents/EventManagerSystem.cs
index 26fbde9b3ff..9b379be2e5b 100644
--- a/Content.Server/StationEvents/EventManagerSystem.cs
+++ b/Content.Server/StationEvents/EventManagerSystem.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using Content.Server.Chat.Managers;
 using Content.Server.GameTicking;
+using Content.Server.RoundEnd;
 using Content.Server.StationEvents.Components;
 using Content.Shared.CCVar;
 using Robust.Server.Player;
@@ -19,7 +20,8 @@ public sealed class EventManagerSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IChatManager _chat = default!;
     [Dependency] public readonly GameTicker GameTicker = default!;
-    [Dependency] private readonly GlimmerSystem _glimmerSystem = default!; //Nyano - Summary: pulls in the glimmer system.
+    [Dependency] private readonly RoundEndSystem _roundEnd = default!;
+    [Dependency] private readonly GlimmerSystem _glimmer = default!; //Nyano - Summary: pulls in the glimmer system.
 
     public bool EventsEnabled { get; private set; }
     private void SetEnabled(bool value) => EventsEnabled = value;
@@ -197,13 +199,18 @@ private bool CanRun(EntityPrototype prototype, StationEventComponent stationEven
         // This could not be cleanly done anywhere else.
         if (_configurationManager.GetCVar(CCVars.GlimmerEnabled) &&
             prototype.TryGetComponent<GlimmerEventComponent>(out var glimmerEvent) &&
-            (_glimmerSystem.Glimmer < glimmerEvent.MinimumGlimmer ||
-            _glimmerSystem.Glimmer > glimmerEvent.MaximumGlimmer))
+            (_glimmer.Glimmer < glimmerEvent.MinimumGlimmer ||
+            _glimmer.Glimmer > glimmerEvent.MaximumGlimmer))
         {
             return false;
         }
         // Nyano - End modified code block.
 
+        if (_roundEnd.IsRoundEndRequested() && !stationEvent.OccursDuringRoundEnd)
+        {
+            return false;
+        }
+
         return true;
     }
 }
diff --git a/Content.Server/StationEvents/Events/AlertLevelInterceptionRule.cs b/Content.Server/StationEvents/Events/AlertLevelInterceptionRule.cs
index a78a542d3b3..916d7d16883 100644
--- a/Content.Server/StationEvents/Events/AlertLevelInterceptionRule.cs
+++ b/Content.Server/StationEvents/Events/AlertLevelInterceptionRule.cs
@@ -1,6 +1,6 @@
-using Content.Server.GameTicking.Components;
 using Content.Server.StationEvents.Components;
 using Content.Server.AlertLevel;
+using Content.Shared.GameTicking.Components;
 
 namespace Content.Server.StationEvents.Events;
 
@@ -20,4 +20,4 @@ protected override void Started(EntityUid uid, AlertLevelInterceptionRuleCompone
 
         _alertLevelSystem.SetLevel(chosenStation.Value, component.AlertLevel, true, true, true);
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Server/StationEvents/Events/AnomalySpawnRule.cs b/Content.Server/StationEvents/Events/AnomalySpawnRule.cs
index 96633834ee1..06da91e2569 100644
--- a/Content.Server/StationEvents/Events/AnomalySpawnRule.cs
+++ b/Content.Server/StationEvents/Events/AnomalySpawnRule.cs
@@ -1,8 +1,7 @@
 using Content.Server.Anomaly;
-using Content.Server.GameTicking.Components;
-using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Station.Components;
 using Content.Server.StationEvents.Components;
+using Content.Shared.GameTicking.Components;
 
 namespace Content.Server.StationEvents.Events;
 
@@ -12,11 +11,14 @@ public sealed class AnomalySpawnRule : StationEventSystem<AnomalySpawnRuleCompon
 
     protected override void Added(EntityUid uid, AnomalySpawnRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args)
     {
-        base.Added(uid, component, gameRule, args);
+        if (!TryComp<StationEventComponent>(uid, out var stationEvent))
+            return;
 
         var str = Loc.GetString("anomaly-spawn-event-announcement",
             ("sighting", Loc.GetString($"anomaly-spawn-sighting-{RobustRandom.Next(1, 6)}")));
-        ChatSystem.DispatchGlobalAnnouncement(str, colorOverride: Color.FromHex("#18abf5"));
+        stationEvent.StartAnnouncement = str;
+
+        base.Added(uid, component, gameRule, args);
     }
 
     protected override void Started(EntityUid uid, AnomalySpawnRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
diff --git a/Content.Server/StationEvents/Events/BluespaceArtifactRule.cs b/Content.Server/StationEvents/Events/BluespaceArtifactRule.cs
index b3ed10999ed..fc4f180adbd 100644
--- a/Content.Server/StationEvents/Events/BluespaceArtifactRule.cs
+++ b/Content.Server/StationEvents/Events/BluespaceArtifactRule.cs
@@ -1,6 +1,5 @@
-using Content.Server.GameTicking.Components;
-using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
+using Content.Shared.GameTicking.Components;
 using Robust.Shared.Random;
 
 namespace Content.Server.StationEvents.Events;
@@ -9,11 +8,14 @@ public sealed class BluespaceArtifactRule : StationEventSystem<BluespaceArtifact
 {
     protected override void Added(EntityUid uid, BluespaceArtifactRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args)
     {
-        base.Added(uid, component, gameRule, args);
+        if (!TryComp<StationEventComponent>(uid, out var stationEvent))
+            return;
 
         var str = Loc.GetString("bluespace-artifact-event-announcement",
             ("sighting", Loc.GetString(RobustRandom.Pick(component.PossibleSighting))));
-        ChatSystem.DispatchGlobalAnnouncement(str, colorOverride: Color.FromHex("#18abf5"));
+        stationEvent.StartAnnouncement = str;
+
+        base.Added(uid, component, gameRule, args);
     }
 
     protected override void Started(EntityUid uid, BluespaceArtifactRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
diff --git a/Content.Server/StationEvents/Events/BluespaceLockerRule.cs b/Content.Server/StationEvents/Events/BluespaceLockerRule.cs
index eef9850e739..eefb9c18636 100644
--- a/Content.Server/StationEvents/Events/BluespaceLockerRule.cs
+++ b/Content.Server/StationEvents/Events/BluespaceLockerRule.cs
@@ -1,11 +1,11 @@
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Resist;
-using Content.Server.Station.Components;
 using Content.Server.StationEvents.Components;
 using Content.Server.Storage.Components;
 using Content.Server.Storage.EntitySystems;
 using Content.Shared.Access.Components;
+using Content.Shared.Station.Components;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Coordinates;
 
 namespace Content.Server.StationEvents.Events;
diff --git a/Content.Server/StationEvents/Events/BreakerFlipRule.cs b/Content.Server/StationEvents/Events/BreakerFlipRule.cs
index 16d3fd8c95d..8a25d40abbc 100644
--- a/Content.Server/StationEvents/Events/BreakerFlipRule.cs
+++ b/Content.Server/StationEvents/Events/BreakerFlipRule.cs
@@ -1,9 +1,8 @@
-using Content.Server.GameTicking.Components;
-using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
-using Content.Server.Station.Components;
 using Content.Server.StationEvents.Components;
+using Content.Shared.GameTicking.Components;
+using Content.Shared.Station.Components;
 using JetBrains.Annotations;
 
 namespace Content.Server.StationEvents.Events;
@@ -15,10 +14,14 @@ public sealed class BreakerFlipRule : StationEventSystem<BreakerFlipRuleComponen
 
     protected override void Added(EntityUid uid, BreakerFlipRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args)
     {
-        base.Added(uid, component, gameRule, args);
+        if (!TryComp<StationEventComponent>(uid, out var stationEvent))
+            return;
 
         var str = Loc.GetString("station-event-breaker-flip-announcement", ("data", Loc.GetString(Loc.GetString($"random-sentience-event-data-{RobustRandom.Next(1, 6)}"))));
-        ChatSystem.DispatchGlobalAnnouncement(str, playSound: false, colorOverride: Color.Gold);
+        stationEvent.StartAnnouncement = str;
+
+        base.Added(uid, component, gameRule, args);
+
     }
 
     protected override void Started(EntityUid uid, BreakerFlipRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
diff --git a/Content.Server/StationEvents/Events/BureaucraticErrorRule.cs b/Content.Server/StationEvents/Events/BureaucraticErrorRule.cs
index 282e28e4991..6600b0623fd 100644
--- a/Content.Server/StationEvents/Events/BureaucraticErrorRule.cs
+++ b/Content.Server/StationEvents/Events/BureaucraticErrorRule.cs
@@ -1,9 +1,9 @@
 using System.Linq;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
 using Content.Server.StationEvents.Components;
+using Content.Shared.GameTicking.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Random;
 
diff --git a/Content.Server/StationEvents/Events/CargoGiftsRule.cs b/Content.Server/StationEvents/Events/CargoGiftsRule.cs
index c27cd302784..ff2d1ca6311 100644
--- a/Content.Server/StationEvents/Events/CargoGiftsRule.cs
+++ b/Content.Server/StationEvents/Events/CargoGiftsRule.cs
@@ -2,10 +2,9 @@
 using Content.Server.Cargo.Components;
 using Content.Server.Cargo.Systems;
 using Content.Server.GameTicking;
-using Content.Server.GameTicking.Components;
-using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Station.Components;
 using Content.Server.StationEvents.Components;
+using Content.Shared.GameTicking.Components;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.StationEvents.Events;
@@ -18,11 +17,14 @@ public sealed class CargoGiftsRule : StationEventSystem<CargoGiftsRuleComponent>
 
     protected override void Added(EntityUid uid, CargoGiftsRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args)
     {
-        base.Added(uid, component, gameRule, args);
+        if (!TryComp<StationEventComponent>(uid, out var stationEvent))
+            return;
 
         var str = Loc.GetString(component.Announce,
             ("sender", Loc.GetString(component.Sender)), ("description", Loc.GetString(component.Description)), ("dest", Loc.GetString(component.Dest)));
-        ChatSystem.DispatchGlobalAnnouncement(str, colorOverride: Color.FromHex("#18abf5"));
+        stationEvent.StartAnnouncement = str;
+
+        base.Added(uid, component, gameRule, args);
     }
 
     /// <summary>
diff --git a/Content.Server/StationEvents/Events/ClericalErrorRule.cs b/Content.Server/StationEvents/Events/ClericalErrorRule.cs
index 854ee685b33..e52c2c05aaf 100644
--- a/Content.Server/StationEvents/Events/ClericalErrorRule.cs
+++ b/Content.Server/StationEvents/Events/ClericalErrorRule.cs
@@ -1,9 +1,9 @@
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
 using Content.Server.StationRecords;
 using Content.Server.StationRecords.Systems;
 using Content.Shared.StationRecords;
+using Content.Shared.GameTicking.Components;
 using Robust.Shared.Random;
 
 namespace Content.Server.StationEvents.Events;
diff --git a/Content.Server/StationEvents/Events/FalseAlarmRule.cs b/Content.Server/StationEvents/Events/FalseAlarmRule.cs
index e5317a5449f..e1c642a85d7 100644
--- a/Content.Server/StationEvents/Events/FalseAlarmRule.cs
+++ b/Content.Server/StationEvents/Events/FalseAlarmRule.cs
@@ -1,9 +1,7 @@
 using System.Linq;
-using Content.Server.GameTicking.Components;
-using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
+using Content.Shared.GameTicking.Components;
 using JetBrains.Annotations;
-using Robust.Shared.Player;
 using Robust.Shared.Random;
 
 namespace Content.Server.StationEvents.Events;
@@ -15,15 +13,16 @@ public sealed class FalseAlarmRule : StationEventSystem<FalseAlarmRuleComponent>
 
     protected override void Started(EntityUid uid, FalseAlarmRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
     {
-        base.Started(uid, component, gameRule, args);
+        if (!TryComp<StationEventComponent>(uid, out var stationEvent))
+            return;
 
         var allEv = _event.AllEvents().Select(p => p.Value).ToList();
         var picked = RobustRandom.Pick(allEv);
 
-        if (picked.StartAnnouncement != null)
-        {
-            ChatSystem.DispatchGlobalAnnouncement(Loc.GetString(picked.StartAnnouncement), playSound: false, colorOverride: Color.Gold);
-        }
-        Audio.PlayGlobal(picked.StartAudio, Filter.Broadcast(), true);
+        stationEvent.StartAnnouncement = picked.StartAnnouncement;
+        stationEvent.StartAudio = picked.StartAudio;
+        stationEvent.StartAnnouncementColor = picked.StartAnnouncementColor;
+
+        base.Started(uid, component, gameRule, args);
     }
 }
diff --git a/Content.Server/StationEvents/Events/GasLeakRule.cs b/Content.Server/StationEvents/Events/GasLeakRule.cs
index 1221612171d..9e1f70474c1 100644
--- a/Content.Server/StationEvents/Events/GasLeakRule.cs
+++ b/Content.Server/StationEvents/Events/GasLeakRule.cs
@@ -1,7 +1,7 @@
 using Content.Server.Atmos.EntitySystems;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
+using Content.Shared.GameTicking.Components;
 using Robust.Shared.Audio;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
@@ -29,10 +29,10 @@ 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);
-                var startAfter = stationEvent.StartDelay;
                 component.MolesPerSecond = RobustRandom.Next(component.MinimumMolesPerSecond, component.MaximumMolesPerSecond);
 
-                stationEvent.EndTime = _timing.CurTime + TimeSpan.FromSeconds(totalGas / component.MolesPerSecond + startAfter.TotalSeconds);
+                if (gameRule.Delay is {} startAfter)
+                    stationEvent.EndTime = _timing.CurTime + TimeSpan.FromSeconds(totalGas / component.MolesPerSecond + startAfter.Next(RobustRandom));
             }
 
             // Look technically if you wanted to guarantee a leak you'd do this in announcement but having the announcement
diff --git a/Content.Server/StationEvents/Events/ImmovableRodRule.cs b/Content.Server/StationEvents/Events/ImmovableRodRule.cs
index aa193f2f4cb..17a92e1b3de 100644
--- a/Content.Server/StationEvents/Events/ImmovableRodRule.cs
+++ b/Content.Server/StationEvents/Events/ImmovableRodRule.cs
@@ -1,9 +1,9 @@
 using System.Numerics;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.ImmovableRod;
 using Content.Server.StationEvents.Components;
 using Content.Server.Weapons.Ranged.Systems;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Storage;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
diff --git a/Content.Server/StationEvents/Events/IonStormRule.cs b/Content.Server/StationEvents/Events/IonStormRule.cs
index 8361cc6048a..b20b81822f3 100644
--- a/Content.Server/StationEvents/Events/IonStormRule.cs
+++ b/Content.Server/StationEvents/Events/IonStormRule.cs
@@ -1,16 +1,16 @@
-using Content.Server.GameTicking.Components;
 using System.Linq;
 using Content.Server.Silicons.Laws;
-using Content.Server.Station.Components;
 using Content.Server.StationEvents.Components;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
 using Content.Shared.Dataset;
 using Content.Shared.FixedPoint;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Random;
 using Content.Shared.Random.Helpers;
 using Content.Shared.Silicons.Laws;
 using Content.Shared.Silicons.Laws.Components;
+using Content.Shared.Station.Components;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
diff --git a/Content.Server/StationEvents/Events/KudzuGrowthRule.cs b/Content.Server/StationEvents/Events/KudzuGrowthRule.cs
index 5b56e03846f..42c57ffcaae 100644
--- a/Content.Server/StationEvents/Events/KudzuGrowthRule.cs
+++ b/Content.Server/StationEvents/Events/KudzuGrowthRule.cs
@@ -1,6 +1,6 @@
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
+using Content.Shared.GameTicking.Components;
 
 namespace Content.Server.StationEvents.Events;
 
diff --git a/Content.Server/StationEvents/Events/MassHallucinationsRule.cs b/Content.Server/StationEvents/Events/MassHallucinationsRule.cs
index d6f609bee1d..b03231b5bcd 100644
--- a/Content.Server/StationEvents/Events/MassHallucinationsRule.cs
+++ b/Content.Server/StationEvents/Events/MassHallucinationsRule.cs
@@ -1,10 +1,12 @@
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
 using Content.Server.Traits.Assorted;
+using Content.Shared.GameTicking.Components;
+using Content.Shared.Humanoid;
 using Content.Shared.Mind.Components;
 using Content.Shared.Traits.Assorted;
 
+
 namespace Content.Server.StationEvents.Events;
 
 public sealed class MassHallucinationsRule : StationEventSystem<MassHallucinationsRuleComponent>
@@ -14,16 +16,17 @@ public sealed class MassHallucinationsRule : StationEventSystem<MassHallucinatio
     protected override void Started(EntityUid uid, MassHallucinationsRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
     {
         base.Started(uid, component, gameRule, args);
-        var query = EntityQueryEnumerator<MindContainerComponent>();
-        while (query.MoveNext(out var ent, out _))
+
+        var query = EntityQueryEnumerator<MindContainerComponent, HumanoidAppearanceComponent>();
+        while (query.MoveNext(out var ent, out _, out _))
         {
-            if (!HasComp<ParacusiaComponent>(ent))
+            if (!EnsureComp<ParacusiaComponent>(ent, out var paracusia))
             {
-                EnsureComp<MassHallucinationsComponent>(ent);
-                var paracusia = EnsureComp<ParacusiaComponent>(ent);
                 _paracusia.SetSounds(ent, component.Sounds, paracusia);
                 _paracusia.SetTime(ent, component.MinTimeBetweenIncidents, component.MaxTimeBetweenIncidents, paracusia);
                 _paracusia.SetDistance(ent, component.MaxSoundDistance);
+
+                component.AffectedEntities.Add(ent);
             }
         }
     }
@@ -31,10 +34,12 @@ protected override void Started(EntityUid uid, MassHallucinationsRuleComponent c
     protected override void Ended(EntityUid uid, MassHallucinationsRuleComponent component, GameRuleComponent gameRule, GameRuleEndedEvent args)
     {
         base.Ended(uid, component, gameRule, args);
-        var query = EntityQueryEnumerator<MassHallucinationsComponent>();
-        while (query.MoveNext(out var ent, out _))
+
+        foreach (var ent in component.AffectedEntities)
         {
             RemComp<ParacusiaComponent>(ent);
         }
+
+        component.AffectedEntities.Clear();
     }
 }
diff --git a/Content.Server/StationEvents/Events/MeteorSwarmRule.cs b/Content.Server/StationEvents/Events/MeteorSwarmRule.cs
index 455011259dc..b97cde86a02 100644
--- a/Content.Server/StationEvents/Events/MeteorSwarmRule.cs
+++ b/Content.Server/StationEvents/Events/MeteorSwarmRule.cs
@@ -1,7 +1,7 @@
 using System.Numerics;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
+using Content.Shared.GameTicking.Components;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Components;
diff --git a/Content.Server/StationEvents/Events/PowerGridCheckRule.cs b/Content.Server/StationEvents/Events/PowerGridCheckRule.cs
index d547fc94461..23f88d9fe32 100644
--- a/Content.Server/StationEvents/Events/PowerGridCheckRule.cs
+++ b/Content.Server/StationEvents/Events/PowerGridCheckRule.cs
@@ -1,10 +1,10 @@
 using System.Threading;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
-using Content.Server.Station.Components;
 using Content.Server.StationEvents.Components;
+using Content.Shared.GameTicking.Components;
+using Content.Shared.Station.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Audio;
 using Robust.Shared.Player;
diff --git a/Content.Server/StationEvents/Events/RandomEntityStorageSpawnRule.cs b/Content.Server/StationEvents/Events/RandomEntityStorageSpawnRule.cs
index 87d50fc8b2a..a9f27938180 100644
--- a/Content.Server/StationEvents/Events/RandomEntityStorageSpawnRule.cs
+++ b/Content.Server/StationEvents/Events/RandomEntityStorageSpawnRule.cs
@@ -1,8 +1,8 @@
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
 using Content.Server.Storage.Components;
 using Content.Server.Storage.EntitySystems;
+using Content.Shared.GameTicking.Components;
 using Robust.Shared.Map;
 using Robust.Shared.Random;
 
diff --git a/Content.Server/StationEvents/Events/RandomSentienceRule.cs b/Content.Server/StationEvents/Events/RandomSentienceRule.cs
index 06bb470602b..3869f227bd4 100644
--- a/Content.Server/StationEvents/Events/RandomSentienceRule.cs
+++ b/Content.Server/StationEvents/Events/RandomSentienceRule.cs
@@ -1,8 +1,8 @@
 using System.Linq;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Ghost.Roles.Components;
 using Content.Server.StationEvents.Components;
+using Content.Shared.GameTicking.Components;
 
 namespace Content.Server.StationEvents.Events;
 
diff --git a/Content.Server/StationEvents/Events/RandomSpawnRule.cs b/Content.Server/StationEvents/Events/RandomSpawnRule.cs
index 77744d44e46..e904c24ba60 100644
--- a/Content.Server/StationEvents/Events/RandomSpawnRule.cs
+++ b/Content.Server/StationEvents/Events/RandomSpawnRule.cs
@@ -1,6 +1,6 @@
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
+using Content.Shared.GameTicking.Components;
 
 namespace Content.Server.StationEvents.Events;
 
diff --git a/Content.Server/StationEvents/Events/SolarFlareRule.cs b/Content.Server/StationEvents/Events/SolarFlareRule.cs
index 0370b4ee61d..19f6e393d20 100644
--- a/Content.Server/StationEvents/Events/SolarFlareRule.cs
+++ b/Content.Server/StationEvents/Events/SolarFlareRule.cs
@@ -1,4 +1,3 @@
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Radio;
 using Robust.Shared.Random;
@@ -8,6 +7,7 @@
 using Content.Shared.Radio.Components;
 using Content.Shared.Doors.Components;
 using Content.Shared.Doors.Systems;
+using Content.Shared.GameTicking.Components;
 
 namespace Content.Server.StationEvents.Events;
 
diff --git a/Content.Server/StationEvents/Events/NinjaSpawnRule.cs b/Content.Server/StationEvents/Events/SpaceSpawnRule.cs
similarity index 52%
rename from Content.Server/StationEvents/Events/NinjaSpawnRule.cs
rename to Content.Server/StationEvents/Events/SpaceSpawnRule.cs
index d9d68a386cf..6fccaaa5cfc 100644
--- a/Content.Server/StationEvents/Events/NinjaSpawnRule.cs
+++ b/Content.Server/StationEvents/Events/SpaceSpawnRule.cs
@@ -1,26 +1,36 @@
-using Content.Server.GameTicking.Components;
+using Content.Server.Antag;
 using Content.Server.GameTicking.Rules.Components;
-using Content.Server.Ninja.Systems;
 using Content.Server.Station.Components;
 using Content.Server.StationEvents.Components;
+using Content.Shared.GameTicking.Components;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 
 namespace Content.Server.StationEvents.Events;
 
 /// <summary>
-/// Event for spawning a Space Ninja mid-game.
+/// Station event component for spawning this rules antags in space around a station.
 /// </summary>
-public sealed class NinjaSpawnRule : StationEventSystem<NinjaSpawnRuleComponent>
+public sealed class SpaceSpawnRule : StationEventSystem<SpaceSpawnRuleComponent>
 {
     [Dependency] private readonly SharedTransformSystem _transform = default!;
 
-    protected override void Started(EntityUid uid, NinjaSpawnRuleComponent comp, GameRuleComponent gameRule, GameRuleStartedEvent args)
+    public override void Initialize()
     {
-        base.Started(uid, comp, gameRule, args);
+        base.Initialize();
+
+        SubscribeLocalEvent<SpaceSpawnRuleComponent, AntagSelectLocationEvent>(OnSelectLocation);
+    }
+
+    protected override void Added(EntityUid uid, SpaceSpawnRuleComponent comp, GameRuleComponent gameRule, GameRuleAddedEvent args)
+    {
+        base.Added(uid, comp, gameRule, args);
 
         if (!TryGetRandomStation(out var station))
+        {
+            ForceEndSelf(uid, gameRule);
             return;
+        }
 
         var stationData = Comp<StationDataComponent>(station.Value);
 
@@ -28,22 +38,28 @@ protected override void Started(EntityUid uid, NinjaSpawnRuleComponent comp, Gam
         var gridUid = StationSystem.GetLargestGrid(stationData);
         if (gridUid == null || !TryComp<MapGridComponent>(gridUid, out var grid))
         {
-            Sawmill.Warning("Chosen station has no grids, cannot spawn space ninja!");
+            Sawmill.Warning("Chosen station has no grids, cannot pick location for {ToPrettyString(uid):rule}");
+            ForceEndSelf(uid, gameRule);
             return;
         }
 
-        // figure out its AABB size and use that as a guide to how far ninja should be
+        // figure out its AABB size and use that as a guide to how far the spawner should be
         var size = grid.LocalAABB.Size.Length() / 2;
         var distance = size + comp.SpawnDistance;
         var angle = RobustRandom.NextAngle();
         // position relative to station center
         var location = angle.ToVec() * distance;
 
-        // create the spawner, the ninja will appear when a ghost has picked the role
+        // create the spawner!
         var xform = Transform(gridUid.Value);
         var position = _transform.GetWorldPosition(xform) + location;
-        var coords = new MapCoordinates(position, xform.MapID);
-        Sawmill.Info($"Creating ninja spawnpoint at {coords}");
-        Spawn("SpawnPointGhostSpaceNinja", coords);
+        comp.Coords = new MapCoordinates(position, xform.MapID);
+        Sawmill.Info($"Picked location {comp.Coords} for {ToPrettyString(uid):rule}");
+    }
+
+    private void OnSelectLocation(Entity<SpaceSpawnRuleComponent> ent, ref AntagSelectLocationEvent args)
+    {
+        if (ent.Comp.Coords is {} coords)
+            args.Coordinates.Add(coords);
     }
 }
diff --git a/Content.Server/StationEvents/Events/StationEventSystem.cs b/Content.Server/StationEvents/Events/StationEventSystem.cs
index 1fe4b5eb529..8431025b9a6 100644
--- a/Content.Server/StationEvents/Events/StationEventSystem.cs
+++ b/Content.Server/StationEvents/Events/StationEventSystem.cs
@@ -1,14 +1,11 @@
-using System.Linq;
 using Content.Server.Administration.Logs;
 using Content.Server.Chat.Systems;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules;
-using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Station.Systems;
 using Content.Server.StationEvents.Components;
 using Content.Shared.Database;
+using Content.Shared.GameTicking.Components;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Map;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 
@@ -20,7 +17,6 @@ namespace Content.Server.StationEvents.Events;
 public abstract class StationEventSystem<T> : GameRuleSystem<T> where T : IComponent
 {
     [Dependency] protected readonly IAdminLogManager AdminLogManager = default!;
-    [Dependency] protected readonly IMapManager MapManager = default!;
     [Dependency] protected readonly IPrototypeManager PrototypeManager = default!;
     [Dependency] protected readonly ChatSystem ChatSystem = default!;
     [Dependency] protected readonly SharedAudioSystem Audio = default!;
@@ -43,16 +39,12 @@ protected override void Added(EntityUid uid, T component, GameRuleComponent game
         if (!TryComp<StationEventComponent>(uid, out var stationEvent))
             return;
 
-
         AdminLogManager.Add(LogType.EventAnnounced, $"Event added / announced: {ToPrettyString(uid)}");
 
         if (stationEvent.StartAnnouncement != null)
-        {
-            ChatSystem.DispatchGlobalAnnouncement(Loc.GetString(stationEvent.StartAnnouncement), playSound: false, colorOverride: Color.Gold);
-        }
+            ChatSystem.DispatchGlobalAnnouncement(Loc.GetString(stationEvent.StartAnnouncement), playSound: false, colorOverride: stationEvent.StartAnnouncementColor);
 
         Audio.PlayGlobal(stationEvent.StartAudio, Filter.Broadcast(), true);
-        stationEvent.StartTime = Timing.CurTime + stationEvent.StartDelay;
     }
 
     /// <inheritdoc/>
@@ -86,9 +78,7 @@ protected override void Ended(EntityUid uid, T component, GameRuleComponent game
         AdminLogManager.Add(LogType.EventStopped, $"Event ended: {ToPrettyString(uid)}");
 
         if (stationEvent.EndAnnouncement != null)
-        {
-            ChatSystem.DispatchGlobalAnnouncement(Loc.GetString(stationEvent.EndAnnouncement), playSound: false, colorOverride: Color.Gold);
-        }
+            ChatSystem.DispatchGlobalAnnouncement(Loc.GetString(stationEvent.EndAnnouncement), playSound: false, colorOverride: stationEvent.EndAnnouncementColor);
 
         Audio.PlayGlobal(stationEvent.EndAudio, Filter.Broadcast(), true);
     }
@@ -108,11 +98,7 @@ public override void Update(float frameTime)
             if (!GameTicker.IsGameRuleAdded(uid, ruleData))
                 continue;
 
-            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))
+            if (stationEvent.EndTime != null && Timing.CurTime >= stationEvent.EndTime && GameTicker.IsGameRuleActive(uid, ruleData))
             {
                 GameTicker.EndGameRule(uid, ruleData);
             }
diff --git a/Content.Server/StationEvents/Events/VentClogRule.cs b/Content.Server/StationEvents/Events/VentClogRule.cs
index 867f41dcccf..f14958631d1 100644
--- a/Content.Server/StationEvents/Events/VentClogRule.cs
+++ b/Content.Server/StationEvents/Events/VentClogRule.cs
@@ -1,14 +1,13 @@
 using Content.Server.Atmos.Piping.Unary.Components;
-using Content.Server.Station.Components;
+using Content.Server.Fluids.EntitySystems;
+using Content.Server.StationEvents.Components;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.GameTicking.Components;
+using Content.Shared.Station.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Random;
 using System.Linq;
-using Content.Server.Fluids.EntitySystems;
-using Content.Server.GameTicking.Components;
-using Content.Server.GameTicking.Rules.Components;
-using Content.Server.StationEvents.Components;
 
 namespace Content.Server.StationEvents.Events;
 
diff --git a/Content.Server/StationEvents/Events/VentCrittersRule.cs b/Content.Server/StationEvents/Events/VentCrittersRule.cs
index c2605039bce..aee141f2dba 100644
--- a/Content.Server/StationEvents/Events/VentCrittersRule.cs
+++ b/Content.Server/StationEvents/Events/VentCrittersRule.cs
@@ -1,7 +1,7 @@
-using Content.Server.GameTicking.Components;
 using Content.Server.StationEvents.Components;
 using Content.Server.GameTicking.Rules.Components;
-using Content.Server.Station.Components;
+using Content.Shared.GameTicking.Components;
+using Content.Shared.Station.Components;
 using Content.Shared.Storage;
 using Robust.Shared.Map;
 using Robust.Shared.Random;
diff --git a/Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs b/Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs
index 6c1ad4f4891..f65105de066 100644
--- a/Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs
+++ b/Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs
@@ -1,10 +1,10 @@
 using Content.Server.GameTicking;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
 using Content.Server.StationEvents.Events;
 using Content.Shared.CCVar;
+using Content.Shared.GameTicking.Components;
 using Robust.Shared.Configuration;
 using Robust.Shared.Random;
 
diff --git a/Content.Server/StationRecords/Systems/StationRecordsSystem.cs b/Content.Server/StationRecords/Systems/StationRecordsSystem.cs
index fa89b26946b..1cd34ae9e74 100644
--- a/Content.Server/StationRecords/Systems/StationRecordsSystem.cs
+++ b/Content.Server/StationRecords/Systems/StationRecordsSystem.cs
@@ -1,11 +1,12 @@
 using System.Diagnostics.CodeAnalysis;
 using Content.Server.Forensics;
 using Content.Server.GameTicking;
+using Content.Shared.Access.Components; // DeltaV
+using Content.Shared.Access.Systems; // DeltaV
 using Content.Shared.Inventory;
 using Content.Shared.PDA;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
-using Content.Shared.Roles.Jobs;
 using Content.Shared.StationRecords;
 using Robust.Shared.Enums;
 using Robust.Shared.Prototypes;
@@ -34,6 +35,7 @@ namespace Content.Server.StationRecords.Systems;
 public sealed class StationRecordsSystem : SharedStationRecordsSystem
 {
     [Dependency] private readonly InventorySystem _inventory = default!;
+    [Dependency] private readonly SharedIdCardSystem _idCard = default!; // DeltaV
     [Dependency] private readonly StationRecordKeyStorageSystem _keyStorage = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
@@ -49,19 +51,15 @@ private void OnPlayerSpawn(PlayerSpawnCompleteEvent args)
         if (!TryComp<StationRecordsComponent>(args.Station, out var stationRecords))
             return;
 
-        CreateGeneralRecord(args.Station, args.Mob, args.Profile, args.Job, stationRecords); // DeltaV #1425 - JobId replaced with Job to parse VirtualJob
+        CreateGeneralRecord(args.Station, args.Mob, args.Profile, args.JobId, stationRecords);
     }
 
     private void CreateGeneralRecord(EntityUid station, EntityUid player, HumanoidCharacterProfile profile,
-        JobComponent? job, StationRecordsComponent records) // DeltaV #1425
+        string? jobId, StationRecordsComponent records)
     {
-        // DeltaV #1425 - Inherit from VirtualJob if possible
-        if (!_prototypeManager.TryIndex<JobPrototype>(job?.Prototype, out var jobProto))
-            return;
-        // End of DeltaV code
-
-        if (string.IsNullOrEmpty(job?.Prototype)
-            || !_prototypeManager.HasIndex<JobPrototype>(jobProto))
+        // TODO make PlayerSpawnCompleteEvent.JobId a ProtoId
+        if (string.IsNullOrEmpty(jobId)
+            || !_prototypeManager.HasIndex<JobPrototype>(jobId))
             return;
 
         if (!_inventory.TryGetSlotEntity(player, "id", out var idUid))
@@ -70,7 +68,7 @@ private void CreateGeneralRecord(EntityUid station, EntityUid player, HumanoidCh
         TryComp<FingerprintComponent>(player, out var fingerprintComponent);
         TryComp<DnaComponent>(player, out var dnaComponent);
 
-        CreateGeneralRecord(station, idUid.Value, profile.Name, profile.Age, profile.Species, profile.Gender, job, fingerprintComponent?.Fingerprint, dnaComponent?.DNA, profile, records);
+        CreateGeneralRecord(station, idUid.Value, profile.Name, profile.Age, profile.Species, profile.Gender, jobId, fingerprintComponent?.Fingerprint, dnaComponent?.DNA, profile, records);
     }
 
 
@@ -108,17 +106,14 @@ public void CreateGeneralRecord(
         int age,
         string species,
         Gender gender,
-        JobComponent job, // DeltaV #1425 - Use Job instead of JobId to pass VirtualJobLocalizedName/Icon
+        string jobId,
         string? mobFingerprint,
         string? dna,
         HumanoidCharacterProfile profile,
         StationRecordsComponent records)
     {
-        // DeltaV #1425 - Get jobId separately as a result
-        string? jobId = job.Prototype;
-        if (string.IsNullOrEmpty(jobId) || !_prototypeManager.TryIndex<JobPrototype>(job.Prototype, out var jobPrototype))
+        if (!_prototypeManager.TryIndex<JobPrototype>(jobId, out var jobPrototype))
             throw new ArgumentException($"Invalid job prototype ID: {jobId}");
-        // End of DeltaV code
 
         // when adding a record that already exists use the old one
         // this happens when respawning as the same character
@@ -128,12 +123,16 @@ public void CreateGeneralRecord(
             return;
         }
 
+        // DeltaV - use id card if possible
+        Entity<IdCardComponent>? card = null;
+        if (idUid != null && _idCard.TryFindIdCard(idUid.Value, out var card2))
+            card = card2;
         var record = new GeneralStationRecord()
         {
             Name = name,
             Age = age,
-            JobTitle = job.VirtualJobLocalizedName ?? jobPrototype.LocalizedName,// DeltaV #1425 - Use VirtualJobLocalizedName if possible
-            JobIcon = job.VirtualJobIcon ?? jobPrototype.Icon, // DeltaV #1425 - Use VirtualJobIcon if possible
+            JobTitle = card?.Comp.JobTitle ?? jobPrototype.LocalizedName, // DeltaV
+            JobIcon = card?.Comp.JobIcon ?? jobPrototype.Icon, // DeltaV
             JobPrototype = jobId,
             Species = species,
             Gender = gender,
diff --git a/Content.Server/Sticky/Components/StickyComponent.cs b/Content.Server/Sticky/Components/StickyComponent.cs
deleted file mode 100644
index 320938000f5..00000000000
--- a/Content.Server/Sticky/Components/StickyComponent.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using Content.Shared.Whitelist;
-
-namespace Content.Server.Sticky.Components;
-
-/// <summary>
-///     Items that can be stick to other structures or entities.
-///     For example paper stickers or C4 charges.
-/// </summary>
-[RegisterComponent]
-public sealed partial class StickyComponent : Component
-{
-    /// <summary>
-    ///     What target entities are valid to be surface for sticky entity.
-    /// </summary>
-    [DataField("whitelist")]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public EntityWhitelist? Whitelist;
-
-    /// <summary>
-    ///     What target entities can't be used as surface for sticky entity.
-    /// </summary>
-    [DataField("blacklist")]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public EntityWhitelist? Blacklist;
-
-    /// <summary>
-    ///     How much time does it take to stick entity to target.
-    ///     If zero will stick entity immediately.
-    /// </summary>
-    [DataField("stickDelay")]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public TimeSpan StickDelay = TimeSpan.Zero;
-
-    /// <summary>
-    ///     Whether users can unstick item when it was stuck to surface.
-    /// </summary>
-    [DataField("canUnstick")]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public bool CanUnstick = true;
-
-    /// <summary>
-    ///     How much time does it take to unstick entity.
-    ///     If zero will unstick entity immediately.
-    /// </summary>
-    [DataField("unstickDelay")]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public TimeSpan UnstickDelay = TimeSpan.Zero;
-
-    /// <summary>
-    ///     Popup message shown when player started sticking entity to another entity.
-    /// </summary>
-    [DataField("stickPopupStart")]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public string? StickPopupStart;
-
-    /// <summary>
-    ///     Popup message shown when player successfully stuck entity.
-    /// </summary>
-    [DataField("stickPopupSuccess")]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public string? StickPopupSuccess;
-
-    /// <summary>
-    ///     Popup message shown when player started unsticking entity from another entity.
-    /// </summary>
-    [DataField("unstickPopupStart")]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public string? UnstickPopupStart;
-
-    /// <summary>
-    ///     Popup message shown when player successfully unstuck entity.
-    /// </summary>
-    [DataField("unstickPopupSuccess")]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public string? UnstickPopupSuccess;
-
-    /// <summary>
-    ///     Entity that is used as surface for sticky entity.
-    ///     Null if entity doesn't stuck to anything.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadOnly)]
-    public EntityUid? StuckTo;
-
-    /// <summary>
-    /// For the DoAfter event to tell if it should stick or unstick
-    /// </summary>
-    public bool Stick;
-}
diff --git a/Content.Server/Sticky/Events/EntityStuckEvent.cs b/Content.Server/Sticky/Events/EntityStuckEvent.cs
deleted file mode 100644
index 7857fad7d57..00000000000
--- a/Content.Server/Sticky/Events/EntityStuckEvent.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-namespace Content.Server.Sticky.Events;
-
-/// <summary>
-///     Risen on sticky entity to see if it can stick to another entity.
-/// </summary>
-[ByRefEvent]
-public record struct AttemptEntityStickEvent(EntityUid Target, EntityUid User)
-{
-    public readonly EntityUid Target = Target;
-    public readonly EntityUid User = User;
-    public bool Cancelled = false;
-}
-
-/// <summary>
-///     Risen on sticky entity to see if it can unstick from another entity.
-/// </summary>
-[ByRefEvent]
-public record struct AttemptEntityUnstickEvent(EntityUid Target, EntityUid User)
-{
-    public readonly EntityUid Target = Target;
-    public readonly EntityUid User = User;
-    public bool Cancelled = false;
-}
-
-
-/// <summary>
-///     Risen on sticky entity when it was stuck to other entity.
-/// </summary>
-public sealed class EntityStuckEvent : EntityEventArgs
-{
-    /// <summary>
-    ///     Entity that was used as a surface for sticky object.
-    /// </summary>
-    public readonly EntityUid Target;
-
-    /// <summary>
-    ///     Entity that stuck sticky object on target.
-    /// </summary>
-    public readonly EntityUid User;
-
-    public EntityStuckEvent(EntityUid target, EntityUid user)
-    {
-        Target = target;
-        User = user;
-    }
-}
-
-/// <summary>
-///     Risen on sticky entity when it was unstuck from other entity.
-/// </summary>
-public sealed class EntityUnstuckEvent : EntityEventArgs
-{
-    /// <summary>
-    ///     Entity that was used as a surface for sticky object.
-    /// </summary>
-    public readonly EntityUid Target;
-
-    /// <summary>
-    ///     Entity that unstuck sticky object on target.
-    /// </summary>
-    public readonly EntityUid User;
-
-    public EntityUnstuckEvent(EntityUid target, EntityUid user)
-    {
-        Target = target;
-        User = user;
-    }
-}
diff --git a/Content.Server/Sticky/Systems/StickySystem.cs b/Content.Server/Sticky/Systems/StickySystem.cs
deleted file mode 100644
index 21a7f4d0395..00000000000
--- a/Content.Server/Sticky/Systems/StickySystem.cs
+++ /dev/null
@@ -1,234 +0,0 @@
-using Content.Server.Popups;
-using Content.Server.Sticky.Components;
-using Content.Server.Sticky.Events;
-using Content.Shared.DoAfter;
-using Content.Shared.Hands.EntitySystems;
-using Content.Shared.Interaction;
-using Content.Shared.Sticky;
-using Content.Shared.Sticky.Components;
-using Content.Shared.Verbs;
-using Content.Shared.Whitelist;
-using Robust.Shared.Containers;
-using Robust.Shared.Utility;
-
-namespace Content.Server.Sticky.Systems;
-
-public sealed class StickySystem : EntitySystem
-{
-    [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
-    [Dependency] private readonly PopupSystem _popupSystem = default!;
-    [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
-    [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
-    [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
-
-    private const string StickerSlotId = "stickers_container";
-
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<StickyComponent, StickyDoAfterEvent>(OnStickFinished);
-        SubscribeLocalEvent<StickyComponent, AfterInteractEvent>(OnAfterInteract);
-        SubscribeLocalEvent<StickyComponent, GetVerbsEvent<Verb>>(AddUnstickVerb);
-    }
-
-    private void OnAfterInteract(EntityUid uid, StickyComponent component, AfterInteractEvent args)
-    {
-        if (args.Handled || !args.CanReach || args.Target == null)
-            return;
-
-        // try stick object to a clicked target entity
-        args.Handled = StartSticking(uid, args.User, args.Target.Value, component);
-    }
-
-    private void AddUnstickVerb(EntityUid uid, StickyComponent component, GetVerbsEvent<Verb> args)
-    {
-        if (component.StuckTo == null || !component.CanUnstick || !args.CanInteract || args.Hands == null)
-            return;
-
-        // we can't use args.CanAccess, because it stuck in another container
-        // we also need to ignore entity that it stuck to
-        var inRange = _interactionSystem.InRangeUnobstructed(uid, args.User,
-            predicate: entity => component.StuckTo == entity);
-        if (!inRange)
-            return;
-
-        args.Verbs.Add(new Verb
-        {
-            DoContactInteraction = true,
-            Text = Loc.GetString("comp-sticky-unstick-verb-text"),
-            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/eject.svg.192dpi.png")),
-            Act = () => StartUnsticking(uid, args.User, component)
-        });
-    }
-
-    private bool StartSticking(EntityUid uid, EntityUid user, EntityUid target, StickyComponent? component = null)
-    {
-        if (!Resolve(uid, ref component))
-            return false;
-
-        // check whitelist and blacklist
-        if (_whitelistSystem.IsWhitelistFail(component.Whitelist, target) ||
-            _whitelistSystem.IsBlacklistPass(component.Blacklist, target))
-            return false;
-
-        var attemptEv = new AttemptEntityStickEvent(target, user);
-        RaiseLocalEvent(uid, ref attemptEv);
-        if (attemptEv.Cancelled)
-            return false;
-
-        // check if delay is not zero to start do after
-        var delay = (float) component.StickDelay.TotalSeconds;
-        if (delay > 0)
-        {
-            // show message to user
-            if (component.StickPopupStart != null)
-            {
-                var msg = Loc.GetString(component.StickPopupStart);
-                _popupSystem.PopupEntity(msg, user, user);
-            }
-
-            component.Stick = true;
-
-            // start sticking object to target
-            _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, user, delay, new StickyDoAfterEvent(), uid, target: target, used: uid)
-            {
-                BreakOnMove = true,
-                NeedHand = true
-            });
-        }
-        else
-        {
-            // if delay is zero - stick entity immediately
-            StickToEntity(uid, target, user, component);
-        }
-
-        return true;
-    }
-
-    private void OnStickFinished(EntityUid uid, StickyComponent component, DoAfterEvent args)
-    {
-        if (args.Handled || args.Cancelled || args.Args.Target == null)
-            return;
-
-        if (component.Stick)
-            StickToEntity(uid, args.Args.Target.Value, args.Args.User, component);
-        else
-            UnstickFromEntity(uid, args.Args.User, component);
-
-        args.Handled = true;
-    }
-
-    private void StartUnsticking(EntityUid uid, EntityUid user, StickyComponent? component = null)
-    {
-        if (!Resolve(uid, ref component))
-            return;
-
-        if (component.StuckTo is not { } stuckTo)
-            return;
-
-        var attemptEv = new AttemptEntityUnstickEvent(stuckTo, user);
-        RaiseLocalEvent(uid, ref attemptEv);
-        if (attemptEv.Cancelled)
-            return;
-
-        var delay = (float) component.UnstickDelay.TotalSeconds;
-        if (delay > 0)
-        {
-            // show message to user
-            if (component.UnstickPopupStart != null)
-            {
-                var msg = Loc.GetString(component.UnstickPopupStart);
-                _popupSystem.PopupEntity(msg, user, user);
-            }
-
-            component.Stick = false;
-
-            // start unsticking object
-            _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, user, delay, new StickyDoAfterEvent(), uid, target: uid)
-            {
-                BreakOnMove = true,
-                NeedHand = true
-            });
-        }
-        else
-        {
-            // if delay is zero - unstick entity immediately
-            UnstickFromEntity(uid, user, component);
-        }
-    }
-
-    public void StickToEntity(EntityUid uid, EntityUid target, EntityUid user, StickyComponent? component = null)
-    {
-        if (!Resolve(uid, ref component))
-            return;
-
-        var attemptEv = new AttemptEntityStickEvent(target, user);
-        RaiseLocalEvent(uid, ref attemptEv);
-        if (attemptEv.Cancelled)
-            return;
-
-        // add container to entity and insert sticker into it
-        var container = _containerSystem.EnsureContainer<Container>(target, StickerSlotId);
-        container.ShowContents = true;
-        if (!_containerSystem.Insert(uid, container))
-            return;
-
-        // show message to user
-        if (component.StickPopupSuccess != null)
-        {
-            var msg = Loc.GetString(component.StickPopupSuccess);
-            _popupSystem.PopupEntity(msg, user, user);
-        }
-
-        // send information to appearance that entity is stuck
-        if (TryComp(uid, out AppearanceComponent? appearance))
-        {
-            _appearance.SetData(uid, StickyVisuals.IsStuck, true, appearance);
-        }
-
-        component.StuckTo = target;
-        RaiseLocalEvent(uid, new EntityStuckEvent(target, user), true);
-    }
-
-    public void UnstickFromEntity(EntityUid uid, EntityUid user, StickyComponent? component = null)
-    {
-        if (!Resolve(uid, ref component))
-            return;
-
-        if (component.StuckTo is not { } stuckTo)
-            return;
-
-        var attemptEv = new AttemptEntityUnstickEvent(stuckTo, user);
-        RaiseLocalEvent(uid, ref attemptEv);
-        if (attemptEv.Cancelled)
-            return;
-
-        // try to remove sticky item from target container
-        if (!_containerSystem.TryGetContainer(stuckTo, StickerSlotId, out var container) || !_containerSystem.Remove(uid, container))
-            return;
-        // delete container if it's now empty
-        if (container.ContainedEntities.Count == 0)
-            _containerSystem.ShutdownContainer(container);
-
-        // try place dropped entity into user hands
-        _handsSystem.PickupOrDrop(user, uid);
-
-        // send information to appearance that entity isn't stuck
-        if (TryComp(uid, out AppearanceComponent? appearance))
-        {
-            _appearance.SetData(uid, StickyVisuals.IsStuck, false, appearance);
-        }
-
-        // show message to user
-        if (component.UnstickPopupSuccess != null)
-        {
-            var msg = Loc.GetString(component.UnstickPopupSuccess);
-            _popupSystem.PopupEntity(msg, user, user);
-        }
-
-        component.StuckTo = null;
-        RaiseLocalEvent(uid, new EntityUnstuckEvent(stuckTo, user), true);
-    }
-}
diff --git a/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs b/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
index 9da7606bcc5..191a0ac57c6 100644
--- a/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
+++ b/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
@@ -1,7 +1,6 @@
 using System.Linq;
 using Content.Server.Explosion.EntitySystems;
 using Content.Server.Resist;
-using Content.Server.Station.Components;
 using Content.Server.Storage.Components;
 using Content.Shared.Access;
 using Content.Shared.Access.Components;
@@ -9,6 +8,7 @@
 using Content.Shared.DoAfter;
 using Content.Shared.Lock;
 using Content.Shared.Mind.Components;
+using Content.Shared.Station.Components;
 using Content.Shared.Storage.Components;
 using Content.Shared.Storage.EntitySystems;
 using Content.Shared.Tools.Systems;
@@ -390,7 +390,7 @@ private void DestroyAfterLimit(EntityUid uid, BluespaceLockerComponent component
         {
             case BluespaceLockerDestroyType.Explode:
                 _explosionSystem.QueueExplosion(uid.ToCoordinates().ToMap(EntityManager, _transformSystem),
-                    ExplosionSystem.DefaultExplosionPrototypeId, 4, 1, 2, maxTileBreak: 0);
+                    ExplosionSystem.DefaultExplosionPrototypeId, 4, 1, 2, uid, maxTileBreak: 0);
                 goto case BluespaceLockerDestroyType.Delete;
             case BluespaceLockerDestroyType.Delete:
                 QueueDel(uid);
diff --git a/Content.Server/Strip/StrippableSystem.cs b/Content.Server/Strip/StrippableSystem.cs
index ded9eab3eb2..194df7b3d07 100644
--- a/Content.Server/Strip/StrippableSystem.cs
+++ b/Content.Server/Strip/StrippableSystem.cs
@@ -351,7 +351,7 @@ private void StripRemoveInventory(
 
             RaiseLocalEvent(item, new DroppedEvent(user), true); // Gas tank internals etc.
 
-            _handsSystem.PickupOrDrop(user, item, animateUser: stealth, animate: stealth);
+            _handsSystem.PickupOrDrop(user, item, animateUser: stealth, animate: !stealth);
             _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):actor} has stripped the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s {slot} slot");
         }
 
@@ -450,7 +450,7 @@ private void StripInsertHand(
                 return;
 
             _handsSystem.TryDrop(user, checkActionBlocker: false, handsComp: user.Comp);
-            _handsSystem.TryPickup(target, held, handName, checkActionBlocker: false, animateUser: stealth, animate: stealth, handsComp: target.Comp);
+            _handsSystem.TryPickup(target, held, handName, checkActionBlocker: false, animateUser: stealth, animate: !stealth, handsComp: target.Comp);
             _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):actor} has placed the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s hands");
 
             // Hand update will trigger strippable update.
@@ -550,7 +550,7 @@ private void StripRemoveHand(
                 return;
 
             _handsSystem.TryDrop(target, item, checkActionBlocker: false, handsComp: target.Comp);
-            _handsSystem.PickupOrDrop(user, item, animateUser: stealth, animate: stealth, handsComp: user.Comp);
+            _handsSystem.PickupOrDrop(user, item, animateUser: stealth, animate: !stealth, handsComp: user.Comp);
             _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):actor} has stripped the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s hands");
 
             // Hand update will trigger strippable update.
diff --git a/Content.Server/Stunnable/Systems/StunbatonSystem.cs b/Content.Server/Stunnable/Systems/StunbatonSystem.cs
index c1782efabaf..97dd2c7e735 100644
--- a/Content.Server/Stunnable/Systems/StunbatonSystem.cs
+++ b/Content.Server/Stunnable/Systems/StunbatonSystem.cs
@@ -19,7 +19,7 @@ public sealed class StunbatonSystem : SharedStunbatonSystem
         [Dependency] private readonly RiggableSystem _riggableSystem = default!;
         [Dependency] private readonly SharedPopupSystem _popup = default!;
         [Dependency] private readonly BatterySystem _battery = default!;
-        [Dependency] private readonly SharedItemToggleSystem _itemToggle = default!;
+        [Dependency] private readonly ItemToggleSystem _itemToggle = default!;
 
         public override void Initialize()
         {
diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs
index a01f19c9090..4deb5238a53 100644
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs
@@ -17,10 +17,10 @@ public override void Initialize()
         SubscribeLocalEvent<SurveillanceCameraMicrophoneComponent, ComponentInit>(OnInit);
         SubscribeLocalEvent<SurveillanceCameraMicrophoneComponent, ListenEvent>(RelayEntityMessage);
         SubscribeLocalEvent<SurveillanceCameraMicrophoneComponent, ListenAttemptEvent>(CanListen);
-        SubscribeLocalEvent<ExpandICChatRecipientstEvent>(OnExpandRecipients);
+        SubscribeLocalEvent<ExpandICChatRecipientsEvent>(OnExpandRecipients);
     }
 
-    private void OnExpandRecipients(ExpandICChatRecipientstEvent ev)
+    private void OnExpandRecipients(ExpandICChatRecipientsEvent ev)
     {
         var xformQuery = GetEntityQuery<TransformComponent>();
         var sourceXform = Transform(ev.Source);
diff --git a/Content.Server/Temperature/Components/TemperatureComponent.cs b/Content.Server/Temperature/Components/TemperatureComponent.cs
index 3bfa12f2693..ae2c373b140 100644
--- a/Content.Server/Temperature/Components/TemperatureComponent.cs
+++ b/Content.Server/Temperature/Components/TemperatureComponent.cs
@@ -1,4 +1,3 @@
-using Content.Server.Temperature.Systems;
 using Content.Shared.Alert;
 using Content.Shared.Atmos;
 using Content.Shared.Damage;
@@ -51,15 +50,6 @@ public sealed partial class TemperatureComponent : Component
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public float AtmosTemperatureTransferEfficiency = 0.1f;
 
-    [Obsolete("Use system method")]
-    public float HeatCapacity
-    {
-        get
-        {
-            return IoCManager.Resolve<IEntityManager>().System<TemperatureSystem>().GetHeatCapacity(Owner, this);
-        }
-    }
-
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public DamageSpecifier ColdDamage = new();
 
@@ -71,7 +61,7 @@ public float HeatCapacity
     /// </summary>
     /// <remarks>
     /// Okay it genuinely reaches this basically immediately for a plasma fire.
-    /// </summary>
+    /// </remarks>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public FixedPoint2 DamageCap = FixedPoint2.New(8);
 
@@ -79,7 +69,7 @@ public float HeatCapacity
     /// Used to keep track of when damage starts/stops. Useful for logs.
     /// </summary>
     [DataField]
-    public bool TakingDamage = false;
+    public bool TakingDamage;
 
     [DataField]
     public ProtoId<AlertPrototype> HotAlert = "Hot";
diff --git a/Content.Server/Atmos/Components/TemperatureProtectionComponent.cs b/Content.Server/Temperature/Components/TemperatureProtectionComponent.cs
similarity index 92%
rename from Content.Server/Atmos/Components/TemperatureProtectionComponent.cs
rename to Content.Server/Temperature/Components/TemperatureProtectionComponent.cs
index bdee5ff5140..437f0f89405 100644
--- a/Content.Server/Atmos/Components/TemperatureProtectionComponent.cs
+++ b/Content.Server/Temperature/Components/TemperatureProtectionComponent.cs
@@ -1,6 +1,6 @@
 using Content.Server.Temperature.Systems;
 
-namespace Content.Server.Atmos.Components;
+namespace Content.Server.Temperature.Components;
 
 [RegisterComponent]
 [Access(typeof(TemperatureSystem))]
diff --git a/Content.Server/Temperature/Systems/TemperatureSystem.cs b/Content.Server/Temperature/Systems/TemperatureSystem.cs
index 23c8cb6783f..8b6fa107cc0 100644
--- a/Content.Server/Temperature/Systems/TemperatureSystem.cs
+++ b/Content.Server/Temperature/Systems/TemperatureSystem.cs
@@ -1,6 +1,5 @@
 using System.Linq;
 using Content.Server.Administration.Logs;
-using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Components;
 using Content.Server.Temperature.Components;
@@ -413,17 +412,3 @@ private void RecalculateAndApplyParentThresholds(EntityUid uid,
         return (newHeatThreshold, newColdThreshold);
     }
 }
-
-public sealed class OnTemperatureChangeEvent : EntityEventArgs
-{
-    public float CurrentTemperature { get; }
-    public float LastTemperature { get; }
-    public float TemperatureDelta { get; }
-
-    public OnTemperatureChangeEvent(float current, float last, float delta)
-    {
-        CurrentTemperature = current;
-        LastTemperature = last;
-        TemperatureDelta = delta;
-    }
-}
diff --git a/Content.Server/Terminator/Systems/TerminatorSystem.cs b/Content.Server/Terminator/Systems/TerminatorSystem.cs
index 2442a060e7d..987f02dd6a3 100644
--- a/Content.Server/Terminator/Systems/TerminatorSystem.cs
+++ b/Content.Server/Terminator/Systems/TerminatorSystem.cs
@@ -1,5 +1,4 @@
 using Content.Server.Body.Components;
-using Content.Server.GenericAntag;
 using Content.Server.Ghost.Roles.Events;
 using Content.Server.Roles;
 using Content.Server.Terminator.Components;
diff --git a/Content.Server/Thief/Components/ThiefBeaconComponent.cs b/Content.Server/Thief/Components/ThiefBeaconComponent.cs
new file mode 100644
index 00000000000..65db79f8617
--- /dev/null
+++ b/Content.Server/Thief/Components/ThiefBeaconComponent.cs
@@ -0,0 +1,17 @@
+using Content.Server.Thief.Systems;
+using Robust.Shared.Audio;
+
+namespace Content.Server.Thief.Components;
+
+/// <summary>
+/// working together with StealAreaComponent, allows the thief to count objects near the beacon as stolen when setting up.
+/// </summary>
+[RegisterComponent, Access(typeof(ThiefBeaconSystem))]
+public sealed partial class ThiefBeaconComponent : Component
+{
+    [DataField]
+    public SoundSpecifier LinkSound = new SoundPathSpecifier("/Audio/Machines/high_tech_confirm.ogg");
+
+    [DataField]
+    public SoundSpecifier UnlinkSound = new SoundPathSpecifier("/Audio/Machines/beep.ogg");
+}
diff --git a/Content.Server/Thief/Systems/ThiefBeaconSystem.cs b/Content.Server/Thief/Systems/ThiefBeaconSystem.cs
new file mode 100644
index 00000000000..e004212124c
--- /dev/null
+++ b/Content.Server/Thief/Systems/ThiefBeaconSystem.cs
@@ -0,0 +1,95 @@
+using Content.Server.Mind;
+using Content.Server.Objectives.Components;
+using Content.Server.Roles;
+using Content.Server.Thief.Components;
+using Content.Shared.Examine;
+using Content.Shared.Foldable;
+using Content.Shared.Popups;
+using Content.Shared.Verbs;
+using Robust.Shared.Audio.Systems;
+
+namespace Content.Server.Thief.Systems;
+
+/// <summary>
+/// <see cref="ThiefBeaconComponent"/>
+/// </summary>
+public sealed class ThiefBeaconSystem : EntitySystem
+{
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly MindSystem _mind = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ThiefBeaconComponent, GetVerbsEvent<InteractionVerb>>(OnGetInteractionVerbs);
+        SubscribeLocalEvent<ThiefBeaconComponent, FoldedEvent>(OnFolded);
+        SubscribeLocalEvent<ThiefBeaconComponent, ExaminedEvent>(OnExamined);
+    }
+
+    private void OnGetInteractionVerbs(Entity<ThiefBeaconComponent> beacon, ref GetVerbsEvent<InteractionVerb> args)
+    {
+        if (!args.CanAccess || !args.CanInteract || args.Hands is null)
+            return;
+
+        if (TryComp<FoldableComponent>(beacon, out var foldable) && foldable.IsFolded)
+            return;
+
+        var mind = _mind.GetMind(args.User);
+        if (!HasComp<ThiefRoleComponent>(mind))
+            return;
+
+        var user = args.User;
+        args.Verbs.Add(new()
+        {
+            Act = () =>
+            {
+                SetCoordinate(beacon, mind.Value);
+            },
+            Message = Loc.GetString("thief-fulton-verb-message"),
+            Text = Loc.GetString("thief-fulton-verb-text"),
+        });
+    }
+
+    private void OnFolded(Entity<ThiefBeaconComponent> beacon, ref FoldedEvent args)
+    {
+        if (args.IsFolded)
+            ClearCoordinate(beacon);
+    }
+
+    private void OnExamined(Entity<ThiefBeaconComponent> beacon, ref ExaminedEvent args)
+    {
+        if (!TryComp<StealAreaComponent>(beacon, out var area))
+            return;
+
+        args.PushText(Loc.GetString(area.Owners.Count == 0
+            ? "thief-fulton-examined-unset"
+            : "thief-fulton-examined-set"));
+    }
+
+    private void SetCoordinate(Entity<ThiefBeaconComponent> beacon, EntityUid mind)
+    {
+        if (!TryComp<StealAreaComponent>(beacon, out var area))
+            return;
+
+        _audio.PlayPvs(beacon.Comp.LinkSound, beacon);
+        _popup.PopupEntity(Loc.GetString("thief-fulton-set"), beacon);
+        area.Owners.Clear(); //We only reconfigure the beacon for ourselves, we don't need multiple thieves to steal from the same beacon.
+        area.Owners.Add(mind);
+    }
+
+    private void ClearCoordinate(Entity<ThiefBeaconComponent> beacon)
+    {
+        if (!TryComp<StealAreaComponent>(beacon, out var area))
+            return;
+
+        if (area.Owners.Count == 0)
+            return;
+
+        _audio.PlayPvs(beacon.Comp.UnlinkSound, beacon);
+        _popup.PopupEntity(Loc.GetString("thief-fulton-clear"), beacon);
+        area.Owners.Clear();
+    }
+}
diff --git a/Content.Server/Traitor/Components/TraitorCodePaperComponent.cs b/Content.Server/Traitor/Components/TraitorCodePaperComponent.cs
new file mode 100644
index 00000000000..7887248f21d
--- /dev/null
+++ b/Content.Server/Traitor/Components/TraitorCodePaperComponent.cs
@@ -0,0 +1,27 @@
+namespace Content.Server.Traitor.Components;
+
+/// <summary>
+///     Paper with written traitor codewords on it.
+/// </summary>
+[RegisterComponent]
+public sealed partial class TraitorCodePaperComponent : Component
+{
+    /// <summary>
+    /// The number of codewords that should be generated on this paper.
+    /// Will not extend past the max number of available codewords.
+    /// </summary>
+    [DataField]
+    public int CodewordAmount = 1;
+
+    /// <summary>
+    /// Whether the codewords should be faked if there is no traitor gamerule set.
+    /// </summary>
+    [DataField]
+    public bool FakeCodewords = true;
+
+    /// <summary>
+    /// Whether all codewords added to the round should be used. Overrides CodewordAmount if true.
+    /// </summary>
+    [DataField]
+    public bool CodewordShowAll = false;
+}
diff --git a/Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs b/Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs
new file mode 100644
index 00000000000..34c5d78400e
--- /dev/null
+++ b/Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs
@@ -0,0 +1,94 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Server.GameTicking;
+using Content.Server.GameTicking.Rules;
+using Content.Server.GameTicking.Rules.Components;
+using Content.Server.Traitor.Components;
+using Content.Shared.Paper;
+using Robust.Shared.Random;
+using Robust.Shared.Utility;
+using System.Linq;
+using Content.Shared.Paper;
+
+namespace Content.Server.Traitor.Systems;
+
+public sealed class TraitorCodePaperSystem : EntitySystem
+{
+    [Dependency] private readonly GameTicker _gameTicker = default!;
+    [Dependency] private readonly TraitorRuleSystem _traitorRuleSystem = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly PaperSystem _paper = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<TraitorCodePaperComponent, MapInitEvent>(OnMapInit);
+    }
+
+    private void OnMapInit(EntityUid uid, TraitorCodePaperComponent component, MapInitEvent args)
+    {
+        SetupPaper(uid, component);
+    }
+
+    private void SetupPaper(EntityUid uid, TraitorCodePaperComponent? component = null)
+    {
+        if (!Resolve(uid, ref component))
+            return;
+
+        if (TryComp(uid, out PaperComponent? paperComp))
+        {
+            if (TryGetTraitorCode(out var paperContent, component))
+            {
+                _paper.SetContent((uid, paperComp), paperContent);
+            }
+        }
+    }
+
+    private bool TryGetTraitorCode([NotNullWhen(true)] out string? traitorCode, TraitorCodePaperComponent component)
+    {
+        traitorCode = null;
+
+        var codesMessage = new FormattedMessage();
+        List<string> codeList = new();
+        // Find the first nuke that matches the passed location.
+        if (_gameTicker.IsGameRuleAdded<TraitorRuleComponent>())
+        {
+            var ruleEnts = _gameTicker.GetAddedGameRules();
+            foreach (var ruleEnt in ruleEnts)
+            {
+                if (TryComp(ruleEnt, out TraitorRuleComponent? traitorComp))
+                {
+                    codeList.AddRange(traitorComp.Codewords.ToList());
+                }
+            }
+        }
+        if (codeList.Count == 0)
+        {
+            if (component.FakeCodewords)
+                codeList = _traitorRuleSystem.GenerateTraitorCodewords(new TraitorRuleComponent()).ToList();
+            else
+                codeList = [Loc.GetString("traitor-codes-none")];
+        }
+
+        _random.Shuffle(codeList);
+
+        int i = 0;
+        foreach (var code in codeList)
+        {
+            i++;
+            if (i > component.CodewordAmount && !component.CodewordShowAll)
+                break;
+
+            codesMessage.PushNewline();
+            codesMessage.AddMarkup(code);
+        }
+
+        if (!codesMessage.IsEmpty)
+        {
+            if (i == 1)
+                traitorCode = Loc.GetString("traitor-codes-message-singular") + codesMessage;
+            else
+                traitorCode = Loc.GetString("traitor-codes-message-plural") + codesMessage;
+        }
+        return !codesMessage.IsEmpty;
+    }
+}
diff --git a/Content.Server/Traits/TraitSystem.cs b/Content.Server/Traits/TraitSystem.cs
index f41512b6ac2..3bd540a3049 100644
--- a/Content.Server/Traits/TraitSystem.cs
+++ b/Content.Server/Traits/TraitSystem.cs
@@ -11,7 +11,6 @@ namespace Content.Server.Traits;
 public sealed class TraitSystem : EntitySystem
 {
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly ISerializationManager _serializationManager = default!;
     [Dependency] private readonly SharedHandsSystem _sharedHandsSystem = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
diff --git a/Content.Server/UserInterface/StatValuesCommand.cs b/Content.Server/UserInterface/StatValuesCommand.cs
index f0c4f531d01..85b979f83a7 100644
--- a/Content.Server/UserInterface/StatValuesCommand.cs
+++ b/Content.Server/UserInterface/StatValuesCommand.cs
@@ -4,9 +4,9 @@
 using Content.Server.Cargo.Systems;
 using Content.Server.EUI;
 using Content.Server.Item;
+using Content.Server.Power.Components;
 using Content.Shared.Administration;
 using Content.Shared.Item;
-using Content.Shared.Materials;
 using Content.Shared.Research.Prototypes;
 using Content.Shared.UserInterface;
 using Content.Shared.Weapons.Melee;
@@ -56,6 +56,9 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
             case "itemsize":
                 message = GetItem();
                 break;
+            case "drawrate":
+                message = GetDrawRateMessage();
+                break;
             default:
                 shell.WriteError(Loc.GetString("stat-values-invalid", ("arg", args[0])));
                 return;
@@ -70,7 +73,7 @@ public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
     {
         if (args.Length == 1)
         {
-            return CompletionResult.FromOptions(new[] { "cargosell", "lathesell", "melee" });
+            return CompletionResult.FromOptions(new[] { "cargosell", "lathesell", "melee", "itemsize", "drawrate" });
         }
 
         return CompletionResult.Empty;
@@ -220,13 +223,13 @@ private StatValuesEuiMessage GetLatheMessage()
         {
             var cost = 0.0;
 
-            foreach (var (material, count) in proto.RequiredMaterials)
+            foreach (var (material, count) in proto.Materials)
             {
-                var materialPrice = _proto.Index<MaterialPrototype>(material).Price;
+                var materialPrice = _proto.Index(material).Price;
                 cost += materialPrice * count;
             }
 
-            var sell = priceSystem.GetEstimatedPrice(_proto.Index<EntityPrototype>(proto.Result));
+            var sell = priceSystem.GetLatheRecipePrice(proto);
 
             values.Add(new[]
             {
@@ -250,4 +253,44 @@ private StatValuesEuiMessage GetLatheMessage()
 
         return state;
     }
+
+    private StatValuesEuiMessage GetDrawRateMessage()
+    {
+        var values = new List<string[]>();
+        var powerName = _factory.GetComponentName(typeof(ApcPowerReceiverComponent));
+
+        foreach (var proto in _proto.EnumeratePrototypes<EntityPrototype>())
+        {
+            if (proto.Abstract ||
+                !proto.Components.TryGetValue(powerName,
+                    out var powerConsumer))
+            {
+                continue;
+            }
+
+            var comp = (ApcPowerReceiverComponent) powerConsumer.Component;
+
+            if (comp.Load == 0)
+                continue;
+
+            values.Add(new[]
+            {
+                proto.ID,
+                comp.Load.ToString(CultureInfo.InvariantCulture),
+            });
+        }
+
+        var state = new StatValuesEuiMessage
+        {
+            Title = Loc.GetString("stat-drawrate-values"),
+            Headers = new List<string>
+            {
+                Loc.GetString("stat-drawrate-id"),
+                Loc.GetString("stat-drawrate-rate"),
+            },
+            Values = values,
+        };
+
+        return state;
+    }
 }
diff --git a/Content.Server/Weapons/Melee/Balloon/BalloonPopperSystem.cs b/Content.Server/Weapons/Melee/Balloon/BalloonPopperSystem.cs
index 45c6a3d9d55..a8460a8c660 100644
--- a/Content.Server/Weapons/Melee/Balloon/BalloonPopperSystem.cs
+++ b/Content.Server/Weapons/Melee/Balloon/BalloonPopperSystem.cs
@@ -4,7 +4,7 @@
 using Content.Shared.Popups;
 using Content.Shared.Tag;
 using Content.Shared.Weapons.Melee.Events;
-using Robust.Shared.Audio;
+using Content.Shared.Throwing;
 using Robust.Shared.Audio.Systems;
 
 namespace Content.Server.Weapons.Melee.Balloon;
@@ -23,6 +23,7 @@ public sealed class BalloonPopperSystem : EntitySystem
     public override void Initialize()
     {
         SubscribeLocalEvent<BalloonPopperComponent, MeleeHitEvent>(OnMeleeHit);
+        SubscribeLocalEvent<BalloonPopperComponent, ThrowDoHitEvent>(OnThrowHit);
     }
 
     private void OnMeleeHit(EntityUid uid, BalloonPopperComponent component, MeleeHitEvent args)
@@ -40,6 +41,15 @@ private void OnMeleeHit(EntityUid uid, BalloonPopperComponent component, MeleeHi
         }
     }
 
+    private void OnThrowHit(EntityUid uid, BalloonPopperComponent component, ThrowDoHitEvent args)
+    {
+        foreach (var held in _hands.EnumerateHeld(args.Target))
+        {
+            if (_tag.HasTag(held, component.BalloonTag))
+                PopBallooon(uid, held, component);
+        }
+    }
+
     /// <summary>
     /// Pops a target balloon, making a popup and playing a sound.
     /// </summary>
diff --git a/Content.Server/Weapons/Misc/TetherGunSystem.cs b/Content.Server/Weapons/Misc/TetherGunSystem.cs
index f6aafe376d6..2bf53d46f4b 100644
--- a/Content.Server/Weapons/Misc/TetherGunSystem.cs
+++ b/Content.Server/Weapons/Misc/TetherGunSystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.PowerCell;
+using Content.Shared.Item.ItemToggle;
 using Content.Shared.PowerCell;
 using Content.Shared.Weapons.Misc;
 using Robust.Shared.Physics.Components;
@@ -8,6 +9,7 @@ namespace Content.Server.Weapons.Misc;
 public sealed class TetherGunSystem : SharedTetherGunSystem
 {
     [Dependency] private readonly PowerCellSystem _cell = default!;
+    [Dependency] private readonly ItemToggleSystem _toggle = default!;
 
     public override void Initialize()
     {
@@ -36,12 +38,12 @@ protected override void StartTether(EntityUid gunUid, BaseForceGunComponent comp
         PhysicsComponent? targetPhysics = null, TransformComponent? targetXform = null)
     {
         base.StartTether(gunUid, component, target, user, targetPhysics, targetXform);
-        _cell.SetPowerCellDrawEnabled(gunUid, true);
+        _toggle.TryActivate(gunUid);
     }
 
     protected override void StopTether(EntityUid gunUid, BaseForceGunComponent component, bool land = true, bool transfer = false)
     {
         base.StopTether(gunUid, component, land, transfer);
-        _cell.SetPowerCellDrawEnabled(gunUid, false);
+        _toggle.TryDeactivate(gunUid);
     }
 }
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
index 7f7c7ba8557..3a5fa4540af 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
@@ -24,6 +24,7 @@
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
+using Robust.Shared.Containers;
 
 namespace Content.Server.Weapons.Ranged.Systems;
 
@@ -38,6 +39,7 @@ public sealed partial class GunSystem : SharedGunSystem
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly StaminaSystem _stamina = default!;
     [Dependency] private readonly StunSystem _stun = default!;
+    [Dependency] private readonly SharedContainerSystem _container = default!;
 
     private const float DamagePitchVariation = 0.05f;
     public const float GunClumsyChance = 0.5f;
@@ -127,27 +129,8 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
                 case CartridgeAmmoComponent cartridge:
                     if (!cartridge.Spent)
                     {
-                        if (cartridge.Count > 1)
-                        {
-                            var ev = new GunGetAmmoSpreadEvent(cartridge.Spread);
-                            RaiseLocalEvent(gunUid, ref ev);
-
-                            var angles = LinearSpread(mapAngle - ev.Spread / 2,
-                                mapAngle + ev.Spread / 2, cartridge.Count);
-
-                            for (var i = 0; i < cartridge.Count; i++)
-                            {
-                                var uid = Spawn(cartridge.Prototype, fromEnt);
-                                ShootOrThrow(uid, angles[i].ToVec(), gunVelocity, gun, gunUid, user);
-                                shotProjectiles.Add(uid);
-                            }
-                        }
-                        else
-                        {
-                            var uid = Spawn(cartridge.Prototype, fromEnt);
-                            ShootOrThrow(uid, mapDirection, gunVelocity, gun, gunUid, user);
-                            shotProjectiles.Add(uid);
-                        }
+                        var uid = Spawn(cartridge.Prototype, fromEnt);
+                        CreateAndFireProjectiles(uid, cartridge);
 
                         RaiseLocalEvent(ent!.Value, new AmmoShotEvent()
                         {
@@ -155,8 +138,6 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
                         });
 
                         SetCartridgeSpent(ent.Value, cartridge, true);
-                        MuzzleFlash(gunUid, cartridge, mapDirection.ToAngle(), user);
-                        Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user);
 
                         if (cartridge.DeleteOnSpawn)
                             Del(ent.Value);
@@ -175,10 +156,10 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
                     break;
                 // Ammo shoots itself
                 case AmmoComponent newAmmo:
-                    shotProjectiles.Add(ent!.Value);
-                    MuzzleFlash(gunUid, newAmmo, mapDirection.ToAngle(), user);
-                    Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user);
-                    ShootOrThrow(ent.Value, mapDirection, gunVelocity, gun, gunUid, user);
+                    if (ent == null)
+                        break;
+                    CreateAndFireProjectiles(ent.Value, newAmmo);
+
                     break;
                 case HitscanPrototype hitscan:
 
@@ -204,17 +185,21 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
 
                             var result = rayCastResults[0];
 
-                            // Checks if the laser should pass over unless targeted by its user
-                            foreach (var collide in rayCastResults)
+                            // Check if laser is shot from in a container
+                            if (!_container.IsEntityOrParentInContainer(lastUser))
                             {
-                                if (collide.HitEntity != gun.Target &&
-                                    CompOrNull<RequireProjectileTargetComponent>(collide.HitEntity)?.Active == true)
+                                // Checks if the laser should pass over unless targeted by its user
+                                foreach (var collide in rayCastResults)
                                 {
-                                    continue;
+                                    if (collide.HitEntity != gun.Target &&
+                                        CompOrNull<RequireProjectileTargetComponent>(collide.HitEntity)?.Active == true)
+                                    {
+                                        continue;
+                                    }
+
+                                    result = collide;
+                                    break;
                                 }
-
-                                result = collide;
-                                break;
                             }
 
                             var hit = result.HitEntity;
@@ -289,6 +274,36 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
         {
             FiredProjectiles = shotProjectiles,
         });
+
+        void CreateAndFireProjectiles(EntityUid ammoEnt, AmmoComponent ammoComp)
+        {
+            if (TryComp<ProjectileSpreadComponent>(ammoEnt, out var ammoSpreadComp))
+            {
+                var spreadEvent = new GunGetAmmoSpreadEvent(ammoSpreadComp.Spread);
+                RaiseLocalEvent(gunUid, ref spreadEvent);
+
+                var angles = LinearSpread(mapAngle - spreadEvent.Spread / 2,
+                    mapAngle + spreadEvent.Spread / 2, ammoSpreadComp.Count);
+
+                ShootOrThrow(ammoEnt, angles[0].ToVec(), gunVelocity, gun, gunUid, user);
+                shotProjectiles.Add(ammoEnt);
+
+                for (var i = 1; i < ammoSpreadComp.Count; i++)
+                {
+                    var newuid = Spawn(ammoSpreadComp.Proto, fromEnt);
+                    ShootOrThrow(newuid, angles[i].ToVec(), gunVelocity, gun, gunUid, user);
+                    shotProjectiles.Add(ammoEnt);
+                }
+            }
+            else
+            {
+                ShootOrThrow(ammoEnt, mapDirection, gunVelocity, gun, gunUid, user);
+                shotProjectiles.Add(ammoEnt);
+            }
+
+            MuzzleFlash(gunUid, ammoComp, mapDirection.ToAngle(), user);
+            Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user);
+        }
     }
 
     private void ShootOrThrow(EntityUid uid, Vector2 mapDirection, Vector2 gunVelocity, GunComponent gun, EntityUid gunUid, EntityUid? user)
diff --git a/Content.Server/Whitelist/WhitelistCommands.cs b/Content.Server/Whitelist/WhitelistCommands.cs
index 6a9050f57b2..6912c061629 100644
--- a/Content.Server/Whitelist/WhitelistCommands.cs
+++ b/Content.Server/Whitelist/WhitelistCommands.cs
@@ -31,7 +31,7 @@ public override async void Execute(IConsoleShell shell, string argStr, string[]
         var playtime = IoCManager.Resolve<PlayTimeTrackingManager>();
 
         var name = string.Join(' ', args).Trim();
-        var data = await loc.LookupIdByNameAsync(name);
+        var data = await loc.LookupIdByNameOrIdAsync(name);
 
         if (data != null)
         {
@@ -91,7 +91,7 @@ public override async void Execute(IConsoleShell shell, string argStr, string[]
         var playtime = IoCManager.Resolve<PlayTimeTrackingManager>();
 
         var name = string.Join(' ', args).Trim();
-        var data = await loc.LookupIdByNameAsync(name);
+        var data = await loc.LookupIdByNameOrIdAsync(name);
 
         if (data != null)
         {
diff --git a/Content.Server/Worldgen/Prototypes/BiomePrototype.cs b/Content.Server/Worldgen/Prototypes/BiomePrototype.cs
index db1b5e2a160..1cecf87a5e0 100644
--- a/Content.Server/Worldgen/Prototypes/BiomePrototype.cs
+++ b/Content.Server/Worldgen/Prototypes/BiomePrototype.cs
@@ -54,7 +54,6 @@ public void Apply(EntityUid target, ISerializationManager serialization, IEntity
         foreach (var data in ChunkComponents.Values)
         {
             var comp = (Component) serialization.CreateCopy(data.Component, notNullableOverride: true);
-            comp.Owner = target; // look im sorry ok this .owner has to live until engine api exists
             entityManager.AddComponent(target, comp);
         }
     }
diff --git a/Content.Server/Worldgen/Prototypes/WorldgenConfigPrototype.cs b/Content.Server/Worldgen/Prototypes/WorldgenConfigPrototype.cs
index 49e9e1ed9d2..f669377abbc 100644
--- a/Content.Server/Worldgen/Prototypes/WorldgenConfigPrototype.cs
+++ b/Content.Server/Worldgen/Prototypes/WorldgenConfigPrototype.cs
@@ -30,7 +30,6 @@ public void Apply(EntityUid target, ISerializationManager serialization, IEntity
         foreach (var data in Components.Values)
         {
             var comp = (Component) serialization.CreateCopy(data.Component, notNullableOverride: true);
-            comp.Owner = target; // look im sorry ok this .owner has to live until engine api exists
             entityManager.AddComponent(target, comp);
         }
     }
diff --git a/Content.Server/Worldgen/Systems/BaseWorldSystem.cs b/Content.Server/Worldgen/Systems/BaseWorldSystem.cs
index 78326651c9c..7a9e74375cb 100644
--- a/Content.Server/Worldgen/Systems/BaseWorldSystem.cs
+++ b/Content.Server/Worldgen/Systems/BaseWorldSystem.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Content.Server.Worldgen.Components;
 using JetBrains.Annotations;
 
@@ -12,6 +12,7 @@ namespace Content.Server.Worldgen.Systems;
 public abstract class BaseWorldSystem : EntitySystem
 {
     [Dependency] private readonly WorldControllerSystem _worldController = default!;
+    [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
 
     /// <summary>
     ///     Gets a chunk's coordinates in chunk space as an integer value.
@@ -25,7 +26,7 @@ public Vector2i GetChunkCoords(EntityUid ent, TransformComponent? xform = null)
         if (!Resolve(ent, ref xform))
             throw new Exception("Failed to resolve transform, somehow.");
 
-        return WorldGen.WorldToChunkCoords(xform.WorldPosition).Floored();
+        return WorldGen.WorldToChunkCoords(_transformSystem.GetWorldPosition(xform)).Floored();
     }
 
     /// <summary>
@@ -40,7 +41,7 @@ public Vector2 GetFloatingChunkCoords(EntityUid ent, TransformComponent? xform =
         if (!Resolve(ent, ref xform))
             throw new Exception("Failed to resolve transform, somehow.");
 
-        return WorldGen.WorldToChunkCoords(xform.WorldPosition);
+        return WorldGen.WorldToChunkCoords(_transformSystem.GetWorldPosition(xform));
     }
 
     /// <summary>
diff --git a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs
index 54c3c42e3db..2c5032de75e 100644
--- a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs
+++ b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs
@@ -1,5 +1,4 @@
 using System.Linq;
-using Content.Server.Paper;
 using Content.Server.Power.Components;
 using Content.Server.Research.Systems;
 using Content.Shared.UserInterface;
@@ -9,6 +8,7 @@
 using Content.Shared.Audio;
 using Content.Shared.DeviceLinking;
 using Content.Shared.DeviceLinking.Events;
+using Content.Shared.Paper;
 using Content.Shared.Placeable;
 using Content.Shared.Popups;
 using Content.Shared.Research.Components;
@@ -292,7 +292,8 @@ private void OnPrintButton(EntityUid uid, AnalysisConsoleComponent component, An
             return;
 
         _popup.PopupEntity(Loc.GetString("analysis-console-print-popup"), uid);
-        _paper.SetContent(report, msg.ToMarkup());
+        if (TryComp<PaperComponent>(report, out var paperComp))
+            _paper.SetContent((report, paperComp), msg.ToMarkup());
         UpdateUserInterface(uid, component);
     }
 
diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.Nodes.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.Nodes.cs
index 65aaabdf0e9..a0e8420011f 100644
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.Nodes.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.Nodes.cs
@@ -182,13 +182,12 @@ private void EnterNode(EntityUid uid, ref ArtifactNode node, ArtifactComponent?
                 EntityManager.RemoveComponent(uid, reg.Type);
             }
 
-            var comp = (Component) _componentFactory.GetComponent(reg);
-            comp.Owner = uid;
+            var comp = (Component)_componentFactory.GetComponent(reg);
 
-            var temp = (object) comp;
+            var temp = (object)comp;
             _serialization.CopyTo(entry.Component, ref temp);
             EntityManager.RemoveComponent(uid, temp!.GetType());
-            EntityManager.AddComponent(uid, (Component) temp!);
+            EntityManager.AddComponent(uid, (Component)temp!);
         }
 
         node.Discovered = true;
@@ -218,12 +217,11 @@ private void ExitNode(EntityUid uid, ArtifactComponent? component = null)
             // if the entity prototype contained the component originally
             if (entityPrototype?.Components.TryGetComponent(name, out var entry) ?? false)
             {
-                var comp = (Component) _componentFactory.GetComponent(name);
-                comp.Owner = uid;
-                var temp = (object) comp;
+                var comp = (Component)_componentFactory.GetComponent(name);
+                var temp = (object)comp;
                 _serialization.CopyTo(entry, ref temp);
                 EntityManager.RemoveComponent(uid, temp!.GetType());
-                EntityManager.AddComponent(uid, (Component) temp);
+                EntityManager.AddComponent(uid, (Component)temp);
                 continue;
             }
 
diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ThrowArtifactSystem.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ThrowArtifactSystem.cs
index 8708e0ff4e8..05912229960 100644
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ThrowArtifactSystem.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ThrowArtifactSystem.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Content.Server.Xenoarchaeology.XenoArtifacts.Effects.Components;
 using Content.Server.Xenoarchaeology.XenoArtifacts.Events;
 using Content.Shared.Maps;
@@ -31,7 +31,7 @@ private void OnActivated(EntityUid uid, ThrowArtifactComponent component, Artifa
         if (TryComp<MapGridComponent>(xform.GridUid, out var grid))
         {
             var tiles = grid.GetTilesIntersecting(
-                Box2.CenteredAround(xform.WorldPosition, new Vector2(component.Range * 2, component.Range)));
+                Box2.CenteredAround(_transform.GetWorldPosition(xform), new Vector2(component.Range * 2, component.Range)));
 
             foreach (var tile in tiles)
             {
diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactMagnetTriggerSystem.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactMagnetTriggerSystem.cs
index c6f56a27508..a585a9ef452 100644
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactMagnetTriggerSystem.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactMagnetTriggerSystem.cs
@@ -2,6 +2,7 @@
 using Content.Server.Salvage;
 using Content.Server.Xenoarchaeology.XenoArtifacts.Triggers.Components;
 using Content.Shared.Clothing;
+using Content.Shared.Item.ItemToggle.Components;
 
 namespace Content.Server.Xenoarchaeology.XenoArtifacts.Triggers.Systems;
 
@@ -29,11 +30,11 @@ public override void Update(float frameTime)
 
         _toActivate.Clear();
 
-        //assume that there's more instruments than artifacts
-        var query = EntityQueryEnumerator<MagbootsComponent, TransformComponent>();
-        while (query.MoveNext(out _, out var magboot, out var magXform))
+        //assume that there's more magboots than artifacts
+        var query = EntityQueryEnumerator<MagbootsComponent, TransformComponent, ItemToggleComponent>();
+        while (query.MoveNext(out _, out var magboot, out var magXform, out var toggle))
         {
-            if (!magboot.On)
+            if (!toggle.Activated)
                 continue;
 
             var artiQuery = EntityQueryEnumerator<ArtifactMagnetTriggerComponent, TransformComponent>();
diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs
index 4eb52ed2016..170793ba9bd 100644
--- a/Content.Server/Zombies/ZombieSystem.Transform.cs
+++ b/Content.Server/Zombies/ZombieSystem.Transform.cs
@@ -10,7 +10,6 @@
 using Content.Server.Mind;
 using Content.Server.Mind.Commands;
 using Content.Server.NPC;
-using Content.Server.NPC.Components;
 using Content.Server.NPC.HTN;
 using Content.Server.NPC.Systems;
 using Content.Server.Roles;
@@ -26,10 +25,8 @@
 using Content.Shared.Interaction.Components;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
-using Content.Shared.Mobs.Systems;
 using Content.Shared.Movement.Pulling.Components;
 using Content.Shared.Movement.Systems;
-using Content.Shared.NPC.Components;
 using Content.Shared.NPC.Systems;
 using Content.Shared.Nutrition.AnimalHusbandry;
 using Content.Shared.Nutrition.Components;
@@ -40,6 +37,7 @@
 using Content.Shared.Prying.Components;
 using Content.Shared.Traits.Assorted;
 using Robust.Shared.Audio.Systems;
+using Content.Shared.Ghost.Roles.Components;
 
 namespace Content.Server.Zombies
 {
diff --git a/Content.Shared.Database/LogType.cs b/Content.Shared.Database/LogType.cs
index a7ae0445da1..23f3177d7e8 100644
--- a/Content.Shared.Database/LogType.cs
+++ b/Content.Shared.Database/LogType.cs
@@ -112,4 +112,15 @@ public enum LogType
     /// A player did an item-use interaction of an item they were holding onto another object.
     /// </summary>
     InteractUsing = 92,
+
+    /// <summary>
+    /// Storage & entity-storage related interactions
+    /// </summary>
+    Storage = 93,
+    
+    /// <summary>
+    /// A player got hit by an explosion and was dealt damage.
+    /// </summary>
+    ExplosionHit = 94,
+
 }
diff --git a/Content.Shared/Abilities/Mime/MimePowers.cs b/Content.Shared/Abilities/Mime/MimePowers.cs
new file mode 100644
index 00000000000..969d7a13950
--- /dev/null
+++ b/Content.Shared/Abilities/Mime/MimePowers.cs
@@ -0,0 +1,7 @@
+using Content.Shared.Alert;
+
+namespace Content.Shared.Abilities.Mime;
+
+public sealed partial class BreakVowAlertEvent : BaseAlertEvent;
+
+public sealed partial class RetakeVowAlertEvent : BaseAlertEvent;
diff --git a/Content.Shared/Access/Components/AccessToggleComponent.cs b/Content.Shared/Access/Components/AccessToggleComponent.cs
new file mode 100644
index 00000000000..60a606ac7ea
--- /dev/null
+++ b/Content.Shared/Access/Components/AccessToggleComponent.cs
@@ -0,0 +1,11 @@
+using Content.Shared.Access.Systems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Access.Components;
+
+/// <summary>
+/// Toggles an access provider with <c>ItemToggle</c>.
+/// Requires <see cref="AccessComponent"/>.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(AccessToggleSystem))]
+public sealed partial class AccessToggleComponent : Component;
diff --git a/Content.Shared/Access/Components/IdCardComponent.cs b/Content.Shared/Access/Components/IdCardComponent.cs
index a099cd26d24..9879a02dbcd 100644
--- a/Content.Shared/Access/Components/IdCardComponent.cs
+++ b/Content.Shared/Access/Components/IdCardComponent.cs
@@ -2,7 +2,7 @@
 using Content.Shared.PDA;
 using Content.Shared.StatusIcon;
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Access.Components;
 
@@ -11,34 +11,34 @@ namespace Content.Shared.Access.Components;
 [Access(typeof(SharedIdCardSystem), typeof(SharedPdaSystem), typeof(SharedAgentIdCardSystem), Other = AccessPermissions.ReadWrite)]
 public sealed partial class IdCardComponent : Component
 {
-    [DataField("fullName"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     [AutoNetworkedField]
     // FIXME Friends
     public string? FullName;
 
-    [DataField("jobTitle")]
+    [DataField]
     [AutoNetworkedField]
-    [Access(typeof(SharedIdCardSystem), typeof(SharedPdaSystem), typeof(SharedAgentIdCardSystem), Other = AccessPermissions.ReadWrite), ViewVariables(VVAccess.ReadWrite)]
+    [Access(typeof(SharedIdCardSystem), typeof(SharedPdaSystem), typeof(SharedAgentIdCardSystem), Other = AccessPermissions.ReadWrite)]
     public string? JobTitle;
 
     /// <summary>
     /// The state of the job icon rsi.
     /// </summary>
-    [DataField("jobIcon", customTypeSerializer: typeof(PrototypeIdSerializer<StatusIconPrototype>))]
+    [DataField]
     [AutoNetworkedField]
-    public string JobIcon = "JobIconUnknown";
+    public ProtoId<JobIconPrototype> JobIcon = "JobIconUnknown";
 
     /// <summary>
     /// The unlocalized names of the departments associated with the job
     /// </summary>
-    [DataField("jobDepartments")]
+    [DataField]
     [AutoNetworkedField]
     public List<LocId> JobDepartments = new();
 
     /// <summary>
     /// Determines if accesses from this card should be logged by <see cref="AccessReaderComponent"/>
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public bool BypassLogging;
 
     [DataField]
diff --git a/Content.Shared/Access/SharedAccessWire.cs b/Content.Shared/Access/SharedAccessWire.cs
index d5d1b48c708..a0bb316028f 100644
--- a/Content.Shared/Access/SharedAccessWire.cs
+++ b/Content.Shared/Access/SharedAccessWire.cs
@@ -10,3 +10,12 @@ public enum AccessWireActionKey : byte
     Pulsed,
     PulseCancel
 }
+
+[Serializable, NetSerializable]
+public enum LogWireActionKey : byte
+{
+    Key,
+    Status,
+    Pulsed,
+    PulseCancel
+}
diff --git a/Content.Shared/Access/SharedAgentIDCardSystem.cs b/Content.Shared/Access/SharedAgentIDCardSystem.cs
index 91aa626fe39..aefd413de8b 100644
--- a/Content.Shared/Access/SharedAgentIDCardSystem.cs
+++ b/Content.Shared/Access/SharedAgentIDCardSystem.cs
@@ -25,14 +25,12 @@ public enum AgentIDCardUiKey : byte
     [Serializable, NetSerializable]
     public sealed class AgentIDCardBoundUserInterfaceState : BoundUserInterfaceState
     {
-        public readonly HashSet<ProtoId<StatusIconPrototype>> Icons;
         public string CurrentName { get; }
         public string CurrentJob { get; }
         public string CurrentJobIconId { get; }
 
-        public AgentIDCardBoundUserInterfaceState(string currentName, string currentJob, string currentJobIconId, HashSet<ProtoId<StatusIconPrototype>> icons)
+        public AgentIDCardBoundUserInterfaceState(string currentName, string currentJob, string currentJobIconId)
         {
-            Icons = icons;
             CurrentName = currentName;
             CurrentJob = currentJob;
             CurrentJobIconId = currentJobIconId;
@@ -64,9 +62,9 @@ public AgentIDCardJobChangedMessage(string job)
     [Serializable, NetSerializable]
     public sealed class AgentIDCardJobIconChangedMessage : BoundUserInterfaceMessage
     {
-        public ProtoId<StatusIconPrototype> JobIconId { get; }
+        public ProtoId<JobIconPrototype> JobIconId { get; }
 
-        public AgentIDCardJobIconChangedMessage(ProtoId<StatusIconPrototype> jobIconId)
+        public AgentIDCardJobIconChangedMessage(ProtoId<JobIconPrototype> jobIconId)
         {
             JobIconId = jobIconId;
         }
diff --git a/Content.Shared/Access/Systems/AccessToggleSystem.cs b/Content.Shared/Access/Systems/AccessToggleSystem.cs
new file mode 100644
index 00000000000..564aca06812
--- /dev/null
+++ b/Content.Shared/Access/Systems/AccessToggleSystem.cs
@@ -0,0 +1,21 @@
+using Content.Shared.Access.Components;
+using Content.Shared.Item.ItemToggle.Components;
+
+namespace Content.Shared.Access.Systems;
+
+public sealed class AccessToggleSystem : EntitySystem
+{
+    [Dependency] private readonly SharedAccessSystem _access = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<AccessToggleComponent, ItemToggledEvent>(OnToggled);
+    }
+
+    private void OnToggled(Entity<AccessToggleComponent> ent, ref ItemToggledEvent args)
+    {
+        _access.SetAccessEnabled(ent, args.Activated);
+    }
+}
diff --git a/Content.Shared/Access/Systems/IdExaminableSystem.cs b/Content.Shared/Access/Systems/IdExaminableSystem.cs
index 333272e27ac..13359adcba2 100644
--- a/Content.Shared/Access/Systems/IdExaminableSystem.cs
+++ b/Content.Shared/Access/Systems/IdExaminableSystem.cs
@@ -27,7 +27,8 @@ private void OnGetExamineVerbs(EntityUid uid, IdExaminableComponent component, G
         {
             Act = () =>
             {
-                var markup = FormattedMessage.FromMarkup(info);
+                var markup = FormattedMessage.FromMarkupOrThrow(info);
+
                 _examineSystem.SendExamineTooltip(args.User, uid, markup, false, false);
             },
             Text = Loc.GetString("id-examinable-component-verb-text"),
diff --git a/Content.Shared/Access/Systems/SharedIdCardSystem.cs b/Content.Shared/Access/Systems/SharedIdCardSystem.cs
index bfde70f5041..762c146f36f 100644
--- a/Content.Shared/Access/Systems/SharedIdCardSystem.cs
+++ b/Content.Shared/Access/Systems/SharedIdCardSystem.cs
@@ -114,7 +114,7 @@ public bool TryChangeJobTitle(EntityUid uid, string? jobTitle, IdCardComponent?
         return true;
     }
 
-    public bool TryChangeJobIcon(EntityUid uid, StatusIconPrototype jobIcon, IdCardComponent? id = null, EntityUid? player = null)
+    public bool TryChangeJobIcon(EntityUid uid, JobIconPrototype jobIcon, IdCardComponent? id = null, EntityUid? player = null)
     {
         if (!Resolve(uid, ref id))
         {
diff --git a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
index 005c7dc78ec..afa1e19eade 100644
--- a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
+++ b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
@@ -120,7 +120,13 @@ public bool CanThrow(EntityUid user, EntityUid itemUid)
             var ev = new ThrowAttemptEvent(user, itemUid);
             RaiseLocalEvent(user, ev);
 
-            return !ev.Cancelled;
+            if (ev.Cancelled)
+                return false;
+
+            var itemEv = new ThrowItemAttemptEvent(user);
+            RaiseLocalEvent(itemUid, ref itemEv);
+
+            return !itemEv.Cancelled;
         }
 
         public bool CanSpeak(EntityUid uid)
diff --git a/Content.Shared/Actions/ActionContainerSystem.cs b/Content.Shared/Actions/ActionContainerSystem.cs
index 1c5a3ba0d93..1a83cf38e51 100644
--- a/Content.Shared/Actions/ActionContainerSystem.cs
+++ b/Content.Shared/Actions/ActionContainerSystem.cs
@@ -261,7 +261,7 @@ public void RemoveAction(EntityUid actionId, BaseActionComponent? action = null)
         if (action.Container == null)
             return;
 
-        _transform.DetachParentToNull(actionId, Transform(actionId));
+        _transform.DetachEntity(actionId, Transform(actionId));
 
         // Container removal events should have removed the action from the action container.
         // However, just in case the container was already deleted we will still manually clear the container field
diff --git a/Content.Shared/Actions/ActionEvents.cs b/Content.Shared/Actions/ActionEvents.cs
index 6cc50bc21b4..4f1cd6da44a 100644
--- a/Content.Shared/Actions/ActionEvents.cs
+++ b/Content.Shared/Actions/ActionEvents.cs
@@ -101,6 +101,13 @@ public RequestPerformActionEvent(NetEntity action, NetCoordinates entityCoordina
         Action = action;
         EntityCoordinatesTarget = entityCoordinatesTarget;
     }
+
+    public RequestPerformActionEvent(NetEntity action, NetEntity entityTarget, NetCoordinates entityCoordinatesTarget)
+    {
+        Action = action;
+        EntityTarget = entityTarget;
+        EntityCoordinatesTarget = entityCoordinatesTarget;
+    }
 }
 
 /// <summary>
@@ -144,6 +151,27 @@ public abstract partial class WorldTargetActionEvent : BaseActionEvent
     public EntityCoordinates Target;
 }
 
+/// <summary>
+///     This is the type of event that gets raised when an <see cref="EntityWorldTargetActionComponent"/> is performed.
+///     The <see cref="BaseActionEvent.Performer"/>, <see cref="Entity"/>, and <see cref="Coords"/>
+///     fields will automatically be filled out by the <see cref="SharedActionsSystem"/>.
+/// </summary>
+/// <remarks>
+///     To define a new action for some system, you need to create an event that inherits from this class.
+/// </remarks>
+public abstract partial class EntityWorldTargetActionEvent : BaseActionEvent
+{
+    /// <summary>
+    ///     The entity that the user targeted.
+    /// </summary>
+    public EntityUid? Entity;
+
+    /// <summary>
+    ///     The coordinates of the location that the user targeted.
+    /// </summary>
+    public EntityCoordinates? Coords;
+}
+
 /// <summary>
 ///     Base class for events that are raised when an action gets performed. This should not generally be used outside of the action
 ///     system.
diff --git a/Content.Shared/Actions/EntityTargetActionComponent.cs b/Content.Shared/Actions/EntityTargetActionComponent.cs
index 9024f42e0e7..7217794b23b 100644
--- a/Content.Shared/Actions/EntityTargetActionComponent.cs
+++ b/Content.Shared/Actions/EntityTargetActionComponent.cs
@@ -4,6 +4,9 @@
 
 namespace Content.Shared.Actions;
 
+/// <summary>
+/// Used on action entities to define an action that triggers when targeting an entity.
+/// </summary>
 [RegisterComponent, NetworkedComponent]
 public sealed partial class EntityTargetActionComponent : BaseTargetActionComponent
 {
@@ -16,8 +19,15 @@ public sealed partial class EntityTargetActionComponent : BaseTargetActionCompon
     [NonSerialized]
     public EntityTargetActionEvent? Event;
 
+    /// <summary>
+    /// Determines which entities are valid targets for this action.
+    /// </summary>
+    /// <remarks>No whitelist check when null.</remarks>
     [DataField("whitelist")] public EntityWhitelist? Whitelist;
 
+    /// <summary>
+    /// Whether this action considers the user as a valid target entity when using this action.
+    /// </summary>
     [DataField("canTargetSelf")] public bool CanTargetSelf = true;
 }
 
diff --git a/Content.Shared/Actions/EntityWorldTargetActionComponent.cs b/Content.Shared/Actions/EntityWorldTargetActionComponent.cs
new file mode 100644
index 00000000000..3cfa60d030a
--- /dev/null
+++ b/Content.Shared/Actions/EntityWorldTargetActionComponent.cs
@@ -0,0 +1,42 @@
+using Content.Shared.Whitelist;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Actions;
+
+/// <summary>
+/// Used on action entities to define an action that triggers when targeting an entity or entity coordinates.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class EntityWorldTargetActionComponent : BaseTargetActionComponent
+{
+    public override BaseActionEvent? BaseEvent => Event;
+
+    /// <summary>
+    ///     The local-event to raise when this action is performed.
+    /// </summary>
+    [DataField]
+    [NonSerialized]
+    public EntityWorldTargetActionEvent? Event;
+
+    /// <summary>
+    /// Determines which entities are valid targets for this action.
+    /// </summary>
+    /// <remarks>No whitelist check when null.</remarks>
+    [DataField] public EntityWhitelist? Whitelist;
+
+    /// <summary>
+    /// Whether this action considers the user as a valid target entity when using this action.
+    /// </summary>
+    [DataField] public bool CanTargetSelf = true;
+}
+
+[Serializable, NetSerializable]
+public sealed class EntityWorldTargetActionComponentState(
+    EntityWorldTargetActionComponent component,
+    IEntityManager entManager)
+    : BaseActionComponentState(component, entManager)
+{
+    public EntityWhitelist? Whitelist = component.Whitelist;
+    public bool CanTargetSelf = component.CanTargetSelf;
+}
diff --git a/Content.Shared/Actions/Events/ValidateActionEntityWorldTargetEvent.cs b/Content.Shared/Actions/Events/ValidateActionEntityWorldTargetEvent.cs
new file mode 100644
index 00000000000..57c47026be0
--- /dev/null
+++ b/Content.Shared/Actions/Events/ValidateActionEntityWorldTargetEvent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.Map;
+
+namespace Content.Shared.Actions.Events;
+
+[ByRefEvent]
+public record struct ValidateActionEntityWorldTargetEvent(
+    EntityUid User,
+    EntityUid? Target,
+    EntityCoordinates? Coords,
+    bool Cancelled = false);
diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs
index 0e302f1e028..635d78b8dd9 100644
--- a/Content.Shared/Actions/SharedActionsSystem.cs
+++ b/Content.Shared/Actions/SharedActionsSystem.cs
@@ -25,7 +25,6 @@ public abstract class SharedActionsSystem : EntitySystem
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
     [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
     [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
-    [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
     [Dependency] private readonly RotateToFaceSystem _rotateToFaceSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
@@ -39,10 +38,12 @@ public override void Initialize()
         SubscribeLocalEvent<InstantActionComponent, MapInitEvent>(OnActionMapInit);
         SubscribeLocalEvent<EntityTargetActionComponent, MapInitEvent>(OnActionMapInit);
         SubscribeLocalEvent<WorldTargetActionComponent, MapInitEvent>(OnActionMapInit);
+        SubscribeLocalEvent<EntityWorldTargetActionComponent, MapInitEvent>(OnActionMapInit);
 
         SubscribeLocalEvent<InstantActionComponent, ComponentShutdown>(OnActionShutdown);
         SubscribeLocalEvent<EntityTargetActionComponent, ComponentShutdown>(OnActionShutdown);
         SubscribeLocalEvent<WorldTargetActionComponent, ComponentShutdown>(OnActionShutdown);
+        SubscribeLocalEvent<EntityWorldTargetActionComponent, ComponentShutdown>(OnActionShutdown);
 
         SubscribeLocalEvent<ActionsComponent, DidEquipEvent>(OnDidEquip);
         SubscribeLocalEvent<ActionsComponent, DidEquipHandEvent>(OnHandEquipped);
@@ -57,10 +58,12 @@ public override void Initialize()
         SubscribeLocalEvent<InstantActionComponent, ComponentGetState>(OnInstantGetState);
         SubscribeLocalEvent<EntityTargetActionComponent, ComponentGetState>(OnEntityTargetGetState);
         SubscribeLocalEvent<WorldTargetActionComponent, ComponentGetState>(OnWorldTargetGetState);
+        SubscribeLocalEvent<EntityWorldTargetActionComponent, ComponentGetState>(OnEntityWorldTargetGetState);
 
         SubscribeLocalEvent<InstantActionComponent, GetActionDataEvent>(OnGetActionData);
         SubscribeLocalEvent<EntityTargetActionComponent, GetActionDataEvent>(OnGetActionData);
         SubscribeLocalEvent<WorldTargetActionComponent, GetActionDataEvent>(OnGetActionData);
+        SubscribeLocalEvent<EntityWorldTargetActionComponent, GetActionDataEvent>(OnGetActionData);
 
         SubscribeAllEvent<RequestPerformActionEvent>(OnActionRequest);
     }
@@ -103,6 +106,11 @@ private void OnWorldTargetGetState(EntityUid uid, WorldTargetActionComponent com
         args.State = new WorldTargetActionComponentState(component, EntityManager);
     }
 
+    private void OnEntityWorldTargetGetState(EntityUid uid, EntityWorldTargetActionComponent component, ref ComponentGetState args)
+    {
+        args.State = new EntityWorldTargetActionComponentState(component, EntityManager);
+    }
+
     private void OnGetActionData<T>(EntityUid uid, T component, ref GetActionDataEvent args) where T : BaseActionComponent
     {
         args.Action = component;
@@ -238,7 +246,7 @@ private void OnRejuventate(EntityUid uid, ActionsComponent component, Rejuvenate
     }
 
     #region ComponentStateManagement
-    protected virtual void UpdateAction(EntityUid? actionId, BaseActionComponent? action = null)
+    public virtual void UpdateAction(EntityUid? actionId, BaseActionComponent? action = null)
     {
         // See client-side code.
     }
@@ -427,7 +435,7 @@ private void OnActionRequest(RequestPerformActionEvent ev, EntitySessionEventArg
                 }
 
                 var entityCoordinatesTarget = GetCoordinates(netCoordinatesTarget);
-                _rotateToFaceSystem.TryFaceCoordinates(user, entityCoordinatesTarget.ToMapPos(EntityManager, _transformSystem));
+                _rotateToFaceSystem.TryFaceCoordinates(user, _transformSystem.ToMapCoordinates(entityCoordinatesTarget).Position);
 
                 if (!ValidateWorldTarget(user, entityCoordinatesTarget, (actionEnt, worldAction)))
                     return;
@@ -443,6 +451,34 @@ private void OnActionRequest(RequestPerformActionEvent ev, EntitySessionEventArg
                 }
 
                 break;
+            case EntityWorldTargetActionComponent entityWorldAction:
+            {
+                var actionEntity = GetEntity(ev.EntityTarget);
+                var actionCoords = GetCoordinates(ev.EntityCoordinatesTarget);
+
+                if (actionEntity is null && actionCoords is null)
+                {
+                    Log.Error($"Attempted to perform an entity-world-targeted action without an entity or world coordinates! Action: {name}");
+                    return;
+                }
+
+                var entWorldAction = new Entity<EntityWorldTargetActionComponent>(actionEnt, entityWorldAction);
+
+                if (!ValidateEntityWorldTarget(user, actionEntity, actionCoords, entWorldAction))
+                    return;
+
+                _adminLogger.Add(LogType.Action,
+                    $"{ToPrettyString(user):user} is performing the {name:action} action (provided by {ToPrettyString(action.Container ?? user):provider}) targeted at {ToPrettyString(actionEntity):target} {actionCoords:target}.");
+
+                if (entityWorldAction.Event != null)
+                {
+                    entityWorldAction.Event.Entity = actionEntity;
+                    entityWorldAction.Event.Coords = actionCoords;
+                    Dirty(actionEnt, entityWorldAction);
+                    performEvent = entityWorldAction.Event;
+                }
+                break;
+            }
             case InstantActionComponent instantAction:
                 if (action.CheckCanInteract && !_actionBlockerSystem.CanInteract(user, null))
                     return;
@@ -466,7 +502,14 @@ private void OnActionRequest(RequestPerformActionEvent ev, EntitySessionEventArg
 
     public bool ValidateEntityTarget(EntityUid user, EntityUid target, Entity<EntityTargetActionComponent> actionEnt)
     {
-        if (!ValidateEntityTargetBase(user, target, actionEnt))
+        var comp = actionEnt.Comp;
+        if (!ValidateEntityTargetBase(user,
+                target,
+                comp.Whitelist,
+                comp.CheckCanInteract,
+                comp.CanTargetSelf,
+                comp.CheckCanAccess,
+                comp.Range))
             return false;
 
         var ev = new ValidateActionEntityTargetEvent(user, target);
@@ -474,21 +517,27 @@ public bool ValidateEntityTarget(EntityUid user, EntityUid target, Entity<Entity
         return !ev.Cancelled;
     }
 
-    private bool ValidateEntityTargetBase(EntityUid user, EntityUid target, EntityTargetActionComponent action)
+    private bool ValidateEntityTargetBase(EntityUid user,
+        EntityUid? targetEntity,
+        EntityWhitelist? whitelist,
+        bool checkCanInteract,
+        bool canTargetSelf,
+        bool checkCanAccess,
+        float range)
     {
-        if (!target.IsValid() || Deleted(target))
+        if (targetEntity is not { } target || !target.IsValid() || Deleted(target))
             return false;
 
-        if (_whitelistSystem.IsWhitelistFail(action.Whitelist, target))
+        if (_whitelistSystem.IsWhitelistFail(whitelist, target))
             return false;
 
-        if (action.CheckCanInteract && !_actionBlockerSystem.CanInteract(user, target))
+        if (checkCanInteract && !_actionBlockerSystem.CanInteract(user, target))
             return false;
 
         if (user == target)
-            return action.CanTargetSelf;
+            return canTargetSelf;
 
-        if (!action.CheckCanAccess)
+        if (!checkCanAccess)
         {
             // even if we don't check for obstructions, we may still need to check the range.
             var xform = Transform(user);
@@ -497,19 +546,20 @@ private bool ValidateEntityTargetBase(EntityUid user, EntityUid target, EntityTa
             if (xform.MapID != targetXform.MapID)
                 return false;
 
-            if (action.Range <= 0)
+            if (range <= 0)
                 return true;
 
             var distance = (_transformSystem.GetWorldPosition(xform) - _transformSystem.GetWorldPosition(targetXform)).Length();
-            return distance <= action.Range;
+            return distance <= range;
         }
 
-        return _interactionSystem.InRangeAndAccessible(user, target, range: action.Range);
+        return _interactionSystem.InRangeAndAccessible(user, target, range: range);
     }
 
     public bool ValidateWorldTarget(EntityUid user, EntityCoordinates coords, Entity<WorldTargetActionComponent> action)
     {
-        if (!ValidateWorldTargetBase(user, coords, action))
+        var comp = action.Comp;
+        if (!ValidateWorldTargetBase(user, coords, comp.CheckCanInteract, comp.CheckCanAccess, comp.Range))
             return false;
 
         var ev = new ValidateActionWorldTargetEvent(user, coords);
@@ -517,12 +567,19 @@ public bool ValidateWorldTarget(EntityUid user, EntityCoordinates coords, Entity
         return !ev.Cancelled;
     }
 
-    private bool ValidateWorldTargetBase(EntityUid user, EntityCoordinates coords, WorldTargetActionComponent action)
+    private bool ValidateWorldTargetBase(EntityUid user,
+        EntityCoordinates? entityCoordinates,
+        bool checkCanInteract,
+        bool checkCanAccess,
+        float range)
     {
-        if (action.CheckCanInteract && !_actionBlockerSystem.CanInteract(user, null))
+        if (entityCoordinates is not { } coords)
+            return false;
+
+        if (checkCanInteract && !_actionBlockerSystem.CanInteract(user, null))
             return false;
 
-        if (!action.CheckCanAccess)
+        if (!checkCanAccess)
         {
             // even if we don't check for obstructions, we may still need to check the range.
             var xform = Transform(user);
@@ -530,13 +587,40 @@ private bool ValidateWorldTargetBase(EntityUid user, EntityCoordinates coords, W
             if (xform.MapID != coords.GetMapId(EntityManager))
                 return false;
 
-            if (action.Range <= 0)
+            if (range <= 0)
                 return true;
 
-            return coords.InRange(EntityManager, _transformSystem, Transform(user).Coordinates, action.Range);
+            return coords.InRange(EntityManager, _transformSystem, Transform(user).Coordinates, range);
         }
 
-        return _interactionSystem.InRangeUnobstructed(user, coords, range: action.Range);
+        return _interactionSystem.InRangeUnobstructed(user, coords, range: range);
+    }
+
+    public bool ValidateEntityWorldTarget(EntityUid user,
+        EntityUid? entity,
+        EntityCoordinates? coords,
+        Entity<EntityWorldTargetActionComponent> action)
+    {
+        var comp = action.Comp;
+        var entityValidated = ValidateEntityTargetBase(user,
+            entity,
+            comp.Whitelist,
+            comp.CheckCanInteract,
+            comp.CanTargetSelf,
+            comp.CheckCanAccess,
+            comp.Range);
+
+        var worldValidated
+            = ValidateWorldTargetBase(user, coords, comp.CheckCanInteract, comp.CheckCanAccess, comp.Range);
+
+        if (!entityValidated && !worldValidated)
+            return false;
+
+        var ev = new ValidateActionEntityWorldTargetEvent(user,
+            entityValidated ? entity : null,
+            worldValidated ? coords : null);
+        RaiseLocalEvent(action, ref ev);
+        return !ev.Cancelled;
     }
 
     public void PerformAction(EntityUid performer, ActionsComponent? component, EntityUid actionId, BaseActionComponent action, BaseActionEvent? actionEvent, TimeSpan curTime, bool predicted = true)
diff --git a/Content.Shared/Actions/WorldTargetActionComponent.cs b/Content.Shared/Actions/WorldTargetActionComponent.cs
index 4974b4478db..8066a640349 100644
--- a/Content.Shared/Actions/WorldTargetActionComponent.cs
+++ b/Content.Shared/Actions/WorldTargetActionComponent.cs
@@ -3,6 +3,9 @@
 
 namespace Content.Shared.Actions;
 
+/// <summary>
+/// Used on action entities to define an action that triggers when targeting an entity coordinate.
+/// </summary>
 [RegisterComponent, NetworkedComponent]
 public sealed partial class WorldTargetActionComponent : BaseTargetActionComponent
 {
diff --git a/Content.Shared/Administration/PlayerInfo.cs b/Content.Shared/Administration/PlayerInfo.cs
index 93f1aa0b393..ed54d57bbef 100644
--- a/Content.Shared/Administration/PlayerInfo.cs
+++ b/Content.Shared/Administration/PlayerInfo.cs
@@ -18,6 +18,8 @@ public sealed record PlayerInfo(
     {
         private string? _playtimeString;
 
+        public bool IsPinned { get; set; }
+
         public string PlaytimeString => _playtimeString ??=
             OverallPlaytime?.ToString("%d':'hh':'mm") ?? Loc.GetString("generic-unknown-title");
 
diff --git a/Content.Shared/Administration/PlayerPanelEuiState.cs b/Content.Shared/Administration/PlayerPanelEuiState.cs
new file mode 100644
index 00000000000..186b992e4ef
--- /dev/null
+++ b/Content.Shared/Administration/PlayerPanelEuiState.cs
@@ -0,0 +1,54 @@
+using Content.Shared.Eui;
+using Robust.Shared.Network;
+using Robust.Shared.Serialization;
+using YamlDotNet.Serialization.Callbacks;
+
+namespace Content.Shared.Administration;
+
+[Serializable, NetSerializable]
+public sealed class PlayerPanelEuiState(NetUserId guid,
+    string username,
+    TimeSpan playtime,
+    int? totalNotes,
+    int? totalBans,
+    int? totalRoleBans,
+    int sharedConnections,
+    bool? whitelisted,
+    bool canFreeze,
+    bool frozen,
+    bool canAhelp)
+    : EuiStateBase
+{
+    public readonly NetUserId Guid = guid;
+    public readonly string Username = username;
+    public readonly TimeSpan Playtime = playtime;
+    public readonly int? TotalNotes = totalNotes;
+    public readonly int? TotalBans = totalBans;
+    public readonly int? TotalRoleBans = totalRoleBans;
+    public readonly int SharedConnections = sharedConnections;
+    public readonly bool? Whitelisted = whitelisted;
+    public readonly bool CanFreeze = canFreeze;
+    public readonly bool Frozen = frozen;
+    public readonly bool CanAhelp = canAhelp;
+}
+
+
+[Serializable, NetSerializable]
+public sealed class PlayerPanelFreezeMessage : EuiMessageBase
+{
+    public readonly bool Mute;
+
+    public PlayerPanelFreezeMessage(bool mute = false)
+    {
+        Mute = mute;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class PlayerPanelLogsMessage : EuiMessageBase;
+
+[Serializable, NetSerializable]
+public sealed class PlayerPanelDeleteMessage : EuiMessageBase;
+
+[Serializable, NetSerializable]
+public sealed class PlayerPanelRejuvenationMessage: EuiMessageBase;
diff --git a/Content.Shared/Alert/AlertPrototype.cs b/Content.Shared/Alert/AlertPrototype.cs
index f53da27c0de..a82cbd3daf6 100644
--- a/Content.Shared/Alert/AlertPrototype.cs
+++ b/Content.Shared/Alert/AlertPrototype.cs
@@ -76,11 +76,11 @@ public sealed partial class AlertPrototype : IPrototype
     public bool SupportsSeverity => MaxSeverity != -1;
 
     /// <summary>
-    /// Defines what to do when the alert is clicked.
-    /// This will always be null on clientside.
+    /// Event raised on the user when they click on this alert.
+    /// Can be null.
     /// </summary>
-    [DataField(serverOnly: true)]
-    public IAlertClick? OnClick { get; private set; }
+    [DataField]
+    public BaseAlertEvent? ClickEvent;
 
     /// <param name="severity">severity level, if supported by this alert</param>
     /// <returns>the icon path to the texture for the provided severity level</returns>
@@ -114,3 +114,17 @@ public SpriteSpecifier GetIcon(short? severity = null)
         return Icons[severity.Value - _minSeverity];
     }
 }
+
+[ImplicitDataDefinitionForInheritors]
+public abstract partial class BaseAlertEvent : HandledEntityEventArgs
+{
+    public EntityUid User;
+
+    public ProtoId<AlertPrototype> AlertId;
+
+    protected BaseAlertEvent(EntityUid user, ProtoId<AlertPrototype> alertId)
+    {
+        User = user;
+        AlertId = alertId;
+    }
+}
diff --git a/Content.Shared/Alert/AlertsSystem.cs b/Content.Shared/Alert/AlertsSystem.cs
index 83c6fcd0dd7..c8f2a8e6bca 100644
--- a/Content.Shared/Alert/AlertsSystem.cs
+++ b/Content.Shared/Alert/AlertsSystem.cs
@@ -195,7 +195,7 @@ public override void Initialize()
 
         SubscribeLocalEvent<AlertAutoRemoveComponent, EntityUnpausedEvent>(OnAutoRemoveUnPaused);
 
-        SubscribeNetworkEvent<ClickAlertEvent>(HandleClickAlert);
+        SubscribeAllEvent<ClickAlertEvent>(HandleClickAlert);
         SubscribeLocalEvent<PrototypesReloadedEventArgs>(HandlePrototypesReloaded);
         LoadPrototypes();
     }
@@ -328,7 +328,20 @@ private void HandleClickAlert(ClickAlertEvent msg, EntitySessionEventArgs args)
             return;
         }
 
-        alert.OnClick?.AlertClicked(player.Value);
+        ActivateAlert(player.Value, alert);
+    }
+
+    public bool ActivateAlert(EntityUid user, AlertPrototype alert)
+    {
+        if (alert.ClickEvent is not { } clickEvent)
+            return false;
+
+        clickEvent.Handled = false;
+        clickEvent.User = user;
+        clickEvent.AlertId = alert.ID;
+
+        RaiseLocalEvent(user, (object) clickEvent, true);
+        return clickEvent.Handled;
     }
 
     private void OnPlayerAttached(EntityUid uid, AlertsComponent component, PlayerAttachedEvent args)
diff --git a/Content.Shared/Alert/IAlertClick.cs b/Content.Shared/Alert/IAlertClick.cs
deleted file mode 100644
index c11fc10c0d7..00000000000
--- a/Content.Shared/Alert/IAlertClick.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace Content.Shared.Alert
-{
-    /// <summary>
-    /// Defines what should happen when an alert is clicked.
-    /// </summary>
-    public interface IAlertClick
-    {
-        /// <summary>
-        /// Invoked on server side when user clicks an alert.
-        /// </summary>
-        /// <param name="player"></param>
-        void AlertClicked(EntityUid player);
-    }
-}
diff --git a/Content.Shared/Ame/Components/AmeFuelContainerComponent.cs b/Content.Shared/Ame/Components/AmeFuelContainerComponent.cs
index 757a3a515b6..455414597e5 100644
--- a/Content.Shared/Ame/Components/AmeFuelContainerComponent.cs
+++ b/Content.Shared/Ame/Components/AmeFuelContainerComponent.cs
@@ -9,11 +9,11 @@ public sealed partial class AmeFuelContainerComponent : Component
     /// The amount of fuel in the container.
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
-    public int FuelAmount = 1000;
+    public int FuelAmount = 500;
 
     /// <summary>
     /// The maximum fuel capacity of the container.
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
-    public int FuelCapacity = 1000;
+    public int FuelCapacity = 500;
 }
diff --git a/Content.Shared/Anomaly/Components/AnomalyComponent.cs b/Content.Shared/Anomaly/Components/AnomalyComponent.cs
index 88e942ec507..724dfd38d2f 100644
--- a/Content.Shared/Anomaly/Components/AnomalyComponent.cs
+++ b/Content.Shared/Anomaly/Components/AnomalyComponent.cs
@@ -202,20 +202,6 @@ public sealed partial class AnomalyComponent : Component
     public float GrowingPointMultiplier = 1.5f;
     #endregion
 
-    /// <summary>
-    /// The amount of damage dealt when either a player touches the anomaly
-    /// directly or by hitting the anomaly.
-    /// </summary>
-    [DataField(required: true)]
-    public DamageSpecifier AnomalyContactDamage = default!;
-
-    /// <summary>
-    /// The sound effect played when a player
-    /// burns themselves on an anomaly via contact.
-    /// </summary>
-    [DataField]
-    public SoundSpecifier AnomalyContactDamageSound = new SoundPathSpecifier("/Audio/Effects/lightburn.ogg");
-
     /// <summary>
     /// A prototype entity that appears when an anomaly supercrit collapse.
     /// </summary>
diff --git a/Content.Shared/Anomaly/SharedAnomalySystem.cs b/Content.Shared/Anomaly/SharedAnomalySystem.cs
index da1d31c6ff6..c3d6591b725 100644
--- a/Content.Shared/Anomaly/SharedAnomalySystem.cs
+++ b/Content.Shared/Anomaly/SharedAnomalySystem.cs
@@ -30,7 +30,6 @@ public abstract class SharedAnomalySystem : EntitySystem
     [Dependency] private readonly INetManager _net = default!;
     [Dependency] protected readonly IRobustRandom Random = 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!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
@@ -42,26 +41,10 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<AnomalyComponent, InteractHandEvent>(OnInteractHand);
-        SubscribeLocalEvent<AnomalyComponent, AttackedEvent>(OnAttacked);
         SubscribeLocalEvent<AnomalyComponent, MeleeThrowOnHitStartEvent>(OnAnomalyThrowStart);
         SubscribeLocalEvent<AnomalyComponent, MeleeThrowOnHitEndEvent>(OnAnomalyThrowEnd);
     }
 
-    private void OnInteractHand(EntityUid uid, AnomalyComponent component, InteractHandEvent args)
-    {
-        DoAnomalyBurnDamage(uid, args.User, component);
-        args.Handled = true;
-    }
-
-    private void OnAttacked(EntityUid uid, AnomalyComponent component, AttackedEvent args)
-    {
-        if (HasComp<CorePoweredThrowerComponent>(args.Used))
-            return;
-
-        DoAnomalyBurnDamage(uid, args.User, component);
-    }
-
     private void OnAnomalyThrowStart(Entity<AnomalyComponent> ent, ref MeleeThrowOnHitStartEvent args)
     {
         if (!TryComp<CorePoweredThrowerComponent>(args.Used, out var corePowered) || !TryComp<PhysicsComponent>(ent, out var body))
@@ -75,15 +58,6 @@ private void OnAnomalyThrowEnd(Entity<AnomalyComponent> ent, ref MeleeThrowOnHit
         _physics.SetBodyType(ent, BodyType.Static);
     }
 
-    public void DoAnomalyBurnDamage(EntityUid source, EntityUid target, AnomalyComponent component)
-    {
-        _damageable.TryChangeDamage(target, component.AnomalyContactDamage, true);
-        if (!Timing.IsFirstTimePredicted || _net.IsServer)
-            return;
-        Audio.PlayPvs(component.AnomalyContactDamageSound, source);
-        Popup.PopupEntity(Loc.GetString("anomaly-component-contact-damage"), target, target);
-    }
-
     public void DoAnomalyPulse(EntityUid uid, AnomalyComponent? component = null)
     {
         if (!Resolve(uid, ref component))
diff --git a/Content.Shared/Atmos/Components/ExtinguishOnInteractComponent.cs b/Content.Shared/Atmos/Components/ExtinguishOnInteractComponent.cs
index 02c1e3eb264..cd3ecdd1c49 100644
--- a/Content.Shared/Atmos/Components/ExtinguishOnInteractComponent.cs
+++ b/Content.Shared/Atmos/Components/ExtinguishOnInteractComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Alert;
 using Robust.Shared.Audio;
 
 namespace Content.Shared.Atmos.Components;
@@ -27,3 +28,5 @@ public sealed partial class ExtinguishOnInteractComponent : Component
     [DataField]
     public LocId ExtinguishFailed = "candle-extinguish-failed";
 }
+
+public sealed partial class ResistFireAlertEvent : BaseAlertEvent;
diff --git a/Content.Shared/Atmos/Components/GasMinerComponent.cs b/Content.Shared/Atmos/Components/GasMinerComponent.cs
new file mode 100644
index 00000000000..43f30327705
--- /dev/null
+++ b/Content.Shared/Atmos/Components/GasMinerComponent.cs
@@ -0,0 +1,60 @@
+using Robust.Shared.Serialization;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Atmos.Components;
+
+[NetworkedComponent]
+[AutoGenerateComponentState]
+[RegisterComponent]
+public sealed partial class GasMinerComponent : Component
+{
+    /// <summary>
+    ///     Operational state of the miner.
+    /// </summary>
+    [AutoNetworkedField]
+    [ViewVariables(VVAccess.ReadOnly)]
+    public GasMinerState MinerState = GasMinerState.Disabled;
+
+    /// <summary>
+    ///      If the number of moles in the external environment exceeds this number, no gas will be mined.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
+    public float MaxExternalAmount = float.PositiveInfinity;
+
+    /// <summary>
+    ///      If the pressure (in kPA) of the external environment exceeds this number, no gas will be mined.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
+    public float MaxExternalPressure = Atmospherics.GasMinerDefaultMaxExternalPressure;
+
+    /// <summary>
+    ///     Gas to spawn.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField(required: true)]
+    public Gas SpawnGas;
+
+    /// <summary>
+    ///     Temperature in Kelvin.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
+    public float SpawnTemperature = Atmospherics.T20C;
+
+    /// <summary>
+    ///     Number of moles created per second when the miner is working.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
+    public float SpawnAmount = Atmospherics.MolesCellStandard * 20f;
+}
+
+[Serializable, NetSerializable]
+public enum GasMinerState : byte
+{
+    Disabled,
+    Idle,
+    Working,
+}
diff --git a/Content.Shared/Atmos/EntitySystems/SharedGasMinerSystem.cs b/Content.Shared/Atmos/EntitySystems/SharedGasMinerSystem.cs
new file mode 100644
index 00000000000..957ff6fde4b
--- /dev/null
+++ b/Content.Shared/Atmos/EntitySystems/SharedGasMinerSystem.cs
@@ -0,0 +1,55 @@
+using Content.Shared.Atmos.Components;
+using Content.Shared.Examine;
+using Content.Shared.Temperature;
+
+namespace Content.Shared.Atmos.EntitySystems;
+
+public abstract class SharedGasMinerSystem : EntitySystem
+{
+    [Dependency] private readonly SharedAtmosphereSystem _sharedAtmosphereSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<GasMinerComponent, ExaminedEvent>(OnExamine);
+    }
+
+    private void OnExamine(Entity<GasMinerComponent> ent, ref ExaminedEvent args)
+    {
+        var component = ent.Comp;
+
+        using (args.PushGroup(nameof(GasMinerComponent)))
+        {
+            args.PushMarkup(Loc.GetString("gas-miner-mines-text",
+                ("gas", Loc.GetString(_sharedAtmosphereSystem.GetGas(component.SpawnGas).Name))));
+
+            args.PushText(Loc.GetString("gas-miner-amount-text",
+                ("moles", $"{component.SpawnAmount:0.#}")));
+
+            args.PushText(Loc.GetString("gas-miner-temperature-text",
+                ("tempK", $"{component.SpawnTemperature:0.#}"),
+                ("tempC", $"{TemperatureHelpers.KelvinToCelsius(component.SpawnTemperature):0.#}")));
+
+            if (component.MaxExternalAmount < float.PositiveInfinity)
+            {
+                args.PushText(Loc.GetString("gas-miner-moles-cutoff-text",
+                    ("moles", $"{component.MaxExternalAmount:0.#}")));
+            }
+
+            if (component.MaxExternalPressure < float.PositiveInfinity)
+            {
+                args.PushText(Loc.GetString("gas-miner-pressure-cutoff-text",
+                    ("pressure", $"{component.MaxExternalPressure:0.#}")));
+            }
+
+            args.AddMarkup(component.MinerState switch
+            {
+                GasMinerState.Disabled => Loc.GetString("gas-miner-state-disabled-text"),
+                GasMinerState.Idle => Loc.GetString("gas-miner-state-idle-text"),
+                GasMinerState.Working => Loc.GetString("gas-miner-state-working-text"),
+                // C# pattern matching is not exhaustive for enums
+                _ => throw new IndexOutOfRangeException(nameof(component.MinerState)),
+            });
+        }
+    }
+}
diff --git a/Content.Shared/Audio/AmbientMusicPrototype.cs b/Content.Shared/Audio/AmbientMusicPrototype.cs
index 54f70f57280..219c41527d1 100644
--- a/Content.Shared/Audio/AmbientMusicPrototype.cs
+++ b/Content.Shared/Audio/AmbientMusicPrototype.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Random;
+using Content.Shared.Random.Rules;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
diff --git a/Content.Shared/Bed/Cryostorage/CanEnterCryostorageComponent.cs b/Content.Shared/Bed/Cryostorage/CanEnterCryostorageComponent.cs
new file mode 100644
index 00000000000..2e5b2000558
--- /dev/null
+++ b/Content.Shared/Bed/Cryostorage/CanEnterCryostorageComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Bed.Cryostorage;
+
+/// <summary>
+/// Serves as a whitelist that allows an entity with this component to enter cryostorage.
+/// It will also require MindContainerComponent.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class CanEnterCryostorageComponent : Component { }
diff --git a/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs b/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs
index c3fa21e293e..f6b7a347852 100644
--- a/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs
+++ b/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs
@@ -89,7 +89,7 @@ private void OnInsertAttempt(Entity<CryostorageComponent> ent, ref ContainerIsIn
             return;
         }
 
-        if (!TryComp<MindContainerComponent>(args.EntityUid, out var mindContainer))
+        if (!HasComp<CanEnterCryostorageComponent>(args.EntityUid) || !TryComp<MindContainerComponent>(args.EntityUid, out var mindContainer))
         {
             args.Cancel();
             return;
diff --git a/Content.Shared/Bed/Sleep/SleepingSystem.cs b/Content.Shared/Bed/Sleep/SleepingSystem.cs
index 581924c053b..648d1b40103 100644
--- a/Content.Shared/Bed/Sleep/SleepingSystem.cs
+++ b/Content.Shared/Bed/Sleep/SleepingSystem.cs
@@ -34,8 +34,8 @@ public sealed partial class SleepingSystem : EntitySystem
     [Dependency] private readonly SharedEmitSoundSystem _emitSound = default!;
     [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
 
-    public static readonly ProtoId<EntityPrototype> SleepActionId = "ActionSleep";
-    public static readonly ProtoId<EntityPrototype> WakeActionId = "ActionWake";
+    public static readonly EntProtoId SleepActionId = "ActionSleep";
+    public static readonly EntProtoId WakeActionId = "ActionWake";
 
     public override void Initialize()
     {
diff --git a/Content.Shared/Beeper/Components/BeeperComponent.cs b/Content.Shared/Beeper/Components/BeeperComponent.cs
index 54d242709c4..f6efbb10f3e 100644
--- a/Content.Shared/Beeper/Components/BeeperComponent.cs
+++ b/Content.Shared/Beeper/Components/BeeperComponent.cs
@@ -10,15 +10,12 @@ namespace Content.Shared.Beeper.Components;
 /// This is used for an item that beeps based on
 /// proximity to a specified component.
 /// </summary>
+/// <remarks>
+/// Requires <c>ItemToggleComponent</c> to control it.
+/// </remarks>
 [RegisterComponent, NetworkedComponent, Access(typeof(BeeperSystem)), AutoGenerateComponentState]
 public sealed partial class BeeperComponent : Component
 {
-    /// <summary>
-    /// Whether or not it's on.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public bool Enabled = true;
-
     /// <summary>
     /// How much to scale the interval by (< 0 = min, > 1 = max)
     /// </summary>
@@ -56,7 +53,7 @@ public sealed partial class BeeperComponent : Component
     /// Is the beep muted
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
-    public bool IsMuted = false;
+    public bool IsMuted;
 
     /// <summary>
     /// The sound played when the locator beeps.
diff --git a/Content.Shared/Beeper/Systems/BeeperSystem.cs b/Content.Shared/Beeper/Systems/BeeperSystem.cs
index c51eef4da9d..a52e19f7552 100644
--- a/Content.Shared/Beeper/Systems/BeeperSystem.cs
+++ b/Content.Shared/Beeper/Systems/BeeperSystem.cs
@@ -1,5 +1,7 @@
 using Content.Shared.Beeper.Components;
 using Content.Shared.FixedPoint;
+using Content.Shared.Item.ItemToggle;
+using Content.Shared.Item.ItemToggle.Components;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Network;
 using Robust.Shared.Timing;
@@ -11,34 +13,20 @@ namespace Content.Shared.Beeper.Systems;
 public sealed class BeeperSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly INetManager _net = default!;
-
-    public override void Initialize()
-    {
-    }
+    [Dependency] private readonly ItemToggleSystem _toggle = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
 
     public override void Update(float frameTime)
     {
-        var query = EntityQueryEnumerator<BeeperComponent>();
-        while (query.MoveNext(out var uid, out var beeper))
+        var query = EntityQueryEnumerator<BeeperComponent, ItemToggleComponent>();
+        while (query.MoveNext(out var uid, out var beeper, out var toggle))
         {
-            if (!beeper.Enabled)
-                continue;
-            RunUpdate_Internal(uid, beeper);
+            if (toggle.Activated)
+                RunUpdate_Internal(uid, beeper);
         }
     }
 
-    public void SetEnable(EntityUid owner, bool isEnabled, BeeperComponent? beeper = null)
-    {
-        if (!Resolve(owner, ref beeper) || beeper.Enabled == isEnabled)
-            return;
-        beeper.Enabled = isEnabled;
-
-        RunUpdate_Internal(owner, beeper);
-        Dirty(owner, beeper);
-    }
-
     public void SetIntervalScaling(EntityUid owner, BeeperComponent beeper, FixedPoint2 newScaling)
     {
         newScaling = FixedPoint2.Clamp(newScaling, 0, 1);
@@ -70,6 +58,7 @@ public void SetMute(EntityUid owner, bool isMuted, BeeperComponent? comp = null)
         if (!Resolve(owner, ref comp))
             return;
         comp.IsMuted = isMuted;
+        Dirty(owner, comp);
     }
 
     private void UpdateBeepInterval(EntityUid owner, BeeperComponent beeper)
@@ -91,19 +80,17 @@ public void ForceUpdate(EntityUid owner, BeeperComponent? beeper = null)
 
     private void RunUpdate_Internal(EntityUid owner, BeeperComponent beeper)
     {
-        if (!beeper.Enabled)
-        {
+        if (!_toggle.IsActivated(owner))
             return;
-        }
+
         UpdateBeepInterval(owner, beeper);
         if (beeper.NextBeep >= _timing.CurTime)
             return;
+
         var beepEvent = new BeepPlayedEvent(beeper.IsMuted);
         RaiseLocalEvent(owner, ref beepEvent);
         if (!beeper.IsMuted && _net.IsServer)
-        {
             _audio.PlayPvs(beeper.BeepSound, owner);
-        }
         beeper.LastBeepTime = _timing.CurTime;
     }
 }
diff --git a/Content.Shared/Beeper/Systems/ProximityBeeperSystem.cs b/Content.Shared/Beeper/Systems/ProximityBeeperSystem.cs
index bd857d4c29b..9830e165e56 100644
--- a/Content.Shared/Beeper/Systems/ProximityBeeperSystem.cs
+++ b/Content.Shared/Beeper/Systems/ProximityBeeperSystem.cs
@@ -1,7 +1,6 @@
 using Content.Shared.Beeper.Components;
-using Content.Shared.Interaction.Events;
+using Content.Shared.Item.ItemToggle;
 using Content.Shared.Pinpointer;
-using Content.Shared.PowerCell;
 using Content.Shared.ProximityDetection;
 using Content.Shared.ProximityDetection.Components;
 using Content.Shared.ProximityDetection.Systems;
@@ -9,20 +8,15 @@
 namespace Content.Shared.Beeper.Systems;
 
 /// <summary>
-/// This handles logic for implementing proximity beeper as a handheld tool />
+/// This handles controlling a beeper from proximity detector events.
 /// </summary>
 public sealed class ProximityBeeperSystem : EntitySystem
 {
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-    [Dependency] private readonly SharedPowerCellSystem _powerCell = default!;
-    [Dependency] private readonly ProximityDetectionSystem _proximity = default!;
     [Dependency] private readonly BeeperSystem _beeper = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
     {
-        SubscribeLocalEvent<ProximityBeeperComponent, UseInHandEvent>(OnUseInHand);
-        SubscribeLocalEvent<ProximityBeeperComponent, PowerCellSlotEmptyEvent>(OnPowerCellSlotEmpty);
         SubscribeLocalEvent<ProximityBeeperComponent, NewProximityTargetEvent>(OnNewProximityTarget);
         SubscribeLocalEvent<ProximityBeeperComponent, ProximityTargetUpdatedEvent>(OnProximityTargetUpdate);
     }
@@ -33,82 +27,16 @@ private void OnProximityTargetUpdate(EntityUid owner, ProximityBeeperComponent p
             return;
         if (args.Target == null)
         {
-            _beeper.SetEnable(owner, false, beeper);
+            _beeper.SetMute(owner, true, beeper);
             return;
         }
-        _beeper.SetIntervalScaling(owner,args.Distance/args.Detector.Range, beeper);
-        _beeper.SetEnable(owner, true, beeper);
-    }
-
-    private void OnNewProximityTarget(EntityUid owner, ProximityBeeperComponent proxBeeper, ref NewProximityTargetEvent args)
-    {
-        _beeper.SetEnable(owner, args.Target != null);
-    }
 
-    private void OnUseInHand(EntityUid uid, ProximityBeeperComponent proxBeeper, UseInHandEvent args)
-    {
-        if (args.Handled)
-            return;
-        args.Handled = TryToggle(uid, proxBeeper, user: args.User);
+        _beeper.SetIntervalScaling(owner, args.Distance / args.Detector.Range, beeper);
+        _beeper.SetMute(owner, false, beeper);
     }
 
-    private void OnPowerCellSlotEmpty(EntityUid uid, ProximityBeeperComponent beeper, ref PowerCellSlotEmptyEvent args)
-    {
-        if (_proximity.GetEnable(uid))
-            TryDisable(uid);
-    }
-    public bool TryEnable(EntityUid owner, BeeperComponent? beeper = null, ProximityDetectorComponent? detector = null,
-        PowerCellDrawComponent? draw = null,EntityUid? user = null)
-    {
-        if (!Resolve(owner, ref beeper, ref detector))
-            return false;
-        if (Resolve(owner, ref draw, false) && !_powerCell.HasActivatableCharge(owner, battery: draw, user: user))
-                return false;
-        Enable(owner, beeper, detector, draw);
-        return true;
-    }
-    private void Enable(EntityUid owner, BeeperComponent beeper,
-        ProximityDetectorComponent detector, PowerCellDrawComponent? draw)
-    {
-        _proximity.SetEnable(owner, true, detector);
-        _appearance.SetData(owner, ProximityBeeperVisuals.Enabled, true);
-        _powerCell.SetPowerCellDrawEnabled(owner, true, draw);
-    }
-
-
-    /// <summary>
-    /// Disables the proximity beeper
-    /// </summary>
-    public bool TryDisable(EntityUid owner,BeeperComponent? beeper = null, ProximityDetectorComponent? detector = null, PowerCellDrawComponent? draw = null)
-    {
-        if (!Resolve(owner, ref beeper, ref detector))
-            return false;
-
-        if (!detector.Enabled)
-            return false;
-        Disable(owner, beeper, detector, draw);
-        return true;
-    }
-    private void Disable(EntityUid owner, BeeperComponent beeper,
-        ProximityDetectorComponent detector, PowerCellDrawComponent? draw)
-    {
-        _proximity.SetEnable(owner, false, detector);
-        _appearance.SetData(owner, ProximityBeeperVisuals.Enabled, false);
-        _beeper.SetEnable(owner, false, beeper);
-        _powerCell.SetPowerCellDrawEnabled(owner, false, draw);
-    }
-
-    /// <summary>
-    /// toggles the proximity beeper
-    /// </summary>
-    public bool TryToggle(EntityUid owner, ProximityBeeperComponent? proxBeeper = null, BeeperComponent? beeper = null, ProximityDetectorComponent? detector = null,
-        PowerCellDrawComponent? draw = null, EntityUid? user = null)
+    private void OnNewProximityTarget(EntityUid owner, ProximityBeeperComponent proxBeeper, ref NewProximityTargetEvent args)
     {
-        if (!Resolve(owner,  ref proxBeeper, ref beeper, ref detector))
-            return false;
-
-        return detector.Enabled
-            ? TryDisable(owner, beeper, detector, draw)
-            : TryEnable(owner, beeper, detector, draw,user);
+        _beeper.SetMute(owner, args.Target != null);
     }
 }
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs b/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs
index efabebfc858..f83dd50c998 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs
@@ -124,7 +124,7 @@ public bool InsertOrgan(
     /// </summary>
     public bool RemoveOrgan(EntityUid organId, OrganComponent? organ = null)
     {
-        if (!Containers.TryGetContainingContainer(organId, out var container))
+        if (!Containers.TryGetContainingContainer((organId, null, null), out var container))
             return false;
 
         var parent = container.Owner;
@@ -158,26 +158,24 @@ public bool AddOrganToFirstValidSlot(
     }
 
     /// <summary>
-    ///     Returns a list of ValueTuples of <see cref="T"/> and OrganComponent on each organ
-    ///     in the given body.
+    /// Returns a list of Entity<<see cref="T"/>, <see cref="OrganComponent"/>>
+    /// for each organ of the body
     /// </summary>
-    /// <param name="uid">The body entity id to check on.</param>
-    /// <param name="body">The body to check for organs on.</param>
-    /// <typeparam name="T">The component to check for.</typeparam>
-    public List<(T Comp, OrganComponent Organ)> GetBodyOrganComponents<T>(
-        EntityUid uid,
-        BodyComponent? body = null)
+    /// <typeparam name="T">The component that we want to return</typeparam>
+    /// <param name="entity">The body to check the organs of</param>
+    public List<Entity<T, OrganComponent>> GetBodyOrganEntityComps<T>(
+        Entity<BodyComponent?> entity)
         where T : IComponent
     {
-        if (!Resolve(uid, ref body))
-            return new List<(T Comp, OrganComponent Organ)>();
+        if (!Resolve(entity, ref entity.Comp))
+            return new List<Entity<T, OrganComponent>>();
 
         var query = GetEntityQuery<T>();
-        var list = new List<(T Comp, OrganComponent Organ)>(3);
-        foreach (var organ in GetBodyOrgans(uid, body))
+        var list = new List<Entity<T, OrganComponent>>(3);
+        foreach (var organ in GetBodyOrgans(entity.Owner, entity.Comp))
         {
             if (query.TryGetComponent(organ.Id, out var comp))
-                list.Add((comp, organ.Component));
+                list.Add((organ.Id, comp, organ.Component));
         }
 
         return list;
@@ -192,19 +190,18 @@ public bool AddOrganToFirstValidSlot(
     /// <param name="body">The body to check for organs on.</param>
     /// <typeparam name="T">The component to check for.</typeparam>
     /// <returns>Whether any were found.</returns>
-    public bool TryGetBodyOrganComponents<T>(
-        EntityUid uid,
-        [NotNullWhen(true)] out List<(T Comp, OrganComponent Organ)>? comps,
-        BodyComponent? body = null)
+    public bool TryGetBodyOrganEntityComps<T>(
+        Entity<BodyComponent?> entity,
+        [NotNullWhen(true)] out List<Entity<T, OrganComponent>>? comps)
         where T : IComponent
     {
-        if (!Resolve(uid, ref body))
+        if (!Resolve(entity.Owner, ref entity.Comp))
         {
             comps = null;
             return false;
         }
 
-        comps = GetBodyOrganComponents<T>(uid, body);
+        comps = GetBodyOrganEntityComps<T>(entity);
 
         if (comps.Count != 0)
             return true;
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
index ee79faa0b8e..0917197e29f 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
@@ -189,7 +189,7 @@ private void PartRemoveDamage(Entity<BodyComponent?> bodyEnt, Entity<BodyPartCom
     /// </summary>
     public EntityUid? GetParentPartOrNull(EntityUid uid)
     {
-        if (!Containers.TryGetContainingContainer(uid, out var container))
+        if (!Containers.TryGetContainingContainer((uid, null, null), out var container))
             return null;
 
         var parent = container.Owner;
@@ -205,7 +205,7 @@ private void PartRemoveDamage(Entity<BodyComponent?> bodyEnt, Entity<BodyPartCom
     /// </summary>
     public (EntityUid Parent, string Slot)? GetParentPartAndSlotOrNull(EntityUid uid)
     {
-        if (!Containers.TryGetContainingContainer(uid, out var container))
+        if (!Containers.TryGetContainingContainer((uid, null, null), out var container))
             return null;
 
         var slotId = GetPartSlotContainerIdFromContainer(container.ID);
@@ -235,7 +235,7 @@ public bool TryGetParentBodyPart(
         parentUid = null;
         parentComponent = null;
 
-        if (Containers.TryGetContainingContainer(partUid, out var container) &&
+        if (Containers.TryGetContainingContainer((partUid, null, null), out var container) &&
             TryComp(container.Owner, out parentComponent))
         {
             parentUid = container.Owner;
diff --git a/Content.Shared/Buckle/Components/BuckleComponent.cs b/Content.Shared/Buckle/Components/BuckleComponent.cs
index ee86e6d4de0..c4810e8af08 100644
--- a/Content.Shared/Buckle/Components/BuckleComponent.cs
+++ b/Content.Shared/Buckle/Components/BuckleComponent.cs
@@ -1,4 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Alert;
 using Content.Shared.Interaction;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
@@ -79,6 +80,7 @@ public sealed class BuckleState(NetEntity? buckledTo, bool dontCollide, TimeSpan
     public readonly TimeSpan? BuckleTime = buckleTime;
 }
 
+public sealed partial class UnbuckleAlertEvent : BaseAlertEvent;
 
 /// <summary>
 /// Event raised directed at a strap entity before some entity gets buckled to it.
diff --git a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
index fd6ffd30e39..4f91a29ebea 100644
--- a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
+++ b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
@@ -9,6 +9,7 @@
 using Content.Shared.Movement.Pulling.Events;
 using Content.Shared.Popups;
 using Content.Shared.Pulling.Events;
+using Content.Shared.Rotation;
 using Content.Shared.Standing;
 using Content.Shared.Storage.Components;
 using Content.Shared.Stunnable;
@@ -40,6 +41,7 @@ private void InitializeBuckle()
         SubscribeLocalEvent<BuckleComponent, StartPullAttemptEvent>(OnPullAttempt);
         SubscribeLocalEvent<BuckleComponent, BeingPulledAttemptEvent>(OnBeingPulledAttempt);
         SubscribeLocalEvent<BuckleComponent, PullStartedMessage>(OnPullStarted);
+        SubscribeLocalEvent<BuckleComponent, UnbuckleAlertEvent>(OnUnbuckleAlert);
 
         SubscribeLocalEvent<BuckleComponent, InsertIntoEntityStorageAttemptEvent>(OnBuckleInsertIntoEntityStorageAttempt);
 
@@ -85,6 +87,13 @@ private void OnPullStarted(Entity<BuckleComponent> ent, ref PullStartedMessage a
         Unbuckle(ent!, args.PullerUid);
     }
 
+    private void OnUnbuckleAlert(Entity<BuckleComponent> ent, ref UnbuckleAlertEvent args)
+    {
+        if (args.Handled)
+            return;
+        args.Handled = TryUnbuckle(ent, ent, ent);
+    }
+
     #endregion
 
     #region Transform
@@ -360,10 +369,10 @@ private void Buckle(Entity<BuckleComponent> buckle, Entity<StrapComponent> strap
         switch (strap.Comp.Position)
         {
             case StrapPosition.Stand:
-                _standing.Stand(buckle);
+                _standing.Stand(buckle, force: true);
                 break;
             case StrapPosition.Down:
-                _standing.Down(buckle, false, false);
+                _standing.Down(buckle, false, false, force: true);
                 break;
         }
 
@@ -457,7 +466,7 @@ private void Unbuckle(Entity<BuckleComponent> buckle, Entity<StrapComponent> str
         Appearance.SetData(buckle, BuckleVisuals.Buckled, false);
 
         if (HasComp<KnockedDownComponent>(buckle) || _mobState.IsIncapacitated(buckle))
-            _standing.Down(buckle);
+            _standing.Down(buckle, playSound: false);
         else
             _standing.Stand(buckle);
 
diff --git a/Content.Shared/Buckle/SharedBuckleSystem.Strap.cs b/Content.Shared/Buckle/SharedBuckleSystem.Strap.cs
index eb23aa973b4..bfb0cd9cd6f 100644
--- a/Content.Shared/Buckle/SharedBuckleSystem.Strap.cs
+++ b/Content.Shared/Buckle/SharedBuckleSystem.Strap.cs
@@ -57,7 +57,7 @@ private void StrapRemoveAll(EntityUid uid, StrapComponent strapComp)
     {
         foreach (var entity in strapComp.BuckledEntities.ToArray())
         {
-            TryUnbuckle(entity, entity, true);
+            Unbuckle(entity, entity);
         }
     }
 
diff --git a/Content.Shared/Burial/BurialSystem.cs b/Content.Shared/Burial/BurialSystem.cs
index 45a89f3be97..68b634efc12 100644
--- a/Content.Shared/Burial/BurialSystem.cs
+++ b/Content.Shared/Burial/BurialSystem.cs
@@ -1,3 +1,4 @@
+using Content.Shared.ActionBlocker;
 using Content.Shared.Burial;
 using Content.Shared.Burial.Components;
 using Content.Shared.DoAfter;
@@ -8,7 +9,6 @@
 using Content.Shared.Storage.Components;
 using Content.Shared.Storage.EntitySystems;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Player;
 
 namespace Content.Server.Burial.Systems;
 
@@ -18,6 +18,7 @@ public sealed class BurialSystem : EntitySystem
     [Dependency] private readonly SharedEntityStorageSystem _storageSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+    [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
 
     public override void Initialize()
     {
@@ -48,7 +49,6 @@ private void OnInteractUsing(EntityUid uid, GraveComponent component, InteractUs
                 BreakOnMove = true,
                 BreakOnDamage = true,
                 NeedHand = true,
-                BreakOnHandChange = true
             };
 
             if (component.Stream == null)
@@ -159,7 +159,10 @@ private void OnRelayMovement(EntityUid uid, GraveComponent component, ref Contai
     {
         // We track a separate doAfter here, as we want someone with a shovel to
         // be able to come along and help someone trying to claw their way out
-        if (component.HandDiggingDoAfter != null)
+        if (_doAfterSystem.IsRunning(component.HandDiggingDoAfter))
+            return;
+
+        if (!_actionBlocker.CanMove(args.Entity))
             return;
 
         var doAfterEventArgs = new DoAfterArgs(EntityManager, args.Entity, component.DigDelay / component.DigOutByHandModifier, new GraveDiggingDoAfterEvent(), uid, target: uid)
@@ -174,7 +177,7 @@ private void OnRelayMovement(EntityUid uid, GraveComponent component, ref Contai
         if (component.Stream == null)
             component.Stream = _audioSystem.PlayPredicted(component.DigSound, uid, args.Entity)?.Entity;
 
-        if (!_doAfterSystem.TryStartDoAfter(doAfterEventArgs))
+        if (!_doAfterSystem.TryStartDoAfter(doAfterEventArgs, out component.HandDiggingDoAfter))
         {
             _audioSystem.Stop(component.Stream);
             return;
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 8ed610adfcb..179bec91044 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -884,6 +884,15 @@ public static readonly CVarDef<bool>
         public static readonly CVarDef<bool> AdminBypassMaxPlayers =
             CVarDef.Create("admin.bypass_max_players", true, CVar.SERVERONLY);
 
+        /// <summary>
+        /// Determine if custom rank names are used.
+        /// If it is false, it'd use the actual rank name regardless of the individual's title.
+        /// </summary>
+        /// <seealso cref="AhelpAdminPrefix"/>
+        /// <seealso cref="AhelpAdminPrefixWebhook"/>
+        public static readonly CVarDef<bool> AdminUseCustomNamesAdminRank =
+            CVarDef.Create("admin.use_custom_names_admin_rank", true, CVar.SERVERONLY);
+
         /*
          * AHELP
          */
@@ -903,6 +912,24 @@ public static readonly CVarDef<bool>
         public static readonly CVarDef<int> AhelpRateLimitCount =
             CVarDef.Create("ahelp.rate_limit_count", 10, CVar.SERVERONLY);
 
+        /// <summary>
+        /// Should the administrator's position be displayed in ahelp.
+        /// If it is is false, only the admin's ckey will be displayed in the ahelp.
+        /// </summary>
+        /// <seealso cref="AdminUseCustomNamesAdminRank"/>
+        /// <seealso cref="AhelpAdminPrefixWebhook"/>
+        public static readonly CVarDef<bool> AhelpAdminPrefix =
+            CVarDef.Create("ahelp.admin_prefix", true, CVar.SERVERONLY);
+
+        /// <summary>
+        /// Should the administrator's position be displayed in the webhook.
+        /// If it is is false, only the admin's ckey will be displayed in webhook.
+        /// </summary>
+        /// <seealso cref="AdminUseCustomNamesAdminRank"/>
+        /// <seealso cref="AhelpAdminPrefix"/>
+        public static readonly CVarDef<bool> AhelpAdminPrefixWebhook =
+            CVarDef.Create("ahelp.admin_prefix_webhook", true, CVar.SERVERONLY);
+
         /*
          * Explosions
          */
@@ -1477,6 +1504,13 @@ public static readonly CVarDef<int>
         public static readonly CVarDef<bool> GodmodeArrivals =
             CVarDef.Create("shuttle.godmode_arrivals", false, CVar.SERVERONLY);
 
+        /// <summary>
+        /// If a grid is split then hide any smaller ones under this mass (kg) from the map.
+        /// This is useful to avoid split grids spamming out labels.
+        /// </summary>
+        public static readonly CVarDef<int> HideSplitGridsUnder =
+            CVarDef.Create("shuttle.hide_split_grids_under", 30, CVar.SERVERONLY);
+
         /// <summary>
         /// Whether to automatically spawn escape shuttles.
         /// </summary>
@@ -2160,6 +2194,12 @@ public static readonly CVarDef<float>
         public static readonly CVarDef<string> TippyEntity =
             CVarDef.Create("tippy.entity", "Tippy", CVar.SERVER | CVar.REPLICATED);
 
+        /// <summary>
+        ///     The number of seconds that must pass for a single entity to be able to point at something again.
+        /// </summary>
+        public static readonly CVarDef<float> PointingCooldownSeconds =
+            CVarDef.Create("pointing.cooldown_seconds", 0.5f, CVar.SERVERONLY);
+
         /*
          * DEBUG
          */
diff --git a/Content.Shared/Camera/CameraRecoilComponent.cs b/Content.Shared/Camera/CameraRecoilComponent.cs
index 5d615f87bef..2cbb6324086 100644
--- a/Content.Shared/Camera/CameraRecoilComponent.cs
+++ b/Content.Shared/Camera/CameraRecoilComponent.cs
@@ -7,11 +7,19 @@ namespace Content.Shared.Camera;
 [NetworkedComponent]
 public sealed partial class CameraRecoilComponent : Component
 {
+    [ViewVariables(VVAccess.ReadWrite)]
     public Vector2 CurrentKick { get; set; }
+
+    [ViewVariables(VVAccess.ReadWrite)]
+    public Vector2 LastKick { get; set; }
+    
+    [ViewVariables(VVAccess.ReadWrite)]
     public float LastKickTime { get; set; }
 
     /// <summary>
     ///     Basically I needed a way to chain this effect for the attack lunge animation. Sorry!
     /// </summary>
+    ///
+    [ViewVariables(VVAccess.ReadWrite)]
     public Vector2 BaseOffset { get; set; }
 }
diff --git a/Content.Shared/Camera/GetEyeOffsetEvent.cs b/Content.Shared/Camera/GetEyeOffsetEvent.cs
new file mode 100644
index 00000000000..de9c7c9e178
--- /dev/null
+++ b/Content.Shared/Camera/GetEyeOffsetEvent.cs
@@ -0,0 +1,19 @@
+using System.Numerics;
+using Content.Shared.Movement.Systems;
+
+namespace Content.Shared.Camera;
+
+/// <summary>
+///     Raised directed by-ref when <see cref="SharedContentEyeSystem.UpdateEyeOffset"/> is called.
+///     Should be subscribed to by any systems that want to modify an entity's eye offset,
+///     so that they do not override each other.
+/// </summary>
+/// <param name="Offset">
+///     The total offset to apply.
+/// </param>
+/// <remarks>
+///     Note that in most cases <see cref="Offset"/> should be incremented or decremented by subscribers, not set.
+///     Otherwise, any offsets applied by previous subscribing systems will be overridden.
+/// </remarks>
+[ByRefEvent]
+public record struct GetEyeOffsetEvent(Vector2 Offset);
diff --git a/Content.Shared/Camera/SharedCameraRecoilSystem.cs b/Content.Shared/Camera/SharedCameraRecoilSystem.cs
index 3507bf10233..a2ce0e77e20 100644
--- a/Content.Shared/Camera/SharedCameraRecoilSystem.cs
+++ b/Content.Shared/Camera/SharedCameraRecoilSystem.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
 using JetBrains.Annotations;
-using Robust.Shared.Player;
+using Robust.Shared.Network;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Camera;
@@ -29,6 +29,17 @@ public abstract class SharedCameraRecoilSystem : EntitySystem
     protected const float KickMagnitudeMax = 1f;
 
     [Dependency] private readonly SharedEyeSystem _eye = default!;
+    [Dependency] private readonly INetManager _net = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<CameraRecoilComponent, GetEyeOffsetEvent>(OnCameraRecoilGetEyeOffset);
+    }
+
+    private void OnCameraRecoilGetEyeOffset(Entity<CameraRecoilComponent> ent, ref GetEyeOffsetEvent args)
+    {
+        args.Offset += ent.Comp.BaseOffset + ent.Comp.CurrentKick;
+    }
 
     /// <summary>
     ///     Applies explosion/recoil/etc kickback to the view of the entity.
@@ -39,19 +50,16 @@ public abstract class SharedCameraRecoilSystem : EntitySystem
     /// </remarks>
     public abstract void KickCamera(EntityUid euid, Vector2 kickback, CameraRecoilComponent? component = null);
 
-    public override void FrameUpdate(float frameTime)
+    private void UpdateEyes(float frameTime)
     {
-        base.FrameUpdate(frameTime);
+        var query = AllEntityQuery<CameraRecoilComponent, EyeComponent>();
 
-        var query = AllEntityQuery<EyeComponent, CameraRecoilComponent>();
-
-        while (query.MoveNext(out var uid, out var eye, out var recoil))
+        while (query.MoveNext(out var uid, out var recoil, out var eye))
         {
             var magnitude = recoil.CurrentKick.Length();
             if (magnitude <= 0.005f)
             {
                 recoil.CurrentKick = Vector2.Zero;
-                _eye.SetOffset(uid, recoil.BaseOffset + recoil.CurrentKick, eye);
             }
             else // Continually restore camera to 0.
             {
@@ -60,16 +68,35 @@ public override void FrameUpdate(float frameTime)
                 var restoreRate = MathHelper.Lerp(RestoreRateMin, RestoreRateMax, Math.Min(1, recoil.LastKickTime / RestoreRateRamp));
                 var restore = normalized * restoreRate * frameTime;
                 var (x, y) = recoil.CurrentKick - restore;
-                if (Math.Sign(x) != Math.Sign(recoil.CurrentKick.X)) x = 0;
+                if (Math.Sign(x) != Math.Sign(recoil.CurrentKick.X))
+                    x = 0;
 
-                if (Math.Sign(y) != Math.Sign(recoil.CurrentKick.Y)) y = 0;
+                if (Math.Sign(y) != Math.Sign(recoil.CurrentKick.Y))
+                    y = 0;
 
                 recoil.CurrentKick = new Vector2(x, y);
-
-                _eye.SetOffset(uid, recoil.BaseOffset + recoil.CurrentKick, eye);
             }
+
+            if (recoil.CurrentKick == recoil.LastKick)
+                continue;
+
+            recoil.LastKick = recoil.CurrentKick;
+            var ev = new GetEyeOffsetEvent();
+            RaiseLocalEvent(uid, ref ev);
+            _eye.SetOffset(uid, ev.Offset, eye);
         }
     }
+
+    public override void Update(float frameTime)
+    {
+        if (_net.IsServer)
+            UpdateEyes(frameTime);
+    }
+
+    public override void FrameUpdate(float frameTime)
+    {
+        UpdateEyes(frameTime);
+    }
 }
 
 [Serializable]
diff --git a/Content.Shared/Cargo/CargoOrderData.cs b/Content.Shared/Cargo/CargoOrderData.cs
index ce05d922362..5645cc454dd 100644
--- a/Content.Shared/Cargo/CargoOrderData.cs
+++ b/Content.Shared/Cargo/CargoOrderData.cs
@@ -48,7 +48,7 @@ public sealed partial class CargoOrderData
         // public int RequesterId;
         [DataField]
         public string Reason { get; private set; }
-        public  bool Approved => Approver is not null;
+        public  bool Approved;
         [DataField]
         public string? Approver;
 
diff --git a/Content.Shared/Cargo/Components/BankClientComponent.cs b/Content.Shared/Cargo/Components/BankClientComponent.cs
new file mode 100644
index 00000000000..4fd70855034
--- /dev/null
+++ b/Content.Shared/Cargo/Components/BankClientComponent.cs
@@ -0,0 +1,26 @@
+using Content.Shared.Cargo;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Cargo.Components;
+
+/// <summary>
+/// Makes an entity a client of the station's bank account.
+/// When its balance changes it will have <see cref="BankBalanceUpdatedEvent"/> raised on it.
+/// Other systems can then use this for logic or to update ui states.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedCargoSystem))]
+[AutoGenerateComponentState]
+public sealed partial class BankClientComponent : Component
+{
+    /// <summary>
+    /// The balance updated for the last station this entity was a part of.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public int Balance;
+}
+
+/// <summary>
+/// Raised on an entity with <see cref="BankClientComponent"/> when the bank's balance is updated.
+/// </summary>
+[ByRefEvent]
+public record struct BankBalanceUpdatedEvent(EntityUid Station, int Balance);
diff --git a/Content.Shared/Charges/Systems/SharedChargesSystem.cs b/Content.Shared/Charges/Systems/SharedChargesSystem.cs
index 5de1383cde0..7f95ef184e4 100644
--- a/Content.Shared/Charges/Systems/SharedChargesSystem.cs
+++ b/Content.Shared/Charges/Systems/SharedChargesSystem.cs
@@ -5,10 +5,14 @@ namespace Content.Shared.Charges.Systems;
 
 public abstract class SharedChargesSystem : EntitySystem
 {
+    protected EntityQuery<LimitedChargesComponent> Query;
+
     public override void Initialize()
     {
         base.Initialize();
 
+        Query = GetEntityQuery<LimitedChargesComponent>();
+
         SubscribeLocalEvent<LimitedChargesComponent, ExaminedEvent>(OnExamine);
     }
 
@@ -30,9 +34,9 @@ protected virtual void OnExamine(EntityUid uid, LimitedChargesComponent comp, Ex
     /// <summary>
     /// Tries to add a number of charges. If it over or underflows it will be clamped, wasting the extra charges.
     /// </summary>
-    public void AddCharges(EntityUid uid, int change, LimitedChargesComponent? comp = null)
+    public virtual void AddCharges(EntityUid uid, int change, LimitedChargesComponent? comp = null)
     {
-        if (!Resolve(uid, ref comp, false))
+        if (!Query.Resolve(uid, ref comp, false))
             return;
 
         var old = comp.Charges;
@@ -47,7 +51,7 @@ public void AddCharges(EntityUid uid, int change, LimitedChargesComponent? comp
     public bool IsEmpty(EntityUid uid, LimitedChargesComponent? comp = null)
     {
         // can't be empty if there are no limited charges
-        if (!Resolve(uid, ref comp, false))
+        if (!Query.Resolve(uid, ref comp, false))
             return false;
 
         return comp.Charges <= 0;
@@ -56,10 +60,24 @@ public bool IsEmpty(EntityUid uid, LimitedChargesComponent? comp = null)
     /// <summary>
     /// Uses a single charge. Must check IsEmpty beforehand to prevent using with 0 charge.
     /// </summary>
-    public virtual void UseCharge(EntityUid uid, LimitedChargesComponent? comp = null)
+    public void UseCharge(EntityUid uid, LimitedChargesComponent? comp = null)
+    {
+        AddCharges(uid, -1, comp);
+    }
+
+    /// <summary>
+    /// Checks IsEmpty and uses a charge if it isn't empty.
+    /// </summary>
+    public bool TryUseCharge(Entity<LimitedChargesComponent?> ent)
     {
-        if (Resolve(uid, ref comp, false))
-            AddCharges(uid, -1, comp);
+        if (!Query.Resolve(ent, ref ent.Comp, false))
+            return true;
+
+        if (IsEmpty(ent, ent.Comp))
+            return false;
+
+        UseCharge(ent, ent.Comp);
+        return true;
     }
 
     /// <summary>
@@ -80,7 +98,6 @@ public bool HasInsufficientCharges(EntityUid uid, int requiredCharges, LimitedCh
     /// </summary>
     public virtual void UseCharges(EntityUid uid, int chargesUsed, LimitedChargesComponent? comp = null)
     {
-        if (Resolve(uid, ref comp, false))
-            AddCharges(uid, -chargesUsed, comp);
+        AddCharges(uid, -chargesUsed, comp);
     }
 }
diff --git a/Content.Shared/Chat/TypingIndicator/SharedTypingIndicatorSystem.cs b/Content.Shared/Chat/TypingIndicator/SharedTypingIndicatorSystem.cs
index dffe3cc185b..9d60d334dbe 100644
--- a/Content.Shared/Chat/TypingIndicator/SharedTypingIndicatorSystem.cs
+++ b/Content.Shared/Chat/TypingIndicator/SharedTypingIndicatorSystem.cs
@@ -1,6 +1,8 @@
 using Content.Shared.ActionBlocker;
 using Content.Shared.Clothing;
+using Content.Shared.Inventory;
 using Robust.Shared.Player;
+using Robust.Shared.Timing;
 
 namespace Content.Shared.Chat.TypingIndicator;
 
@@ -11,6 +13,7 @@ public abstract class SharedTypingIndicatorSystem : EntitySystem
 {
     [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
 
     /// <summary>
     ///     Default ID of <see cref="TypingIndicatorPrototype"/>
@@ -26,6 +29,7 @@ public override void Initialize()
 
         SubscribeLocalEvent<TypingIndicatorClothingComponent, ClothingGotEquippedEvent>(OnGotEquipped);
         SubscribeLocalEvent<TypingIndicatorClothingComponent, ClothingGotUnequippedEvent>(OnGotUnequipped);
+        SubscribeLocalEvent<TypingIndicatorClothingComponent, InventoryRelayedEvent<BeforeShowTypingIndicatorEvent>>(BeforeShow);
 
         SubscribeAllEvent<TypingChangedEvent>(OnTypingChanged);
     }
@@ -44,20 +48,19 @@ private void OnPlayerDetached(EntityUid uid, TypingIndicatorComponent component,
         SetTypingIndicatorEnabled(uid, false);
     }
 
-    private void OnGotEquipped(EntityUid uid, TypingIndicatorClothingComponent component, ClothingGotEquippedEvent args)
+    private void OnGotEquipped(Entity<TypingIndicatorClothingComponent> entity, ref ClothingGotEquippedEvent args)
     {
-        if (!TryComp<TypingIndicatorComponent>(args.Wearer, out var indicator))
-            return;
-
-        indicator.Prototype = component.Prototype;
+        entity.Comp.GotEquippedTime = _timing.CurTime;
     }
 
-    private void OnGotUnequipped(EntityUid uid, TypingIndicatorClothingComponent component, ClothingGotUnequippedEvent args)
+    private void OnGotUnequipped(Entity<TypingIndicatorClothingComponent> entity, ref ClothingGotUnequippedEvent args)
     {
-        if (!TryComp<TypingIndicatorComponent>(args.Wearer, out var indicator))
-            return;
+        entity.Comp.GotEquippedTime = null;
+    }
 
-        indicator.Prototype = InitialIndicatorId;
+    private void BeforeShow(Entity<TypingIndicatorClothingComponent> entity, ref InventoryRelayedEvent<BeforeShowTypingIndicatorEvent> args)
+    {
+        args.Args.TryUpdateTimeAndIndicator(entity.Comp.TypingIndicatorPrototype, entity.Comp.GotEquippedTime);
     }
 
     private void OnTypingChanged(TypingChangedEvent ev, EntitySessionEventArgs args)
diff --git a/Content.Shared/Chat/TypingIndicator/TypingChangedEvent.cs b/Content.Shared/Chat/TypingIndicator/TypingChangedEvent.cs
deleted file mode 100644
index 6245f19b5d4..00000000000
--- a/Content.Shared/Chat/TypingIndicator/TypingChangedEvent.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Chat.TypingIndicator;
-
-/// <summary>
-///     Networked event from client.
-///     Send to server when client started/stopped typing in chat input field.
-/// </summary>
-[Serializable, NetSerializable]
-public sealed class TypingChangedEvent : EntityEventArgs
-{
-    public readonly bool IsTyping;
-
-    public TypingChangedEvent(bool isTyping)
-    {
-        IsTyping = isTyping;
-    }
-}
diff --git a/Content.Shared/Chat/TypingIndicator/TypingIndicatorClothingComponent.cs b/Content.Shared/Chat/TypingIndicator/TypingIndicatorClothingComponent.cs
index 5ec8185587a..4993e912e93 100644
--- a/Content.Shared/Chat/TypingIndicator/TypingIndicatorClothingComponent.cs
+++ b/Content.Shared/Chat/TypingIndicator/TypingIndicatorClothingComponent.cs
@@ -1,13 +1,28 @@
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Chat.TypingIndicator;
 
-[RegisterComponent, NetworkedComponent]
+/// <summary>
+///     If an item is equipped to someones inventory (Anything but the pockets), and has this component
+///     the users typing indicator will be replaced by the prototype given in <c>TypingIndicatorPrototype</c>.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentPause]
 [Access(typeof(SharedTypingIndicatorSystem))]
 public sealed partial class TypingIndicatorClothingComponent : Component
 {
+    /// <summary>
+    ///     The typing indicator that will override the default typing indicator when the item is equipped to a users
+    ///     inventory.
+    /// </summary>
     [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("proto", required: true, customTypeSerializer: typeof(PrototypeIdSerializer<TypingIndicatorPrototype>))]
-    public string Prototype = default!;
+    [DataField("proto", required: true)]
+    public ProtoId<TypingIndicatorPrototype> TypingIndicatorPrototype = default!;
+
+    /// <summary>
+    ///     This stores the time the item was equipped in someones inventory. If null, item is currently not equipped.
+    /// </summary>
+    [DataField, AutoPausedField]
+    public TimeSpan? GotEquippedTime = null;
 }
diff --git a/Content.Shared/Chat/TypingIndicator/TypingIndicatorComponent.cs b/Content.Shared/Chat/TypingIndicator/TypingIndicatorComponent.cs
index a4507b06b8a..f263de49136 100644
--- a/Content.Shared/Chat/TypingIndicator/TypingIndicatorComponent.cs
+++ b/Content.Shared/Chat/TypingIndicator/TypingIndicatorComponent.cs
@@ -1,5 +1,5 @@
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Chat.TypingIndicator;
 
@@ -14,7 +14,6 @@ public sealed partial class TypingIndicatorComponent : Component
     /// <summary>
     ///     Prototype id that store all visual info about typing indicator.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("proto", customTypeSerializer: typeof(PrototypeIdSerializer<TypingIndicatorPrototype>))]
-    public string Prototype = SharedTypingIndicatorSystem.InitialIndicatorId;
+    [DataField("proto")]
+    public ProtoId<TypingIndicatorPrototype> TypingIndicatorPrototype = "default";
 }
diff --git a/Content.Shared/Chat/TypingIndicator/TypingIndicatorEvents.cs b/Content.Shared/Chat/TypingIndicator/TypingIndicatorEvents.cs
new file mode 100644
index 00000000000..600f86c0d2c
--- /dev/null
+++ b/Content.Shared/Chat/TypingIndicator/TypingIndicatorEvents.cs
@@ -0,0 +1,60 @@
+using Robust.Shared.Serialization;
+using Content.Shared.Inventory;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.Manager.Exceptions;
+
+namespace Content.Shared.Chat.TypingIndicator;
+
+/// <summary>
+///     Networked event from client.
+///     Send to server when client started/stopped typing in chat input field.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class TypingChangedEvent : EntityEventArgs
+{
+    public readonly bool IsTyping;
+
+    public TypingChangedEvent(bool isTyping)
+    {
+        IsTyping = isTyping;
+    }
+}
+
+/// <summary>
+///     This event will be broadcast right before displaying an entities typing indicator.
+///     If _overrideIndicator is not null after the event is finished it will be used.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class BeforeShowTypingIndicatorEvent : IInventoryRelayEvent
+{
+    public SlotFlags TargetSlots { get; } = SlotFlags.WITHOUT_POCKET;
+
+    private ProtoId<TypingIndicatorPrototype>? _overrideIndicator = null;
+    private TimeSpan? _latestEquipTime = null;
+    public BeforeShowTypingIndicatorEvent()
+    {
+        _overrideIndicator = null;
+        _latestEquipTime = null;
+    }
+    /// <summary>
+    ///     Will only update the time and indicator if the given time is more recent than
+    ///     the stored time or if the stored time is null.
+    /// </summary>
+    ///  <returns>
+    ///     True if the given time is more recent than the stored time, and false otherwise.
+    ///  </returns>
+    public bool TryUpdateTimeAndIndicator(ProtoId<TypingIndicatorPrototype>? indicator, TimeSpan? equipTime)
+    {
+        if (equipTime != null && (_latestEquipTime == null || _latestEquipTime < equipTime))
+        {
+            _latestEquipTime = equipTime;
+            _overrideIndicator = indicator;
+            return true;
+        }
+        return false;
+    }
+    public ProtoId<TypingIndicatorPrototype>? GetMostRecentIndicator()
+    {
+        return _overrideIndicator;
+    }
+}
diff --git a/Content.Shared/Chemistry/Components/InjectorComponent.cs b/Content.Shared/Chemistry/Components/InjectorComponent.cs
index ee7f9bd5798..1f2716356c5 100644
--- a/Content.Shared/Chemistry/Components/InjectorComponent.cs
+++ b/Content.Shared/Chemistry/Components/InjectorComponent.cs
@@ -73,6 +73,12 @@ public sealed partial class InjectorComponent : Component
     [DataField]
     public TimeSpan Delay = TimeSpan.FromSeconds(5);
 
+    /// <summary>
+    /// Each additional 1u after first 5u increases the delay by X seconds.
+    /// </summary>
+    [DataField]
+    public TimeSpan DelayPerVolume = TimeSpan.FromSeconds(0.1);
+
     /// <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
@@ -81,6 +87,22 @@ public sealed partial class InjectorComponent : Component
     [AutoNetworkedField]
     [DataField]
     public InjectorToggleMode ToggleState = InjectorToggleMode.Draw;
+
+    #region Arguments for injection doafter
+
+    /// <inheritdoc cref=DoAfterArgs.NeedHand>
+    [DataField]
+    public bool NeedHand = true;
+
+    /// <inheritdoc cref=DoAfterArgs.BreakOnHandChange>
+    [DataField]
+    public bool BreakOnHandChange = true;
+
+    /// <inheritdoc cref=DoAfterArgs.MovementThreshold>
+    [DataField]
+    public float MovementThreshold = 0.1f;
+
+    #endregion
 }
 
 /// <summary>
diff --git a/Content.Shared/Chemistry/Components/Solution.cs b/Content.Shared/Chemistry/Components/Solution.cs
index 4de3c369f7c..725a685a8be 100644
--- a/Content.Shared/Chemistry/Components/Solution.cs
+++ b/Content.Shared/Chemistry/Components/Solution.cs
@@ -147,7 +147,7 @@ public Solution(int capacity)
         /// </summary>
         /// <param name="prototype">The prototype ID of the reagent to add.</param>
         /// <param name="quantity">The quantity in milli-units.</param>
-        public Solution(string prototype, FixedPoint2 quantity, ReagentData? data = null) : this()
+        public Solution(string prototype, FixedPoint2 quantity, List<ReagentData>? data = null) : this()
         {
             AddReagent(new ReagentId(prototype, data), quantity);
         }
@@ -243,7 +243,7 @@ public bool ContainsReagent(ReagentId id)
             return false;
         }
 
-        public bool ContainsReagent(string reagentId, ReagentData? data)
+        public bool ContainsReagent(string reagentId, List<ReagentData>? data)
             => ContainsReagent(new(reagentId, data));
 
         public bool TryGetReagent(ReagentId id, out ReagentQuantity quantity)
@@ -404,7 +404,7 @@ public void AddReagent(ReagentQuantity reagentQuantity)
         /// </summary>
         /// <param name="proto">The prototype of the reagent to add.</param>
         /// <param name="quantity">The quantity in milli-units.</param>
-        public void AddReagent(ReagentPrototype proto, FixedPoint2 quantity, float temperature, IPrototypeManager? protoMan, ReagentData? data = null)
+        public void AddReagent(ReagentPrototype proto, FixedPoint2 quantity, float temperature, IPrototypeManager? protoMan, List<ReagentData>? data = null)
         {
             if (_heatCapacityDirty)
                 UpdateHeatCapacity(protoMan);
@@ -489,7 +489,7 @@ public FixedPoint2 RemoveReagent(ReagentQuantity toRemove, bool preserveOrder =
             {
                 var (reagent, curQuantity) = Contents[i];
 
-                if(reagent != toRemove.Reagent)
+                if(reagent.Prototype != toRemove.Reagent.Prototype)
                     continue;
 
                 var newQuantity = curQuantity - toRemove.Quantity;
@@ -523,7 +523,7 @@ public FixedPoint2 RemoveReagent(ReagentQuantity toRemove, bool preserveOrder =
         /// <param name="prototype">The prototype of the reagent to be removed.</param>
         /// <param name="quantity">The amount of reagent to remove.</param>
         /// <returns>How much reagent was actually removed. Zero if the reagent is not present on the solution.</returns>
-        public FixedPoint2 RemoveReagent(string prototype, FixedPoint2 quantity, ReagentData? data = null)
+        public FixedPoint2 RemoveReagent(string prototype, FixedPoint2 quantity, List<ReagentData>? data = null)
         {
             return RemoveReagent(new ReagentQuantity(prototype, quantity, data));
         }
diff --git a/Content.Shared/Chemistry/Components/SolutionContainerVisualsComponent.cs b/Content.Shared/Chemistry/Components/SolutionContainerVisualsComponent.cs
index 100ee3975f9..1e3c14bfd49 100644
--- a/Content.Shared/Chemistry/Components/SolutionContainerVisualsComponent.cs
+++ b/Content.Shared/Chemistry/Components/SolutionContainerVisualsComponent.cs
@@ -53,5 +53,17 @@ public sealed partial class SolutionContainerVisualsComponent : Component
         /// </summary>
         [DataField]
         public int InHandsMaxFillLevels = 0;
+
+        /// <summary>
+        /// Optional equipped visuals to show someone is wearing a something with a filled container.
+        /// </summary>
+        [DataField]
+        public string? EquippedFillBaseName = null;
+
+        /// <summary>
+        /// A separate max fill levels for equipped items (to reduce number of sprites needed)
+        /// </summary>
+        [DataField]
+        public int EquippedMaxFillLevels = 0;
     }
 }
diff --git a/Content.Shared/Chemistry/Components/SolutionTransferComponent.cs b/Content.Shared/Chemistry/Components/SolutionTransferComponent.cs
index b130304afc8..2b862a83ac8 100644
--- a/Content.Shared/Chemistry/Components/SolutionTransferComponent.cs
+++ b/Content.Shared/Chemistry/Components/SolutionTransferComponent.cs
@@ -6,7 +6,7 @@ namespace Content.Shared.Chemistry.Components;
 /// <summary>
 ///     Gives click behavior for transferring to/from other reagent containers.
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class SolutionTransferComponent : Component
 {
     /// <summary>
@@ -14,6 +14,7 @@ public sealed partial class SolutionTransferComponent : Component
     /// </summary>
     [DataField("transferAmount")]
     [ViewVariables(VVAccess.ReadWrite)]
+    [AutoNetworkedField]
     public FixedPoint2 TransferAmount { get; set; } = FixedPoint2.New(5);
 
     /// <summary>
@@ -28,7 +29,7 @@ public sealed partial class SolutionTransferComponent : Component
     /// </summary>
     [DataField("maxTransferAmount")]
     [ViewVariables(VVAccess.ReadWrite)]
-    public FixedPoint2 MaximumTransferAmount { get; set; } = FixedPoint2.New(50);
+    public FixedPoint2 MaximumTransferAmount { get; set; } = FixedPoint2.New(100);
 
     /// <summary>
     ///     Can this entity take reagent from reagent tanks?
diff --git a/Content.Shared/Chemistry/EntitySystems/RehydratableSystem.cs b/Content.Shared/Chemistry/EntitySystems/RehydratableSystem.cs
index 36ca791290a..0f5d51057f2 100644
--- a/Content.Shared/Chemistry/EntitySystems/RehydratableSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/RehydratableSystem.cs
@@ -1,4 +1,6 @@
+using Content.Shared.Administration.Logs;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Database;
 using Content.Shared.FixedPoint;
 using Content.Shared.Popups;
 using Robust.Shared.Network;
@@ -13,6 +15,7 @@ public sealed class RehydratableSystem : EntitySystem
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutions = default!;
     [Dependency] private readonly SharedTransformSystem _xform = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
 
     public override void Initialize()
     {
@@ -24,6 +27,7 @@ public override void Initialize()
     private void OnSolutionChange(Entity<RehydratableComponent> ent, ref SolutionContainerChangedEvent args)
     {
         var quantity = _solutions.GetTotalPrototypeQuantity(ent, ent.Comp.CatalystPrototype);
+        _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(ent.Owner)} was hydrated, now contains a solution of: {SharedSolutionContainerSystem.ToPrettyString(args.Solution)}.");
         if (quantity != FixedPoint2.Zero && quantity >= ent.Comp.CatalystMinimum)
         {
             Expand(ent);
@@ -41,6 +45,8 @@ private void Expand(Entity<RehydratableComponent> ent)
         var randomMob = _random.Pick(comp.PossibleSpawns);
 
         var target = Spawn(randomMob, Transform(uid).Coordinates);
+        _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(ent.Owner)} has been hydrated correctly and spawned: {ToPrettyString(target)}.");
+
         _popup.PopupEntity(Loc.GetString("rehydratable-component-expands-message", ("owner", uid)), target);
 
         _xform.AttachToGridOrMap(target);
diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
index 7e00157b6ee..ad9cd01fbf2 100644
--- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
@@ -452,7 +452,7 @@ public bool TryAddReagent(Entity<SolutionComponent> soln, ReagentQuantity reagen
     /// <param name="quantity">The amount of reagent to add.</param>
     /// <returns>If all the reagent could be added.</returns>
     [PublicAPI]
-    public bool TryAddReagent(Entity<SolutionComponent> soln, string prototype, FixedPoint2 quantity, float? temperature = null, ReagentData? data = null)
+    public bool TryAddReagent(Entity<SolutionComponent> soln, string prototype, FixedPoint2 quantity, float? temperature = null, List<ReagentData>? data = null)
         => TryAddReagent(soln, new ReagentQuantity(prototype, quantity, data), out _, temperature);
 
     /// <summary>
@@ -464,7 +464,7 @@ public bool TryAddReagent(Entity<SolutionComponent> soln, string prototype, Fixe
     /// <param name="quantity">The amount of reagent to add.</param>
     /// <param name="acceptedQuantity">The amount of reagent successfully added.</param>
     /// <returns>If all the reagent could be added.</returns>
-    public bool TryAddReagent(Entity<SolutionComponent> soln, string prototype, FixedPoint2 quantity, out FixedPoint2 acceptedQuantity, float? temperature = null, ReagentData? data = null)
+    public bool TryAddReagent(Entity<SolutionComponent> soln, string prototype, FixedPoint2 quantity, out FixedPoint2 acceptedQuantity, float? temperature = null, List<ReagentData>? data = null)
     {
         var reagent = new ReagentQuantity(prototype, quantity, data);
         return TryAddReagent(soln, reagent, out acceptedQuantity, temperature);
@@ -513,7 +513,7 @@ public bool RemoveReagent(Entity<SolutionComponent> soln, ReagentQuantity reagen
     /// <param name="prototype">The Id of the reagent to remove.</param>
     /// <param name="quantity">The amount of reagent to remove.</param>
     /// <returns>If the reagent to remove was found in the container.</returns>
-    public bool RemoveReagent(Entity<SolutionComponent> soln, string prototype, FixedPoint2 quantity, ReagentData? data = null)
+    public bool RemoveReagent(Entity<SolutionComponent> soln, string prototype, FixedPoint2 quantity, List<ReagentData>? data = null)
     {
         return RemoveReagent(soln, new ReagentQuantity(prototype, quantity, data));
     }
diff --git a/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs b/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs
index 93e9765b164..b0f55a32720 100644
--- a/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs
@@ -38,11 +38,15 @@ public override void Initialize()
 
     private void OnTransferAmountSetValueMessage(Entity<SolutionTransferComponent> ent, ref TransferAmountSetValueMessage message)
     {
-        var newTransferAmount = FixedPoint2.Clamp(message.Value, ent.Comp.MinimumTransferAmount, ent.Comp.MaximumTransferAmount);
-        ent.Comp.TransferAmount = newTransferAmount;
+        var (uid, comp) = ent;
+
+        var newTransferAmount = FixedPoint2.Clamp(message.Value, comp.MinimumTransferAmount, comp.MaximumTransferAmount);
+        comp.TransferAmount = newTransferAmount;
 
         if (message.Actor is { Valid: true } user)
-            _popup.PopupClient(Loc.GetString("comp-solution-transfer-set-amount", ("amount", newTransferAmount)), ent, user);
+            _popup.PopupEntity(Loc.GetString("comp-solution-transfer-set-amount", ("amount", newTransferAmount)), uid, user);
+
+        Dirty(uid, comp);
     }
 
     private void AddSetTransferVerbs(Entity<SolutionTransferComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
@@ -72,13 +76,19 @@ private void AddSetTransferVerbs(Entity<SolutionTransferComponent> ent, ref GetV
         var user = args.User;
         foreach (var amount in DefaultTransferAmounts)
         {
+          if (amount < comp.MinimumTransferAmount || amount > comp.MaximumTransferAmount)
+                continue;
+
             AlternativeVerb verb = new();
             verb.Text = Loc.GetString("comp-solution-transfer-verb-amount", ("amount", amount));
             verb.Category = VerbCategory.SetTransferAmount;
             verb.Act = () =>
             {
                 comp.TransferAmount = amount;
+
                 _popup.PopupClient(Loc.GetString("comp-solution-transfer-set-amount", ("amount", amount)), uid, user);
+
+                Dirty(uid, comp);
             };
 
             // we want to sort by size, not alphabetically by the verb text.
@@ -110,6 +120,7 @@ private void OnAfterInteract(Entity<SolutionTransferComponent> ent, ref AfterInt
                 transferAmount = FixedPoint2.Min(transferAmount, maxRefill);
 
             var transferred = Transfer(args.User, target, targetSoln.Value, uid, ownerSoln.Value, transferAmount);
+            args.Handled = true;
             if (transferred > 0)
             {
                 var toTheBrim = ownerRefill.AvailableVolume == 0;
@@ -118,8 +129,6 @@ private void OnAfterInteract(Entity<SolutionTransferComponent> ent, ref AfterInt
                     : "comp-solution-transfer-fill-normal";
 
                 _popup.PopupClient(Loc.GetString(msg, ("owner", args.Target), ("amount", transferred), ("target", uid)), uid, args.User);
-
-                args.Handled = true;
                 return;
             }
         }
@@ -136,13 +145,11 @@ private void OnAfterInteract(Entity<SolutionTransferComponent> ent, ref AfterInt
                 transferAmount = FixedPoint2.Min(transferAmount, maxRefill);
 
             var transferred = Transfer(args.User, uid, ownerSoln.Value, target, targetSoln.Value, transferAmount);
-
+            args.Handled = true;
             if (transferred > 0)
             {
                 var message = Loc.GetString("comp-solution-transfer-transfer-solution", ("amount", transferred), ("target", target));
                 _popup.PopupClient(message, uid, args.User);
-
-                args.Handled = true;
             }
         }
     }
@@ -195,6 +202,9 @@ public FixedPoint2 Transfer(EntityUid user,
         var solution = _solution.SplitSolution(source, actualAmount);
         _solution.AddSolution(target, solution);
 
+        var ev = new SolutionTransferredEvent(sourceEntity, targetEntity, user, actualAmount);
+        RaiseLocalEvent(targetEntity, ref ev);
+
         _adminLogger.Add(LogType.Action, LogImpact.Medium,
             $"{ToPrettyString(user):player} transferred {SharedSolutionContainerSystem.ToPrettyString(solution)} to {ToPrettyString(targetEntity):target}, which now contains {SharedSolutionContainerSystem.ToPrettyString(targetSolution)}");
 
@@ -218,3 +228,9 @@ public void Cancel(string reason)
         CancelReason = reason;
     }
 }
+
+/// <summary>
+/// Raised on the target entity when a non-zero amount of solution gets transferred.
+/// </summary>
+[ByRefEvent]
+public record struct SolutionTransferredEvent(EntityUid From, EntityUid To, EntityUid User, FixedPoint2 Amount);
diff --git a/Content.Shared/Chemistry/Reaction/ITileReaction.cs b/Content.Shared/Chemistry/Reaction/ITileReaction.cs
index af6cc34f48a..31b7c9129c1 100644
--- a/Content.Shared/Chemistry/Reaction/ITileReaction.cs
+++ b/Content.Shared/Chemistry/Reaction/ITileReaction.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Map;
 
@@ -9,6 +9,7 @@ public interface ITileReaction
         FixedPoint2 TileReact(TileRef tile,
             ReagentPrototype reagent,
             FixedPoint2 reactVolume,
-            IEntityManager entityManager);
+            IEntityManager entityManager,
+            List<ReagentData>? data = null);
     }
 }
diff --git a/Content.Shared/Chemistry/Reaction/ReactionMixerComponent.cs b/Content.Shared/Chemistry/Reaction/ReactionMixerComponent.cs
index 118f2240610..8edfa44ce85 100644
--- a/Content.Shared/Chemistry/Reaction/ReactionMixerComponent.cs
+++ b/Content.Shared/Chemistry/Reaction/ReactionMixerComponent.cs
@@ -1,5 +1,7 @@
 using Content.Shared.Chemistry.Components;
+using Content.Shared.DoAfter;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Chemistry.Reaction;
 
@@ -19,9 +21,28 @@ public sealed partial class ReactionMixerComponent : Component
     [ViewVariables]
     [DataField]
     public LocId MixMessage = "default-mixing-success";
+
+    /// <summary>
+    ///     Defines if interacting is enough to mix with this component
+    /// </summary>
+    [ViewVariables]
+    [DataField]
+    public bool MixOnInteract = true;
+
+    /// <summary>
+    ///     How long it takes to mix with this
+    /// </summary>
+    [ViewVariables]
+    [DataField]
+    public TimeSpan TimeToMix = TimeSpan.Zero;
 }
 
 [ByRefEvent]
 public record struct MixingAttemptEvent(EntityUid Mixed, bool Cancelled = false);
 
 public readonly record struct AfterMixingEvent(EntityUid Mixed, EntityUid Mixer);
+
+[Serializable, NetSerializable]
+public sealed partial class ReactionMixDoAfterEvent : SimpleDoAfterEvent
+{
+}
diff --git a/Content.Shared/Chemistry/Reagent/DNAData.cs b/Content.Shared/Chemistry/Reagent/DNAData.cs
new file mode 100644
index 00000000000..e75e994eceb
--- /dev/null
+++ b/Content.Shared/Chemistry/Reagent/DNAData.cs
@@ -0,0 +1,28 @@
+using Content.Shared.FixedPoint;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Chemistry.Reagent;
+
+[ImplicitDataDefinitionForInheritors, Serializable, NetSerializable]
+public sealed partial class DnaData : ReagentData
+{
+    [DataField]
+    public string DNA = String.Empty;
+
+    public override ReagentData Clone() => this;
+
+    public override bool Equals(ReagentData? other)
+    {
+        if (other == null)
+        {
+            return false;
+        }
+
+        return ((DnaData) other).DNA == DNA;
+    }
+
+    public override int GetHashCode()
+    {
+        return DNA.GetHashCode();
+    }
+}
diff --git a/Content.Shared/Chemistry/Reagent/ReagentId.cs b/Content.Shared/Chemistry/Reagent/ReagentId.cs
index 07a42002197..798dd28db49 100644
--- a/Content.Shared/Chemistry/Reagent/ReagentId.cs
+++ b/Content.Shared/Chemistry/Reagent/ReagentId.cs
@@ -1,6 +1,7 @@
-using Content.Shared.FixedPoint;
+using Content.Shared.FixedPoint;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using System.Linq;
 
 namespace Content.Shared.Chemistry.Reagent;
 
@@ -20,17 +21,23 @@ public partial struct ReagentId : IEquatable<ReagentId>
     /// Any additional data that is unique to this reagent type. E.g., for blood this could be DNA data.
     /// </summary>
     [DataField("data")]
-    public ReagentData? Data { get; private set; }
+    public List<ReagentData>? Data { get; private set; } = new();
 
-    public ReagentId(string prototype, ReagentData? data)
+    public ReagentId(string prototype, List<ReagentData>? data)
     {
         Prototype = prototype;
-        Data = data;
+        Data = data ?? new();
     }
 
     public ReagentId()
     {
         Prototype = default!;
+        Data = new();
+    }
+
+    public List<ReagentData> EnsureReagentData()
+    {
+        return (Data != null) ? Data : new List<ReagentData>();
     }
 
     public bool Equals(ReagentId other)
@@ -44,13 +51,13 @@ public bool Equals(ReagentId other)
         if (other.Data == null)
             return false;
 
-        if (Data.GetType() != other.Data.GetType())
+        if (Data.Except(other.Data).Any() || other.Data.Except(Data).Any() || Data.Count != other.Data.Count)
             return false;
 
-        return Data.Equals(other.Data);
+        return true;
     }
 
-    public bool Equals(string prototype, ReagentData? otherData = null)
+    public bool Equals(string prototype, List<ReagentData>? otherData = null)
     {
         if (Prototype != prototype)
             return false;
@@ -73,12 +80,12 @@ public override int GetHashCode()
 
     public string ToString(FixedPoint2 quantity)
     {
-        return Data?.ToString(Prototype, quantity) ?? $"{Prototype}:{quantity}";
+        return $"{Prototype}:{quantity}";
     }
 
     public override string ToString()
     {
-        return Data?.ToString(Prototype) ?? Prototype;
+        return $"{Prototype}";
     }
 
     public static bool operator ==(ReagentId left, ReagentId right)
diff --git a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
index fe937b9de43..dba2ba03a3f 100644
--- a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
+++ b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
@@ -143,7 +143,7 @@ public sealed partial class ReagentPrototype : IPrototype, IInheritingPrototype
         [DataField]
         public SoundSpecifier FootstepSound = new SoundCollectionSpecifier("FootstepWater", AudioParams.Default.WithVolume(6));
 
-        public FixedPoint2 ReactionTile(TileRef tile, FixedPoint2 reactVolume, IEntityManager entityManager)
+        public FixedPoint2 ReactionTile(TileRef tile, FixedPoint2 reactVolume, IEntityManager entityManager, List<ReagentData>? data)
         {
             var removed = FixedPoint2.Zero;
 
@@ -152,7 +152,7 @@ public FixedPoint2 ReactionTile(TileRef tile, FixedPoint2 reactVolume, IEntityMa
 
             foreach (var reaction in TileReactions)
             {
-                removed += reaction.TileReact(tile, this, reactVolume - removed, entityManager);
+                removed += reaction.TileReact(tile, this, reactVolume - removed, entityManager, data);
 
                 if (removed > reactVolume)
                     throw new Exception("Removed more than we have!");
diff --git a/Content.Shared/Chemistry/Reagent/ReagentQuantity.cs b/Content.Shared/Chemistry/Reagent/ReagentQuantity.cs
index 9644f919f74..4cc87f5bd78 100644
--- a/Content.Shared/Chemistry/Reagent/ReagentQuantity.cs
+++ b/Content.Shared/Chemistry/Reagent/ReagentQuantity.cs
@@ -17,7 +17,7 @@ public partial struct ReagentQuantity : IEquatable<ReagentQuantity>
     [ViewVariables]
     public ReagentId Reagent { get; private set; }
 
-    public ReagentQuantity(string reagentId, FixedPoint2 quantity, ReagentData? data)
+    public ReagentQuantity(string reagentId, FixedPoint2 quantity, List<ReagentData>? data = null)
         : this(new ReagentId(reagentId, data), quantity)
     {
     }
@@ -37,7 +37,7 @@ public override string ToString()
         return Reagent.ToString(Quantity);
     }
 
-    public void Deconstruct(out string prototype, out FixedPoint2 quantity, out ReagentData? data)
+    public void Deconstruct(out string prototype, out FixedPoint2 quantity, out List<ReagentData>? data)
     {
         prototype = Reagent.Prototype;
         quantity = Quantity;
diff --git a/Content.Shared/Climbing/Systems/ClimbSystem.cs b/Content.Shared/Climbing/Systems/ClimbSystem.cs
index 726cdc24687..635bf36049b 100644
--- a/Content.Shared/Climbing/Systems/ClimbSystem.cs
+++ b/Content.Shared/Climbing/Systems/ClimbSystem.cs
@@ -1,5 +1,4 @@
 using Content.Shared.ActionBlocker;
-using Content.Shared.Body.Systems;
 using Content.Shared.Buckle.Components;
 using Content.Shared.Climbing.Components;
 using Content.Shared.Climbing.Events;
@@ -44,6 +43,7 @@ public sealed partial class ClimbSystem : VirtualController
     private const string ClimbingFixtureName = "climb";
     private const int ClimbingCollisionGroup = (int) (CollisionGroup.TableLayer | CollisionGroup.LowImpassable);
 
+    private EntityQuery<ClimbableComponent> _climbableQuery;
     private EntityQuery<FixturesComponent> _fixturesQuery;
     private EntityQuery<TransformComponent> _xformQuery;
 
@@ -51,6 +51,7 @@ public override void Initialize()
     {
         base.Initialize();
 
+        _climbableQuery = GetEntityQuery<ClimbableComponent>();
         _fixturesQuery = GetEntityQuery<FixturesComponent>();
         _xformQuery = GetEntityQuery<TransformComponent>();
 
@@ -350,12 +351,39 @@ private void OnClimbEndCollide(EntityUid uid, ClimbingComponent component, ref E
     {
         if (args.OurFixtureId != ClimbingFixtureName
             || !component.IsClimbing
-            || component.NextTransition != null
-            || args.OurFixture.Contacts.Count > 1)
+            || component.NextTransition != null)
         {
             return;
         }
 
+        if (args.OurFixture.Contacts.Count > 1)
+        {
+            foreach (var contact in args.OurFixture.Contacts.Values)
+            {
+                if (!contact.IsTouching)
+                    continue;
+
+                var otherEnt = contact.EntityA;
+                var otherFixture = contact.FixtureA;
+                var otherFixtureId = contact.FixtureAId;
+                if (uid == contact.EntityA)
+                {
+                    otherEnt = contact.EntityB;
+                    otherFixture = contact.FixtureB;
+                    otherFixtureId = contact.FixtureBId;
+                }
+
+                if (args.OtherEntity == otherEnt && args.OtherFixtureId == otherFixtureId)
+                    continue;
+
+                if (otherFixture is { Hard: true } &&
+                    _climbableQuery.HasComp(otherEnt))
+                {
+                    return;
+                }
+            }
+        }
+
         foreach (var otherFixture in args.OurFixture.Contacts.Keys)
         {
             // If it's the other fixture then ignore em
diff --git a/Content.Shared/Clock/ClockComponent.cs b/Content.Shared/Clock/ClockComponent.cs
new file mode 100644
index 00000000000..3a1027d8136
--- /dev/null
+++ b/Content.Shared/Clock/ClockComponent.cs
@@ -0,0 +1,42 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Clock;
+
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(SharedClockSystem))]
+[AutoGenerateComponentState]
+public sealed partial class ClockComponent : Component
+{
+    /// <summary>
+    /// If not null, this time will be permanently shown.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan? StuckTime;
+
+    /// <summary>
+    /// The format in which time is displayed.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public ClockType ClockType = ClockType.TwelveHour;
+
+    [DataField]
+    public string HoursBase = "hours_";
+
+    [DataField]
+    public string MinutesBase = "minutes_";
+}
+
+[Serializable, NetSerializable]
+public enum ClockType : byte
+{
+    TwelveHour,
+    TwentyFourHour
+}
+
+[Serializable, NetSerializable]
+public enum ClockVisualLayers : byte
+{
+    HourHand,
+    MinuteHand
+}
diff --git a/Content.Shared/Clock/GlobalTimeManagerComponent.cs b/Content.Shared/Clock/GlobalTimeManagerComponent.cs
new file mode 100644
index 00000000000..764b578b250
--- /dev/null
+++ b/Content.Shared/Clock/GlobalTimeManagerComponent.cs
@@ -0,0 +1,16 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Clock;
+
+/// <summary>
+/// This is used for globally managing the time on-station
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause, Access(typeof(SharedClockSystem))]
+public sealed partial class GlobalTimeManagerComponent : Component
+{
+    /// <summary>
+    /// A fixed random offset, used to fuzz the time between shifts.
+    /// </summary>
+    [DataField, AutoPausedField, AutoNetworkedField]
+    public TimeSpan TimeOffset;
+}
diff --git a/Content.Shared/Clock/SharedClockSystem.cs b/Content.Shared/Clock/SharedClockSystem.cs
new file mode 100644
index 00000000000..0a7c1b01b2c
--- /dev/null
+++ b/Content.Shared/Clock/SharedClockSystem.cs
@@ -0,0 +1,66 @@
+using System.Linq;
+using Content.Shared.Examine;
+using Content.Shared.GameTicking;
+
+namespace Content.Shared.Clock;
+
+public abstract class SharedClockSystem : EntitySystem
+{
+    [Dependency] private readonly SharedGameTicker _ticker = default!;
+
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<ClockComponent, ExaminedEvent>(OnExamined);
+    }
+
+    private void OnExamined(Entity<ClockComponent> ent, ref ExaminedEvent args)
+    {
+        if (!args.IsInDetailsRange)
+            return;
+
+        args.PushMarkup(Loc.GetString("clock-examine", ("time", GetClockTimeText(ent))));
+    }
+
+    public string GetClockTimeText(Entity<ClockComponent> ent)
+    {
+        var time = GetClockTime(ent);
+        switch (ent.Comp.ClockType)
+        {
+            case ClockType.TwelveHour:
+                return time.ToString(@"h\:mm");
+            case ClockType.TwentyFourHour:
+                return time.ToString(@"hh\:mm");
+            default:
+                throw new ArgumentOutOfRangeException();
+        }
+    }
+
+    private TimeSpan GetGlobalTime()
+    {
+        return (EntityQuery<GlobalTimeManagerComponent>().FirstOrDefault()?.TimeOffset ?? TimeSpan.Zero) + _ticker.RoundDuration();
+    }
+
+    public TimeSpan GetClockTime(Entity<ClockComponent> ent)
+    {
+        var comp = ent.Comp;
+
+        if (comp.StuckTime != null)
+            return comp.StuckTime.Value;
+
+        var time = GetGlobalTime();
+
+        switch (comp.ClockType)
+        {
+            case ClockType.TwelveHour:
+                var adjustedHours = time.Hours % 12;
+                if (adjustedHours == 0)
+                    adjustedHours = 12;
+                return new TimeSpan(adjustedHours, time.Minutes, time.Seconds);
+            case ClockType.TwentyFourHour:
+                return time;
+            default:
+                throw new ArgumentOutOfRangeException();
+        }
+    }
+}
diff --git a/Content.Shared/Clothing/ClothingSpeedModifierComponent.cs b/Content.Shared/Clothing/ClothingSpeedModifierComponent.cs
index c3c4baf19d0..866ce38a572 100644
--- a/Content.Shared/Clothing/ClothingSpeedModifierComponent.cs
+++ b/Content.Shared/Clothing/ClothingSpeedModifierComponent.cs
@@ -3,20 +3,18 @@
 
 namespace Content.Shared.Clothing;
 
+/// <summary>
+/// Modifies speed when worn and activated.
+/// Supports <c>ItemToggleComponent</c>.
+/// </summary>
 [RegisterComponent, NetworkedComponent, Access(typeof(ClothingSpeedModifierSystem))]
 public sealed partial class ClothingSpeedModifierComponent : Component
 {
-    [DataField("walkModifier", required: true)] [ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float WalkModifier = 1.0f;
 
-    [DataField("sprintModifier", required: true)] [ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float SprintModifier = 1.0f;
-
-    /// <summary>
-    ///     Is this clothing item currently 'actively' slowing you down?
-    ///     e.g. magboots can be turned on and off.
-    /// </summary>
-    [DataField("enabled")] public bool Enabled = true;
 }
 
 [Serializable, NetSerializable]
@@ -25,12 +23,9 @@ public sealed class ClothingSpeedModifierComponentState : ComponentState
     public float WalkModifier;
     public float SprintModifier;
 
-    public bool Enabled;
-
-    public ClothingSpeedModifierComponentState(float walkModifier, float sprintModifier, bool enabled)
+    public ClothingSpeedModifierComponentState(float walkModifier, float sprintModifier)
     {
         WalkModifier = walkModifier;
         SprintModifier = sprintModifier;
-        Enabled = enabled;
     }
 }
diff --git a/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs b/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs
index 4198c5c165b..21afd4e591d 100644
--- a/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs
+++ b/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs
@@ -1,11 +1,10 @@
-using Content.Shared.Actions;
 using Content.Shared.Clothing.Components;
 using Content.Shared.Examine;
-using Content.Shared.IdentityManagement;
 using Content.Shared.Inventory;
+using Content.Shared.Item.ItemToggle;
+using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.Movement.Systems;
 using Content.Shared.PowerCell;
-using Content.Shared.Toggleable;
 using Content.Shared.Verbs;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
@@ -15,13 +14,10 @@ namespace Content.Shared.Clothing;
 
 public sealed class ClothingSpeedModifierSystem : EntitySystem
 {
-    [Dependency] private readonly SharedActionsSystem _actions = default!;
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-    [Dependency] private readonly ClothingSpeedModifierSystem _clothingSpeedModifier = default!;
     [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly ExamineSystemShared _examine = default!;
     [Dependency] private readonly MovementSpeedModifierSystem _movementSpeed = default!;
-    [Dependency] private readonly SharedPowerCellSystem _powerCell = default!;
+    [Dependency] private readonly ItemToggleSystem _toggle = default!;
 
     public override void Initialize()
     {
@@ -31,39 +27,12 @@ public override void Initialize()
         SubscribeLocalEvent<ClothingSpeedModifierComponent, ComponentHandleState>(OnHandleState);
         SubscribeLocalEvent<ClothingSpeedModifierComponent, InventoryRelayedEvent<RefreshMovementSpeedModifiersEvent>>(OnRefreshMoveSpeed);
         SubscribeLocalEvent<ClothingSpeedModifierComponent, GetVerbsEvent<ExamineVerb>>(OnClothingVerbExamine);
-
-        SubscribeLocalEvent<ToggleClothingSpeedComponent, GetVerbsEvent<ActivationVerb>>(AddToggleVerb);
-        SubscribeLocalEvent<ToggleClothingSpeedComponent, GetItemActionsEvent>(OnGetActions);
-        SubscribeLocalEvent<ToggleClothingSpeedComponent, ToggleClothingSpeedEvent>(OnToggleSpeed);
-        SubscribeLocalEvent<ToggleClothingSpeedComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<ToggleClothingSpeedComponent, PowerCellSlotEmptyEvent>(OnPowerCellSlotEmpty);
+        SubscribeLocalEvent<ClothingSpeedModifierComponent, ItemToggledEvent>(OnToggled);
     }
 
-    // Public API
-
-    public void SetClothingSpeedModifierEnabled(EntityUid uid, bool enabled, ClothingSpeedModifierComponent? component = null)
-    {
-        if (!Resolve(uid, ref component, false))
-            return;
-
-        if (component.Enabled != enabled)
-        {
-            component.Enabled = enabled;
-            Dirty(uid, component);
-
-            // inventory system will automatically hook into the event raised by this and update accordingly
-            if (_container.TryGetContainingContainer(uid, out var container))
-            {
-                _movementSpeed.RefreshMovementSpeedModifiers(container.Owner);
-            }
-        }
-    }
-
-    // Event handlers
-
     private void OnGetState(EntityUid uid, ClothingSpeedModifierComponent component, ref ComponentGetState args)
     {
-        args.State = new ClothingSpeedModifierComponentState(component.WalkModifier, component.SprintModifier, component.Enabled);
+        args.State = new ClothingSpeedModifierComponentState(component.WalkModifier, component.SprintModifier);
     }
 
     private void OnHandleState(EntityUid uid, ClothingSpeedModifierComponent component, ref ComponentHandleState args)
@@ -71,17 +40,15 @@ private void OnHandleState(EntityUid uid, ClothingSpeedModifierComponent compone
         if (args.Current is not ClothingSpeedModifierComponentState state)
             return;
 
-        var diff = component.Enabled != state.Enabled ||
-                   !MathHelper.CloseTo(component.SprintModifier, state.SprintModifier) ||
+        var diff = !MathHelper.CloseTo(component.SprintModifier, state.SprintModifier) ||
                    !MathHelper.CloseTo(component.WalkModifier, state.WalkModifier);
 
         component.WalkModifier = state.WalkModifier;
         component.SprintModifier = state.SprintModifier;
-        component.Enabled = state.Enabled;
 
         // Avoid raising the event for the container if nothing changed.
         // We'll still set the values in case they're slightly different but within tolerance.
-        if (diff && _container.TryGetContainingContainer(uid, out var container))
+        if (diff && _container.TryGetContainingContainer((uid, null, null), out var container))
         {
             _movementSpeed.RefreshMovementSpeedModifiers(container.Owner);
         }
@@ -89,10 +56,8 @@ private void OnHandleState(EntityUid uid, ClothingSpeedModifierComponent compone
 
     private void OnRefreshMoveSpeed(EntityUid uid, ClothingSpeedModifierComponent component, InventoryRelayedEvent<RefreshMovementSpeedModifiersEvent> args)
     {
-        if (!component.Enabled)
-            return;
-
-        args.Args.ModifySpeed(component.WalkModifier, component.SprintModifier);
+        if (_toggle.IsActivated(uid))
+            args.Args.ModifySpeed(component.WalkModifier, component.SprintModifier);
     }
 
     private void OnClothingVerbExamine(EntityUid uid, ClothingSpeedModifierComponent component, GetVerbsEvent<ExamineVerb> args)
@@ -142,60 +107,15 @@ private void OnClothingVerbExamine(EntityUid uid, ClothingSpeedModifierComponent
         _examine.AddDetailedExamineVerb(args, component, msg, Loc.GetString("clothing-speed-examinable-verb-text"), "/Textures/Interface/VerbIcons/outfit.svg.192dpi.png", Loc.GetString("clothing-speed-examinable-verb-message"));
     }
 
-    private void OnMapInit(Entity<ToggleClothingSpeedComponent> uid, ref MapInitEvent args)
-    {
-        _actions.AddAction(uid, ref uid.Comp.ToggleActionEntity, uid.Comp.ToggleAction);
-    }
-
-    private void OnToggleSpeed(Entity<ToggleClothingSpeedComponent> uid, ref ToggleClothingSpeedEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        args.Handled = true;
-        SetSpeedToggleEnabled(uid, !uid.Comp.Enabled, args.Performer);
-    }
-
-    private void SetSpeedToggleEnabled(Entity<ToggleClothingSpeedComponent> uid, bool value, EntityUid? user)
+    private void OnToggled(Entity<ClothingSpeedModifierComponent> ent, ref ItemToggledEvent args)
     {
-        if (uid.Comp.Enabled == value)
-            return;
-
-        TryComp<PowerCellDrawComponent>(uid, out var draw);
-        if (value && !_powerCell.HasDrawCharge(uid, draw, user: user))
-            return;
+        // make sentient boots slow or fast too
+        _movementSpeed.RefreshMovementSpeedModifiers(ent);
 
-        uid.Comp.Enabled = value;
-
-        _appearance.SetData(uid, ToggleVisuals.Toggled, uid.Comp.Enabled);
-        _actions.SetToggled(uid.Comp.ToggleActionEntity, uid.Comp.Enabled);
-        _clothingSpeedModifier.SetClothingSpeedModifierEnabled(uid.Owner, uid.Comp.Enabled);
-        _powerCell.SetPowerCellDrawEnabled(uid, uid.Comp.Enabled, draw);
-        Dirty(uid, uid.Comp);
-    }
-
-    private void AddToggleVerb(Entity<ToggleClothingSpeedComponent> uid, ref GetVerbsEvent<ActivationVerb> args)
-    {
-        if (!args.CanAccess || !args.CanInteract)
-            return;
-
-        var user = args.User;
-        ActivationVerb verb = new()
+        if (_container.TryGetContainingContainer((ent.Owner, null, null), out var container))
         {
-            Text = Loc.GetString("toggle-clothing-verb-text",
-                ("entity", Identity.Entity(uid, EntityManager))),
-            Act = () => SetSpeedToggleEnabled(uid, !uid.Comp.Enabled, user)
-        };
-        args.Verbs.Add(verb);
-    }
-
-    private void OnGetActions(Entity<ToggleClothingSpeedComponent> uid, ref GetItemActionsEvent args)
-    {
-        args.AddAction(ref uid.Comp.ToggleActionEntity, uid.Comp.ToggleAction);
-    }
-
-    private void OnPowerCellSlotEmpty(Entity<ToggleClothingSpeedComponent> uid, ref PowerCellSlotEmptyEvent args)
-    {
-        SetSpeedToggleEnabled(uid, false, null);
+            // inventory system will automatically hook into the event raised by this and update accordingly
+            _movementSpeed.RefreshMovementSpeedModifiers(container.Owner);
+        }
     }
 }
diff --git a/Content.Shared/Clothing/Components/ClothingComponent.cs b/Content.Shared/Clothing/Components/ClothingComponent.cs
index 846a78b8680..581125d4fe3 100644
--- a/Content.Shared/Clothing/Components/ClothingComponent.cs
+++ b/Content.Shared/Clothing/Components/ClothingComponent.cs
@@ -59,18 +59,6 @@ public sealed partial class ClothingComponent : Component
     [DataField("sprite")]
     public string? RsiPath;
 
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("maleMask")]
-    public ClothingMask MaleMask = ClothingMask.UniformFull;
-
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("femaleMask")]
-    public ClothingMask FemaleMask = ClothingMask.UniformFull;
-
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("unisexMask")]
-    public ClothingMask UnisexMask = ClothingMask.UniformFull;
-
     /// <summary>
     /// Name of the inventory slot the clothing is in.
     /// </summary>
diff --git a/Content.Shared/Clothing/Components/FoldableClothingComponent.cs b/Content.Shared/Clothing/Components/FoldableClothingComponent.cs
index 1a40d1dca12..ffcb52b4576 100644
--- a/Content.Shared/Clothing/Components/FoldableClothingComponent.cs
+++ b/Content.Shared/Clothing/Components/FoldableClothingComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Humanoid;
 using Content.Shared.Inventory;
 using Robust.Shared.GameStates;
 
@@ -30,4 +31,16 @@ public sealed partial class FoldableClothingComponent : Component
     /// </summary>
     [DataField]
     public string? FoldedHeldPrefix;
+
+    /// <summary>
+    /// Which layers does this hide when Unfolded? See <see cref="HumanoidVisualLayers"/> and <see cref="HideLayerClothingComponent"/>
+    /// </summary>
+    [DataField]
+    public HashSet<HumanoidVisualLayers> UnfoldedHideLayers = new();
+
+    /// <summary>
+    /// Which layers does this hide when folded? See <see cref="HumanoidVisualLayers"/> and <see cref="HideLayerClothingComponent"/>
+    /// </summary>
+    [DataField]
+    public HashSet<HumanoidVisualLayers> FoldedHideLayers = new();
 }
diff --git a/Content.Shared/Clothing/Components/LoadoutComponent.cs b/Content.Shared/Clothing/Components/LoadoutComponent.cs
index 15d0d60af55..58a46bab362 100644
--- a/Content.Shared/Clothing/Components/LoadoutComponent.cs
+++ b/Content.Shared/Clothing/Components/LoadoutComponent.cs
@@ -9,10 +9,8 @@ namespace Content.Shared.Clothing.Components;
 public sealed partial class LoadoutComponent : Component
 {
     /// <summary>
-    /// A list of starting gears, of which one will be given.
+    /// A list of starting gears, of which one will be given, before RoleLoadouts are equipped.
     /// All elements are weighted the same in the list.
-    ///
-    /// If not specified, <see cref="RoleLoadout"/> will be used instead.
     /// </summary>
     [DataField("prototypes")]
     [AutoNetworkedField]
@@ -21,8 +19,6 @@ public sealed partial class LoadoutComponent : Component
     /// <summary>
     /// A list of role loadouts, of which one will be given.
     /// All elements are weighted the same in the list.
-    ///
-    /// If not specified, <see cref="StartingGear"/> will be used instead.
     /// </summary>
     [DataField]
     [AutoNetworkedField]
diff --git a/Content.Shared/Clothing/Components/MaskComponent.cs b/Content.Shared/Clothing/Components/MaskComponent.cs
index 5430417a8cd..41b2b797f5d 100644
--- a/Content.Shared/Clothing/Components/MaskComponent.cs
+++ b/Content.Shared/Clothing/Components/MaskComponent.cs
@@ -22,4 +22,16 @@ public sealed partial class MaskComponent : Component
 
     [DataField, AutoNetworkedField]
     public string EquippedPrefix = "toggled";
+
+    /// <summary>
+    /// When <see langword="true"/> will function normally, otherwise will not react to events
+    /// </summary>
+    [DataField("enabled"), AutoNetworkedField]
+    public bool IsEnabled = true;
+
+    /// <summary>
+    /// When <see langword="true"/> will disable <see cref="IsEnabled"/> when folded
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool DisableOnFolded;
 }
diff --git a/Content.Shared/Clothing/Components/StealthClothingComponent.cs b/Content.Shared/Clothing/Components/StealthClothingComponent.cs
deleted file mode 100644
index fedf48b36ed..00000000000
--- a/Content.Shared/Clothing/Components/StealthClothingComponent.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using Content.Shared.Actions;
-using Content.Shared.Clothing.EntitySystems;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.Clothing.Components;
-
-/// <summary>
-/// Adds StealthComponent to the user when enabled, either by an action or the system's SetEnabled method.
-/// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true), Access(typeof(StealthClothingSystem))]
-public sealed partial class StealthClothingComponent : Component
-{
-    /// <summary>
-    /// Whether stealth effect is enabled.
-    /// </summary>
-    [DataField("enabled"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
-    public bool Enabled;
-
-    /// <summary>
-    /// Number added to MinVisibility when stealthed, to make the user not fully invisible.
-    /// </summary>
-    [DataField("visibility"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
-    public float Visibility;
-
-    [DataField("toggleAction", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string ToggleAction = "ActionTogglePhaseCloak";
-
-    /// <summary>
-    /// The action for enabling and disabling stealth.
-    /// </summary>
-    [DataField, AutoNetworkedField] public EntityUid? ToggleActionEntity;
-}
-
-/// <summary>
-/// When stealth is enabled, disables it.
-/// When it is disabled, raises <see cref="AttemptStealthEvent"/> before enabling.
-/// Put any checks in a handler for that event to cancel it.
-/// </summary>
-public sealed partial class ToggleStealthEvent : InstantActionEvent
-{
-}
diff --git a/Content.Shared/Clothing/Components/ToggleClothingComponent.cs b/Content.Shared/Clothing/Components/ToggleClothingComponent.cs
new file mode 100644
index 00000000000..c77aa03475f
--- /dev/null
+++ b/Content.Shared/Clothing/Components/ToggleClothingComponent.cs
@@ -0,0 +1,40 @@
+using Content.Shared.Actions;
+using Content.Shared.Clothing.EntitySystems;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Clothing.Components;
+
+/// <summary>
+/// Clothing that can be enabled and disabled with an action.
+/// Requires <see cref="ItemToggleComponent"/>.
+/// </summary>
+/// <remarks>
+/// Not to be confused with <see cref="ToggleableClothingComponent"/> for hardsuit helmets and such.
+/// </remarks>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(ToggleClothingSystem))]
+public sealed partial class ToggleClothingComponent : Component
+{
+    /// <summary>
+    /// The action to add when equipped, even if not worn.
+    /// This must raise <see cref="ToggleActionEvent"/> to then get handled.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId<InstantActionComponent> Action = string.Empty;
+
+    [DataField, AutoNetworkedField]
+    public EntityUid? ActionEntity;
+
+    /// <summary>
+    /// If true, automatically disable the clothing after unequipping it.
+    /// </summary>
+    [DataField]
+    public bool DisableOnUnequip;
+}
+
+/// <summary>
+/// Raised on the clothing when being equipped to see if it should add the action.
+/// </summary>
+[ByRefEvent]
+public record struct ToggleClothingCheckEvent(EntityUid User, bool Cancelled = false);
diff --git a/Content.Shared/Clothing/Components/ToggleClothingSpeedComponent.cs b/Content.Shared/Clothing/Components/ToggleClothingSpeedComponent.cs
deleted file mode 100644
index 90b2d7322e0..00000000000
--- a/Content.Shared/Clothing/Components/ToggleClothingSpeedComponent.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Content.Shared.Actions;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Clothing.Components;
-
-/// <summary>
-/// This is used for a clothing item that gives a speed modification that is toggleable.
-/// </summary>
-[RegisterComponent, NetworkedComponent, Access(typeof(ClothingSpeedModifierSystem)), AutoGenerateComponentState]
-public sealed partial class ToggleClothingSpeedComponent : Component
-{
-    /// <summary>
-    /// The action for toggling the clothing.
-    /// </summary>
-    [DataField]
-    public EntProtoId ToggleAction = "ActionToggleSpeedBoots";
-
-    /// <summary>
-    /// The action entity
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public EntityUid? ToggleActionEntity;
-
-    /// <summary>
-    /// The state of the toggle.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public bool Enabled;
-}
-
-public sealed partial class ToggleClothingSpeedEvent : InstantActionEvent
-{
-
-}
diff --git a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
index 381edc68baa..082b040a320 100644
--- a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
@@ -162,7 +162,7 @@ private void OnHandleState(EntityUid uid, ClothingComponent component, ref Compo
         if (args.Current is ClothingComponentState state)
         {
             SetEquippedPrefix(uid, state.EquippedPrefix, component);
-            if (component.InSlot != null && _containerSys.TryGetContainingContainer(uid, out var container))
+            if (component.InSlot != null && _containerSys.TryGetContainingContainer((uid, null, null), out var container))
             {
                 CheckEquipmentForLayerHide(uid, container.Owner);
             }
@@ -233,7 +233,6 @@ public void CopyVisuals(EntityUid uid, ClothingComponent otherClothing, Clothing
         clothing.ClothingVisuals = otherClothing.ClothingVisuals;
         clothing.EquippedPrefix = otherClothing.EquippedPrefix;
         clothing.RsiPath = otherClothing.RsiPath;
-        clothing.FemaleMask = otherClothing.FemaleMask;
 
         _itemSys.VisualsChanged(uid);
         Dirty(uid, clothing);
diff --git a/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs
index be55588ddd5..603af4099c8 100644
--- a/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs
@@ -47,6 +47,10 @@ private void OnFolded(Entity<FoldableClothingComponent> ent, ref FoldedEvent arg
 
             if (ent.Comp.FoldedHeldPrefix != null)
                 _itemSystem.SetHeldPrefix(ent.Owner, ent.Comp.FoldedHeldPrefix, false, itemComp);
+
+            if (TryComp<HideLayerClothingComponent>(ent.Owner, out var hideLayerComp))
+                hideLayerComp.Slots = ent.Comp.FoldedHideLayers;
+
         }
         else
         {
@@ -59,6 +63,9 @@ private void OnFolded(Entity<FoldableClothingComponent> ent, ref FoldedEvent arg
             if (ent.Comp.FoldedHeldPrefix != null)
                 _itemSystem.SetHeldPrefix(ent.Owner, null, false, itemComp);
 
+            if (TryComp<HideLayerClothingComponent>(ent.Owner, out var hideLayerComp))
+                hideLayerComp.Slots = ent.Comp.UnfoldedHideLayers;
+
         }
     }
 }
diff --git a/Content.Shared/Clothing/EntitySystems/MaskSystem.cs b/Content.Shared/Clothing/EntitySystems/MaskSystem.cs
index 2a4383279a5..fd0b7e782bf 100644
--- a/Content.Shared/Clothing/EntitySystems/MaskSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/MaskSystem.cs
@@ -35,7 +35,7 @@ private void OnGetActions(EntityUid uid, MaskComponent component, GetItemActions
     private void OnToggleMask(Entity<MaskComponent> ent, ref ToggleMaskEvent args)
     {
         var (uid, mask) = ent;
-        if (mask.ToggleActionEntity == null || !_timing.IsFirstTimePredicted)
+        if (mask.ToggleActionEntity == null || !_timing.IsFirstTimePredicted || !mask.IsEnabled)
             return;
 
         if (!_inventorySystem.TryGetSlotEntity(args.Performer, "mask", out var existing) || !uid.Equals(existing))
@@ -53,7 +53,7 @@ private void OnToggleMask(Entity<MaskComponent> ent, ref ToggleMaskEvent args)
     // set to untoggled when unequipped, so it isn't left in a 'pulled down' state
     private void OnGotUnequipped(EntityUid uid, MaskComponent mask, GotUnequippedEvent args)
     {
-        if (!mask.IsToggled)
+        if (!mask.IsToggled || !mask.IsEnabled)
             return;
 
         mask.IsToggled = false;
@@ -78,6 +78,8 @@ private void ToggleMaskComponents(EntityUid uid, MaskComponent mask, EntityUid w
 
     private void OnFolded(Entity<MaskComponent> ent, ref FoldedEvent args)
     {
+        if (ent.Comp.DisableOnFolded)
+            ent.Comp.IsEnabled = !args.IsFolded;
         ent.Comp.IsToggled = args.IsFolded;
 
         ToggleMaskComponents(ent.Owner, ent.Comp, ent.Owner);
diff --git a/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs
index fced03bfabf..f5df04037ee 100644
--- a/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs
@@ -78,7 +78,7 @@ protected virtual void UpdateSprite(EntityUid uid, EntityPrototype proto) { }
     public bool IsValidTarget(EntityPrototype proto, SlotFlags chameleonSlot = SlotFlags.NONE)
     {
         // check if entity is valid
-        if (proto.Abstract || proto.NoSpawn)
+        if (proto.Abstract || proto.HideSpawnMenu)
             return false;
 
         // check if it is marked as valid chameleon target
diff --git a/Content.Shared/Clothing/EntitySystems/StealthClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/StealthClothingSystem.cs
deleted file mode 100644
index 17db1f98de0..00000000000
--- a/Content.Shared/Clothing/EntitySystems/StealthClothingSystem.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-using Content.Shared.Actions;
-using Content.Shared.Clothing.Components;
-using Content.Shared.Inventory.Events;
-using Content.Shared.Stealth;
-using Content.Shared.Stealth.Components;
-
-namespace Content.Shared.Clothing.EntitySystems;
-
-/// <summary>
-/// Handles the toggle action and disables stealth when clothing is unequipped.
-/// </summary>
-public sealed class StealthClothingSystem : EntitySystem
-{
-    [Dependency] private readonly SharedStealthSystem _stealth = default!;
-    [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<StealthClothingComponent, GetItemActionsEvent>(OnGetItemActions);
-        SubscribeLocalEvent<StealthClothingComponent, ToggleStealthEvent>(OnToggleStealth);
-        SubscribeLocalEvent<StealthClothingComponent, AfterAutoHandleStateEvent>(OnHandleState);
-        SubscribeLocalEvent<StealthClothingComponent, GotUnequippedEvent>(OnUnequipped);
-        SubscribeLocalEvent<StealthClothingComponent, MapInitEvent>(OnMapInit);
-    }
-
-    private void OnMapInit(EntityUid uid, StealthClothingComponent component, MapInitEvent args)
-    {
-        _actionContainer.EnsureAction(uid, ref component.ToggleActionEntity, component.ToggleAction);
-        Dirty(uid, component);
-    }
-
-    /// <summary>
-    /// Sets the clothing's stealth effect for the user.
-    /// </summary>
-    /// <returns>True if it was changed, false otherwise</returns>
-    public bool SetEnabled(EntityUid uid, EntityUid user, bool enabled, StealthClothingComponent? comp = null)
-    {
-        if (!Resolve(uid, ref comp) || comp.Enabled == enabled)
-            return false;
-
-        // TODO remove this when clothing unequip on delete is less sus
-        // prevent debug assert when ending round and its disabled
-        if (MetaData(user).EntityLifeStage >= EntityLifeStage.Terminating)
-            return false;
-
-        // can't enable stealth if something else already enabled it, and vice versa
-        var stealth = EnsureComp<StealthComponent>(user);
-        if (stealth.Enabled == enabled)
-            return false;
-
-        comp.Enabled = enabled;
-        Dirty(uid, comp);
-
-        // slightly visible, but doesn't change when moving so it's ok
-        var visibility = enabled ? stealth.MinVisibility + comp.Visibility : stealth.MaxVisibility;
-        _stealth.SetVisibility(user, visibility, stealth);
-        _stealth.SetEnabled(user, enabled, stealth);
-        return true;
-    }
-
-    /// <summary>
-    /// Raise <see cref="AddStealthActionEvent"/> then add the toggle action if it was not cancelled.
-    /// </summary>
-    private void OnGetItemActions(EntityUid uid, StealthClothingComponent comp, GetItemActionsEvent args)
-    {
-        var ev = new AddStealthActionEvent(args.User);
-        RaiseLocalEvent(uid, ev);
-        if (ev.Cancelled)
-            return;
-
-        args.AddAction(ref comp.ToggleActionEntity, comp.ToggleAction);
-    }
-
-    /// <summary>
-    /// Raises <see cref="AttemptStealthEvent"/> if enabling.
-    /// </summary>
-    private void OnToggleStealth(EntityUid uid, StealthClothingComponent comp, ToggleStealthEvent args)
-    {
-        args.Handled = true;
-        var user = args.Performer;
-        if (comp.Enabled)
-        {
-            SetEnabled(uid, user, false, comp);
-            return;
-        }
-
-        var ev = new AttemptStealthEvent(user);
-        RaiseLocalEvent(uid, ev);
-        if (ev.Cancelled)
-            return;
-
-        SetEnabled(uid, user, true, comp);
-    }
-
-    /// <summary>
-    /// Calls <see cref="SetEnabled"/> when server sends new state.
-    /// </summary>
-    private void OnHandleState(EntityUid uid, StealthClothingComponent comp, ref AfterAutoHandleStateEvent args)
-    {
-        // SetEnabled checks if it is the same, so change it to before state was received from the server
-        var enabled = comp.Enabled;
-        comp.Enabled = !enabled;
-        var user = Transform(uid).ParentUid;
-        SetEnabled(uid, user, enabled, comp);
-    }
-
-    /// <summary>
-    /// Force unstealths the user, doesnt remove StealthComponent since other things might use it
-    /// </summary>
-    private void OnUnequipped(EntityUid uid, StealthClothingComponent comp, GotUnequippedEvent args)
-    {
-        SetEnabled(uid, args.Equipee, false, comp);
-    }
-}
-
-/// <summary>
-/// Raised on the stealth clothing when attempting to add an action.
-/// </summary>
-public sealed class AddStealthActionEvent : CancellableEntityEventArgs
-{
-    /// <summary>
-    /// User that equipped the stealth clothing.
-    /// </summary>
-    public EntityUid User;
-
-    public AddStealthActionEvent(EntityUid user)
-    {
-        User = user;
-    }
-}
-
-/// <summary>
-/// Raised on the stealth clothing when the user is attemping to enable it.
-/// </summary>
-public sealed class AttemptStealthEvent : CancellableEntityEventArgs
-{
-    /// <summary>
-    /// User that is attempting to enable the stealth clothing.
-    /// </summary>
-    public EntityUid User;
-
-    public AttemptStealthEvent(EntityUid user)
-    {
-        User = user;
-    }
-}
diff --git a/Content.Shared/Clothing/EntitySystems/ToggleClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ToggleClothingSystem.cs
new file mode 100644
index 00000000000..9889376c9d4
--- /dev/null
+++ b/Content.Shared/Clothing/EntitySystems/ToggleClothingSystem.cs
@@ -0,0 +1,58 @@
+using Content.Shared.Actions;
+using Content.Shared.Clothing;
+using Content.Shared.Clothing.Components;
+using Content.Shared.Inventory;
+using Content.Shared.Item.ItemToggle;
+using Content.Shared.Toggleable;
+
+namespace Content.Shared.Clothing.EntitySystems;
+
+/// <summary>
+/// Handles adding and using a toggle action for <see cref="ToggleClothingComponent"/>.
+/// </summary>
+public sealed class ToggleClothingSystem : EntitySystem
+{
+    [Dependency] private readonly SharedActionsSystem _actions = default!;
+    [Dependency] private readonly ItemToggleSystem _toggle = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ToggleClothingComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<ToggleClothingComponent, GetItemActionsEvent>(OnGetActions);
+        SubscribeLocalEvent<ToggleClothingComponent, ToggleActionEvent>(OnToggleAction);
+        SubscribeLocalEvent<ToggleClothingComponent, ClothingGotUnequippedEvent>(OnUnequipped);
+    }
+
+    private void OnMapInit(Entity<ToggleClothingComponent> ent, ref MapInitEvent args)
+    {
+        var (uid, comp) = ent;
+        // test funny
+        if (string.IsNullOrEmpty(comp.Action))
+            return;
+
+        _actions.AddAction(uid, ref comp.ActionEntity, comp.Action);
+        _actions.SetToggled(comp.ActionEntity, _toggle.IsActivated(ent.Owner));
+        Dirty(uid, comp);
+    }
+
+    private void OnGetActions(Entity<ToggleClothingComponent> ent, ref GetItemActionsEvent args)
+    {
+        var ev = new ToggleClothingCheckEvent(args.User);
+        RaiseLocalEvent(ent, ref ev);
+        if (!ev.Cancelled)
+            args.AddAction(ent.Comp.ActionEntity);
+    }
+
+    private void OnToggleAction(Entity<ToggleClothingComponent> ent, ref ToggleActionEvent args)
+    {
+        args.Handled = _toggle.Toggle(ent.Owner, args.Performer);
+    }
+
+    private void OnUnequipped(Entity<ToggleClothingComponent> ent, ref ClothingGotUnequippedEvent args)
+    {
+        if (ent.Comp.DisableOnUnequip)
+            _toggle.TryDeactivate(ent.Owner, args.Wearer);
+    }
+}
diff --git a/Content.Shared/Clothing/LoadoutSystem.cs b/Content.Shared/Clothing/LoadoutSystem.cs
index 1bab86e90fd..2a686efd4ff 100644
--- a/Content.Shared/Clothing/LoadoutSystem.cs
+++ b/Content.Shared/Clothing/LoadoutSystem.cs
@@ -40,12 +40,25 @@ public static string GetJobPrototype(string? loadout)
         return "Job" + loadout;
     }
 
+    public EntProtoId? GetFirstOrNull(LoadoutPrototype loadout)
+    {
+        EntProtoId? proto = null;
+
+        if (_protoMan.TryIndex(loadout.StartingGear, out var gear))
+        {
+            proto = GetFirstOrNull(gear);
+        }
+
+        proto ??= GetFirstOrNull((IEquipmentLoadout)loadout);
+        return proto;
+    }
+
     /// <summary>
     /// Tries to get the first entity prototype for operations such as sprite drawing.
     /// </summary>
-    public EntProtoId? GetFirstOrNull(LoadoutPrototype loadout)
+    public EntProtoId? GetFirstOrNull(IEquipmentLoadout? gear)
     {
-        if (!_protoMan.TryIndex(loadout.Equipment, out var gear))
+        if (gear == null)
             return null;
 
         var count = gear.Equipment.Count + gear.Inhand.Count + gear.Storage.Values.Sum(x => x.Count);
@@ -75,13 +88,23 @@ public static string GetJobPrototype(string? loadout)
         return null;
     }
 
+    public string GetName(LoadoutPrototype loadout)
+    {
+        if (_protoMan.TryIndex(loadout.StartingGear, out var gear))
+        {
+            return GetName(gear);
+        }
+
+        return GetName((IEquipmentLoadout) loadout);
+    }
+
     /// <summary>
     /// Tries to get the name of a loadout.
     /// </summary>
-    public string GetName(LoadoutPrototype loadout)
+    public string GetName(IEquipmentLoadout? gear)
     {
-        if (!_protoMan.TryIndex(loadout.Equipment, out var gear))
-            return Loc.GetString("loadout-unknown");
+        if (gear == null)
+            return string.Empty;
 
         var count = gear.Equipment.Count + gear.Storage.Values.Sum(o => o.Count) + gear.Inhand.Count;
 
@@ -111,28 +134,42 @@ public string GetName(LoadoutPrototype loadout)
             }
         }
 
-        return Loc.GetString($"loadout-{loadout.ID}");
+        return Loc.GetString($"unknown");
     }
 
     private void OnMapInit(EntityUid uid, LoadoutComponent component, MapInitEvent args)
     {
-        // Use starting gear if specified
-        if (component.StartingGear != null)
+        Equip(uid, component.StartingGear, component.RoleLoadout);
+    }
+
+    public void Equip(EntityUid uid, List<ProtoId<StartingGearPrototype>>? startingGear,
+        List<ProtoId<RoleLoadoutPrototype>>? loadoutGroups)
+    {
+        // First, randomly pick a startingGear profile from those specified, and equip it.
+        if (startingGear != null && startingGear.Count > 0)
+            _station.EquipStartingGear(uid, _random.Pick(startingGear));
+
+        if (loadoutGroups == null)
         {
-            var gear = _protoMan.Index(_random.Pick(component.StartingGear));
-            _station.EquipStartingGear(uid, gear);
+            GearEquipped(uid);
             return;
         }
 
-        if (component.RoleLoadout == null)
-            return;
-
-        // ...otherwise equip from role loadout
-        var id = _random.Pick(component.RoleLoadout);
+        // Then, randomly pick a RoleLoadout profile from those specified, and process/equip all LoadoutGroups from it.
+        // For non-roundstart mobs there is no SelectedLoadout data, so minValue must be set in each LoadoutGroup to force selection.
+        var id = _random.Pick(loadoutGroups);
         var proto = _protoMan.Index(id);
         var loadout = new RoleLoadout(id);
         loadout.SetDefault(GetProfile(uid), _actors.GetSession(uid), _protoMan, true);
         _station.EquipRoleLoadout(uid, loadout, proto);
+
+        GearEquipped(uid);
+    }
+
+    public void GearEquipped(EntityUid uid)
+    {
+        var ev = new StartingGearEquippedEvent(uid);
+        RaiseLocalEvent(uid, ref ev);
     }
 
     public HumanoidCharacterProfile GetProfile(EntityUid? uid)
diff --git a/Content.Shared/Clothing/MagbootsComponent.cs b/Content.Shared/Clothing/MagbootsComponent.cs
index b3fb607a38b..4bef74fd335 100644
--- a/Content.Shared/Clothing/MagbootsComponent.cs
+++ b/Content.Shared/Clothing/MagbootsComponent.cs
@@ -1,23 +1,13 @@
 using Content.Shared.Alert;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Shared.Clothing;
 
-[RegisterComponent, NetworkedComponent(), AutoGenerateComponentState]
+[RegisterComponent, NetworkedComponent]
 [Access(typeof(SharedMagbootsSystem))]
 public sealed partial class MagbootsComponent : Component
 {
-    [DataField]
-    public EntProtoId ToggleAction = "ActionToggleMagboots";
-
-    [DataField, AutoNetworkedField]
-    public EntityUid? ToggleActionEntity;
-
-    [DataField("on"), AutoNetworkedField]
-    public bool On;
-
     [DataField]
     public ProtoId<AlertPrototype> MagbootsAlert = "Magboots";
 
@@ -26,4 +16,10 @@ public sealed partial class MagbootsComponent : Component
     /// </summary>
     [DataField]
     public bool RequiresGrid = true;
+
+    /// <summary>
+    /// Slot the clothing has to be worn in to work.
+    /// </summary>
+    [DataField]
+    public string Slot = "shoes";
 }
diff --git a/Content.Shared/Clothing/MagbootsSystem.cs b/Content.Shared/Clothing/MagbootsSystem.cs
new file mode 100644
index 00000000000..d41f27fefb0
--- /dev/null
+++ b/Content.Shared/Clothing/MagbootsSystem.cs
@@ -0,0 +1,90 @@
+using Content.Shared.Actions;
+using Content.Shared.Alert;
+using Content.Shared.Atmos.Components;
+using Content.Shared.Clothing.EntitySystems;
+using Content.Shared.Gravity;
+using Content.Shared.Inventory;
+using Content.Shared.Item;
+using Content.Shared.Item.ItemToggle;
+using Content.Shared.Item.ItemToggle.Components;
+using Robust.Shared.Containers;
+
+namespace Content.Shared.Clothing;
+
+public sealed class SharedMagbootsSystem : EntitySystem
+{
+    [Dependency] private readonly AlertsSystem _alerts = default!;
+    [Dependency] private readonly ClothingSystem _clothing = default!;
+    [Dependency] private readonly InventorySystem _inventory = default!;
+    [Dependency] private readonly ItemToggleSystem _toggle = default!;
+    [Dependency] private readonly SharedContainerSystem _container = default!;
+    [Dependency] private readonly SharedGravitySystem _gravity = default!;
+    [Dependency] private readonly SharedItemSystem _item = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<MagbootsComponent, ItemToggledEvent>(OnToggled);
+        SubscribeLocalEvent<MagbootsComponent, ClothingGotEquippedEvent>(OnGotEquipped);
+        SubscribeLocalEvent<MagbootsComponent, ClothingGotUnequippedEvent>(OnGotUnequipped);
+        SubscribeLocalEvent<MagbootsComponent, IsWeightlessEvent>(OnIsWeightless);
+        SubscribeLocalEvent<MagbootsComponent, InventoryRelayedEvent<IsWeightlessEvent>>(OnIsWeightless);
+    }
+
+    private void OnToggled(Entity<MagbootsComponent> ent, ref ItemToggledEvent args)
+    {
+        var (uid, comp) = ent;
+        // only stick to the floor if being worn in the correct slot
+        if (_container.TryGetContainingContainer((uid, null, null), out var container) &&
+            _inventory.TryGetSlotEntity(container.Owner, comp.Slot, out var worn)
+            && uid == worn)
+        {
+            UpdateMagbootEffects(container.Owner, ent, args.Activated);
+        }
+
+        var prefix = args.Activated ? "on" : null;
+        _item.SetHeldPrefix(ent, prefix);
+        _clothing.SetEquippedPrefix(ent, prefix);
+    }
+
+    private void OnGotUnequipped(Entity<MagbootsComponent> ent, ref ClothingGotUnequippedEvent args)
+    {
+        UpdateMagbootEffects(args.Wearer, ent, false);
+    }
+
+    private void OnGotEquipped(Entity<MagbootsComponent> ent, ref ClothingGotEquippedEvent args)
+    {
+        UpdateMagbootEffects(args.Wearer, ent, _toggle.IsActivated(ent.Owner));
+    }
+
+    public void UpdateMagbootEffects(EntityUid user, Entity<MagbootsComponent> ent, bool state)
+    {
+        // TODO: public api for this and add access
+        if (TryComp<MovedByPressureComponent>(user, out var moved))
+            moved.Enabled = !state;
+
+        if (state)
+            _alerts.ShowAlert(user, ent.Comp.MagbootsAlert);
+        else
+            _alerts.ClearAlert(user, ent.Comp.MagbootsAlert);
+    }
+
+    private void OnIsWeightless(Entity<MagbootsComponent> ent, ref IsWeightlessEvent args)
+    {
+        if (args.Handled || !_toggle.IsActivated(ent.Owner))
+            return;
+
+        // do not cancel weightlessness if the person is in off-grid.
+        if (ent.Comp.RequiresGrid && !_gravity.EntityOnGravitySupportingGridOrMap(ent.Owner))
+            return;
+
+        args.IsWeightless = false;
+        args.Handled = true;
+    }
+
+    private void OnIsWeightless(Entity<MagbootsComponent> ent, ref InventoryRelayedEvent<IsWeightlessEvent> args)
+    {
+        OnIsWeightless(ent, ref args.Args);
+    }
+}
diff --git a/Content.Shared/Clothing/SharedMagbootsSystem.cs b/Content.Shared/Clothing/SharedMagbootsSystem.cs
deleted file mode 100644
index 68145936152..00000000000
--- a/Content.Shared/Clothing/SharedMagbootsSystem.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-using Content.Shared.Actions;
-using Content.Shared.Alert;
-using Content.Shared.Atmos.Components;
-using Content.Shared.Clothing.EntitySystems;
-using Content.Shared.Gravity;
-using Content.Shared.Inventory;
-using Content.Shared.Item;
-using Content.Shared.Slippery;
-using Content.Shared.Toggleable;
-using Content.Shared.Verbs;
-using Robust.Shared.Containers;
-
-namespace Content.Shared.Clothing;
-
-public sealed class SharedMagbootsSystem : EntitySystem
-{
-    [Dependency] private readonly AlertsSystem _alerts = default!;
-    [Dependency] private readonly ClothingSpeedModifierSystem _clothingSpeedModifier = default!;
-    [Dependency] private readonly ClothingSystem _clothing = default!;
-    [Dependency] private readonly SharedGravitySystem _gravity = default!;
-    [Dependency] private readonly InventorySystem _inventory = default!;
-    [Dependency] private readonly SharedActionsSystem _sharedActions = default!;
-    [Dependency] private readonly SharedActionsSystem _actionContainer = default!;
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-    [Dependency] private readonly SharedContainerSystem _sharedContainer = default!;
-    [Dependency] private readonly SharedItemSystem _item = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<MagbootsComponent, GetVerbsEvent<ActivationVerb>>(AddToggleVerb);
-        SubscribeLocalEvent<MagbootsComponent, InventoryRelayedEvent<SlipAttemptEvent>>(OnSlipAttempt);
-        SubscribeLocalEvent<MagbootsComponent, GetItemActionsEvent>(OnGetActions);
-        SubscribeLocalEvent<MagbootsComponent, ToggleMagbootsEvent>(OnToggleMagboots);
-        SubscribeLocalEvent<MagbootsComponent, MapInitEvent>(OnMapInit);
-
-        SubscribeLocalEvent<MagbootsComponent, ClothingGotEquippedEvent>(OnGotEquipped);
-        SubscribeLocalEvent<MagbootsComponent, ClothingGotUnequippedEvent>(OnGotUnequipped);
-
-        SubscribeLocalEvent<MagbootsComponent, InventoryRelayedEvent<IsWeightlessEvent>>(OnIsWeightless);
-    }
-
-    private void OnMapInit(EntityUid uid, MagbootsComponent component, MapInitEvent args)
-    {
-        _actionContainer.AddAction(uid, ref component.ToggleActionEntity, component.ToggleAction);
-        Dirty(uid, component);
-    }
-
-    private void OnGotUnequipped(EntityUid uid, MagbootsComponent component, ref ClothingGotUnequippedEvent args)
-    {
-        UpdateMagbootEffects(args.Wearer, uid, false, component);
-    }
-
-    private void OnGotEquipped(EntityUid uid, MagbootsComponent component, ref ClothingGotEquippedEvent args)
-    {
-        UpdateMagbootEffects(args.Wearer, uid, true, component);
-    }
-
-    private void OnToggleMagboots(EntityUid uid, MagbootsComponent component, ToggleMagbootsEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        args.Handled = true;
-
-        ToggleMagboots(uid, component);
-    }
-
-    private void ToggleMagboots(EntityUid uid, MagbootsComponent magboots)
-    {
-        magboots.On = !magboots.On;
-
-        if (_sharedContainer.TryGetContainingContainer((uid, Transform(uid)), out var container) &&
-            _inventory.TryGetSlotEntity(container.Owner, "shoes", out var entityUid) && entityUid == uid)
-        {
-            UpdateMagbootEffects(container.Owner, uid, true, magboots);
-        }
-
-        if (TryComp<ItemComponent>(uid, out var item))
-        {
-            _item.SetHeldPrefix(uid, magboots.On ? "on" : null, component: item);
-            _clothing.SetEquippedPrefix(uid, magboots.On ? "on" : null);
-        }
-
-        _appearance.SetData(uid, ToggleVisuals.Toggled, magboots.On);
-        OnChanged(uid, magboots);
-        Dirty(uid, magboots);
-    }
-
-    public void UpdateMagbootEffects(EntityUid parent, EntityUid uid, bool state, MagbootsComponent? component)
-    {
-        if (!Resolve(uid, ref component))
-            return;
-        state = state && component.On;
-
-        if (TryComp(parent, out MovedByPressureComponent? movedByPressure))
-        {
-            movedByPressure.Enabled = !state;
-        }
-
-        if (state)
-        {
-            _alerts.ShowAlert(parent, component.MagbootsAlert);
-        }
-        else
-        {
-            _alerts.ClearAlert(parent, component.MagbootsAlert);
-        }
-    }
-
-    private void OnChanged(EntityUid uid, MagbootsComponent component)
-    {
-        _sharedActions.SetToggled(component.ToggleActionEntity, component.On);
-        _clothingSpeedModifier.SetClothingSpeedModifierEnabled(uid, component.On);
-    }
-
-    private void AddToggleVerb(EntityUid uid, MagbootsComponent component, GetVerbsEvent<ActivationVerb> args)
-    {
-        if (!args.CanAccess || !args.CanInteract)
-            return;
-
-        ActivationVerb verb = new()
-        {
-            Text = Loc.GetString("toggle-magboots-verb-get-data-text"),
-            Act = () => ToggleMagboots(uid, component),
-            // TODO VERB ICON add toggle icon? maybe a computer on/off symbol?
-        };
-        args.Verbs.Add(verb);
-    }
-
-    private void OnSlipAttempt(EntityUid uid, MagbootsComponent component, InventoryRelayedEvent<SlipAttemptEvent> args)
-    {
-        if (component.On)
-            args.Args.Cancel();
-    }
-
-    private void OnGetActions(EntityUid uid, MagbootsComponent component, GetItemActionsEvent args)
-    {
-        args.AddAction(ref component.ToggleActionEntity, component.ToggleAction);
-    }
-
-    private void OnIsWeightless(Entity<MagbootsComponent> ent, ref InventoryRelayedEvent<IsWeightlessEvent> args)
-    {
-        if (args.Args.Handled)
-            return;
-
-        if (!ent.Comp.On)
-            return;
-
-        // do not cancel weightlessness if the person is in off-grid.
-        if (ent.Comp.RequiresGrid && !_gravity.EntityOnGravitySupportingGridOrMap(ent.Owner))
-            return;
-
-        args.Args.IsWeightless = false;
-        args.Args.Handled = true;
-    }
-}
-
-public sealed partial class ToggleMagbootsEvent : InstantActionEvent;
diff --git a/Content.Shared/CombatMode/Pacification/PacificationSystem.cs b/Content.Shared/CombatMode/Pacification/PacificationSystem.cs
index 14507ce1f5c..6bc32c5b96c 100644
--- a/Content.Shared/CombatMode/Pacification/PacificationSystem.cs
+++ b/Content.Shared/CombatMode/Pacification/PacificationSystem.cs
@@ -62,6 +62,9 @@ private void ShowPopup(Entity<PacifiedComponent> user, EntityUid target, string
 
     private void OnShootAttempt(Entity<PacifiedComponent> ent, ref ShotAttemptedEvent args)
     {
+        if (HasComp<PacifismAllowedGunComponent>(args.Used))
+            return;
+
         // Disallow firing guns in all cases.
         ShowPopup(ent, args.Used, "pacified-cannot-fire-gun");
         args.Cancel();
diff --git a/Content.Shared/CombatMode/Pacification/PacifismAllowedGunComponent.cs b/Content.Shared/CombatMode/Pacification/PacifismAllowedGunComponent.cs
new file mode 100644
index 00000000000..7decbeb3bc6
--- /dev/null
+++ b/Content.Shared/CombatMode/Pacification/PacifismAllowedGunComponent.cs
@@ -0,0 +1,11 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.CombatMode.Pacification;
+
+/// <summary>
+/// Guns with this component can be fired by pacifists
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class PacifismAllowedGunComponent : Component
+{
+}
diff --git a/Content.Shared/CombatMode/SharedCombatModeSystem.cs b/Content.Shared/CombatMode/SharedCombatModeSystem.cs
index 60d1362bb0b..5eed8ee2423 100644
--- a/Content.Shared/CombatMode/SharedCombatModeSystem.cs
+++ b/Content.Shared/CombatMode/SharedCombatModeSystem.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Actions;
+using Content.Shared.Mind;
 using Content.Shared.MouseRotator;
 using Content.Shared.Movement.Components;
 using Content.Shared.Popups;
@@ -13,6 +14,7 @@ public abstract class SharedCombatModeSystem : EntitySystem
     [Dependency] private   readonly INetManager _netMan = default!;
     [Dependency] private   readonly SharedActionsSystem _actionsSystem = default!;
     [Dependency] private   readonly SharedPopupSystem _popup = default!;
+    [Dependency] private   readonly SharedMindSystem  _mind = default!;
 
     public override void Initialize()
     {
@@ -82,7 +84,7 @@ public virtual void SetInCombatMode(EntityUid entity, bool value, CombatModeComp
             _actionsSystem.SetToggled(component.CombatToggleActionEntity, component.IsInCombatMode);
 
         // Change mouse rotator comps if flag is set
-        if (!component.ToggleMouseRotator || IsNpc(entity))
+        if (!component.ToggleMouseRotator || IsNpc(entity) && !_mind.TryGetMind(entity, out _, out _))
             return;
 
         SetMouseRotatorComponents(entity, value);
diff --git a/Content.Shared/Construction/Conditions/WallmountCondition.cs b/Content.Shared/Construction/Conditions/WallmountCondition.cs
index fe4336e6fc7..f1d056165e4 100644
--- a/Content.Shared/Construction/Conditions/WallmountCondition.cs
+++ b/Content.Shared/Construction/Conditions/WallmountCondition.cs
@@ -20,13 +20,13 @@ public bool Condition(EntityUid user, EntityCoordinates location, Direction dire
 
             // get blueprint and user position
             var transformSystem = entManager.System<SharedTransformSystem>();
-            var userWorldPosition = entManager.GetComponent<TransformComponent>(user).WorldPosition;
+            var userWorldPosition = transformSystem.GetWorldPosition(user);
             var objWorldPosition = location.ToMap(entManager, transformSystem).Position;
 
             // find direction from user to blueprint
             var userToObject = (objWorldPosition - userWorldPosition);
             // get direction of the grid being placed on as an offset.
-            var gridRotation = entManager.GetComponent<TransformComponent>(location.EntityId).WorldRotation;
+            var gridRotation = transformSystem.GetWorldRotation(location.EntityId);
             var directionWithOffset = gridRotation.RotateVec(direction.ToVec());
 
             // dot product will be positive if user direction and blueprint are co-directed
diff --git a/Content.Shared/Construction/MachinePartSystem.cs b/Content.Shared/Construction/MachinePartSystem.cs
index f357a395e64..f3314dfc11b 100644
--- a/Content.Shared/Construction/MachinePartSystem.cs
+++ b/Content.Shared/Construction/MachinePartSystem.cs
@@ -81,9 +81,9 @@ public Dictionary<string, int> GetMachineBoardMaterialCost(Entity<MachineBoardCo
                 {
                     var partRecipe = recipes[0];
                     if (recipes.Count > 1)
-                        partRecipe = recipes.MinBy(p => p.RequiredMaterials.Values.Sum());
+                        partRecipe = recipes.MinBy(p => p.Materials.Values.Sum());
 
-                    foreach (var (mat, matAmount) in partRecipe!.RequiredMaterials)
+                    foreach (var (mat, matAmount) in partRecipe!.Materials)
                     {
                         materials.TryAdd(mat, 0);
                         materials[mat] += matAmount * amount * coefficient;
@@ -101,9 +101,9 @@ public Dictionary<string, int> GetMachineBoardMaterialCost(Entity<MachineBoardCo
                 {
                     var partRecipe = recipes[0];
                     if (recipes.Count > 1)
-                        partRecipe = recipes.MinBy(p => p.RequiredMaterials.Values.Sum());
+                        partRecipe = recipes.MinBy(p => p.Materials.Values.Sum());
 
-                    foreach (var (mat, matAmount) in partRecipe!.RequiredMaterials)
+                    foreach (var (mat, matAmount) in partRecipe!.Materials)
                     {
                         materials.TryAdd(mat, 0);
                         materials[mat] += matAmount * amount * coefficient;
diff --git a/Content.Shared/Cuffs/Components/CuffableComponent.cs b/Content.Shared/Cuffs/Components/CuffableComponent.cs
index 4ddfe1b53ee..a7eba34d8ce 100644
--- a/Content.Shared/Cuffs/Components/CuffableComponent.cs
+++ b/Content.Shared/Cuffs/Components/CuffableComponent.cs
@@ -46,6 +46,8 @@ public sealed partial class CuffableComponent : Component
     public ProtoId<AlertPrototype> CuffedAlert = "Handcuffed";
 }
 
+public sealed partial class RemoveCuffsAlertEvent : BaseAlertEvent;
+
 [Serializable, NetSerializable]
 public sealed class CuffableComponentState : ComponentState
 {
diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs
index b9f287f1ce4..21d09c744cd 100644
--- a/Content.Shared/Cuffs/SharedCuffableSystem.cs
+++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs
@@ -58,7 +58,7 @@ public override void Initialize()
         {
             base.Initialize();
 
-            SubscribeLocalEvent<HandCountChangedEvent>(OnHandCountChanged);
+            SubscribeLocalEvent<CuffableComponent, HandCountChangedEvent>(OnHandCountChanged);
             SubscribeLocalEvent<UncuffAttemptEvent>(OnUncuffAttempt);
 
             SubscribeLocalEvent<CuffableComponent, EntRemovedFromContainerMessage>(OnCuffsRemovedFromContainer);
@@ -66,6 +66,7 @@ public override void Initialize()
             SubscribeLocalEvent<CuffableComponent, RejuvenateEvent>(OnRejuvenate);
             SubscribeLocalEvent<CuffableComponent, ComponentInit>(OnStartup);
             SubscribeLocalEvent<CuffableComponent, AttemptStopPullingEvent>(HandleStopPull);
+            SubscribeLocalEvent<CuffableComponent, RemoveCuffsAlertEvent>(OnRemoveCuffsAlert);
             SubscribeLocalEvent<CuffableComponent, UpdateCanMoveEvent>(HandleMoveAttempt);
             SubscribeLocalEvent<CuffableComponent, IsEquippingAttemptEvent>(OnEquipAttempt);
             SubscribeLocalEvent<CuffableComponent, IsUnequippingAttemptEvent>(OnUnequipAttempt);
@@ -201,7 +202,7 @@ private void OnBuckleAttempt(Entity<CuffableComponent> ent, EntityUid? user, ref
             if (cancelled || user != ent.Owner)
                 return;
 
-            if (!TryComp<HandsComponent>(ent, out var hands) || ent.Comp.CuffedHandCount != hands.Count)
+            if (!TryComp<HandsComponent>(ent, out var hands) || ent.Comp.CuffedHandCount < hands.Count)
                 return;
 
             cancelled = true;
@@ -248,6 +249,14 @@ private void HandleStopPull(EntityUid uid, CuffableComponent component, AttemptS
                 args.Cancelled = true;
         }
 
+        private void OnRemoveCuffsAlert(Entity<CuffableComponent> ent, ref RemoveCuffsAlertEvent args)
+        {
+            if (args.Handled)
+                return;
+            TryUncuff(ent, ent, cuffable: ent.Comp);
+            args.Handled = true;
+        }
+
         private void AddUncuffVerb(EntityUid uid, CuffableComponent component, GetVerbsEvent<Verb> args)
         {
             // Can the user access the cuffs, and is there even anything to uncuff?
@@ -380,33 +389,24 @@ private void OnCuffVirtualItemDeleted(EntityUid uid, HandcuffComponent component
         /// <summary>
         ///     Check the current amount of hands the owner has, and if there's less hands than active cuffs we remove some cuffs.
         /// </summary>
-        private void OnHandCountChanged(HandCountChangedEvent message)
+        private void OnHandCountChanged(Entity<CuffableComponent> ent, ref HandCountChangedEvent message)
         {
-            var owner = message.Sender;
-
-            if (!TryComp(owner, out CuffableComponent? cuffable) ||
-                !cuffable.Initialized)
-            {
-                return;
-            }
-
             var dirty = false;
-            var handCount = CompOrNull<HandsComponent>(owner)?.Count ?? 0;
+            var handCount = CompOrNull<HandsComponent>(ent.Owner)?.Count ?? 0;
 
-            while (cuffable.CuffedHandCount > handCount && cuffable.CuffedHandCount > 0)
+            while (ent.Comp.CuffedHandCount > handCount && ent.Comp.CuffedHandCount > 0)
             {
                 dirty = true;
 
-                var container = cuffable.Container;
-                var entity = container.ContainedEntities[^1];
+                var handcuffContainer = ent.Comp.Container;
+                var handcuffEntity = handcuffContainer.ContainedEntities[^1];
 
-                _container.Remove(entity, container);
-                _transform.SetWorldPosition(entity, _transform.GetWorldPosition(owner));
+                _transform.PlaceNextTo(handcuffEntity, ent.Owner);
             }
 
             if (dirty)
             {
-                UpdateCuffState(owner, cuffable);
+                UpdateCuffState(ent.Owner, ent.Comp);
             }
         }
 
@@ -489,6 +489,12 @@ public bool TryCuffing(EntityUid user, EntityUid target, EntityUid handcuff, Han
                 return true;
             }
 
+            if (!_hands.CanDrop(user, handcuff))
+            {
+                _popup.PopupClient(Loc.GetString("handcuff-component-cannot-drop-cuffs", ("target", Identity.Name(target, EntityManager, user))), user, user);
+                return false;
+            }
+
             var cuffTime = handcuffComponent.CuffTime;
 
             if (HasComp<StunnedComponent>(target))
@@ -530,6 +536,25 @@ public bool TryCuffing(EntityUid user, EntityUid target, EntityUid handcuff, Han
             return true;
         }
 
+        /// <summary>
+        /// Checks if the target is handcuffed.
+        /// </summary>
+        /// <param name="requireFullyCuffed">when true, return false if the target is only partially cuffed (for things with more than 2 hands)</param>
+        /// <returns></returns>
+        public bool IsCuffed(Entity<CuffableComponent> target, bool requireFullyCuffed = true)
+        {
+            if (!TryComp<HandsComponent>(target, out var hands))
+                return false;
+
+            if (target.Comp.CuffedHandCount <= 0)
+                return false;
+
+            if (requireFullyCuffed && hands.Count > target.Comp.CuffedHandCount)
+                return false;
+
+            return true;
+        }
+
         /// <summary>
         /// Attempt to uncuff a cuffed entity. Can be called by the cuffed entity, or another entity trying to help uncuff them.
         /// If the uncuffing succeeds, the cuffs will drop on the floor.
diff --git a/Content.Shared/Damage/Components/DamageOnAttackedComponent.cs b/Content.Shared/Damage/Components/DamageOnAttackedComponent.cs
new file mode 100644
index 00000000000..5f6bd7d9972
--- /dev/null
+++ b/Content.Shared/Damage/Components/DamageOnAttackedComponent.cs
@@ -0,0 +1,47 @@
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Damage.Components;
+
+
+/// <summary>
+/// This component is added to entities that you want to damage the player
+/// if the player interacts with it. For example, if a player tries touching
+/// a hot light bulb or an anomaly. This damage can be cancelled if the user
+/// has a component that protects them from this.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class DamageOnAttackedComponent : Component
+{
+    /// <summary>
+    /// How much damage to apply to the person making contact
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
+    public DamageSpecifier Damage = default!;
+
+    /// <summary>
+    /// Whether the damage should be resisted by a person's armor values
+    /// and the <see cref="DamageOnAttackedProtectionComponent"/>
+    /// </summary>
+    [DataField]
+    public bool IgnoreResistances = false;
+
+    /// <summary>
+    /// What kind of localized text should pop up when they interact with the entity
+    /// </summary>
+    [DataField]
+    public LocId? PopupText;
+
+    /// <summary>
+    /// The sound that should be made when interacting with the entity
+    /// </summary>
+    [DataField]
+    public SoundSpecifier InteractSound = new SoundPathSpecifier("/Audio/Effects/lightburn.ogg");
+
+    /// <summary>
+    /// Generic boolean to toggle the damage application on and off
+    /// This is useful for things that can be toggled on or off, like a stovetop
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool IsDamageActive = true;
+}
diff --git a/Content.Shared/Damage/Components/DamageOnAttackedProtectionComponent.cs b/Content.Shared/Damage/Components/DamageOnAttackedProtectionComponent.cs
new file mode 100644
index 00000000000..9581d204966
--- /dev/null
+++ b/Content.Shared/Damage/Components/DamageOnAttackedProtectionComponent.cs
@@ -0,0 +1,29 @@
+using Content.Shared.Inventory;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Damage.Components;
+
+
+/// <summary>
+/// This component is added to entities to protect them from being damaged
+/// when attacking objects with the <see cref="DamageOnAttackedComponent"/>
+/// If the entity has sufficient protection, the entity will take no damage.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class DamageOnAttackedProtectionComponent : Component, IClothingSlots
+{
+    /// <summary>
+    /// How much and what kind of damage to protect the user from
+    /// when interacting with something with <see cref="DamageOnInteractComponent"/>
+    /// </summary>
+    [DataField(required: true)]
+    public DamageModifierSet DamageProtection = default!;
+
+    /// <summary>
+    /// Only protects if the item is in the correct slot
+    /// i.e. having gloves in your pocket doesn't protect you, it has to be on your hands
+    /// Set slots to NONE if it works while you hold the item in your main hand
+    /// </summary>
+    [DataField]
+    public SlotFlags Slots { get; set; } = SlotFlags.WITHOUT_POCKET;
+}
diff --git a/Content.Shared/Damage/Components/DamageOnInteractComponent.cs b/Content.Shared/Damage/Components/DamageOnInteractComponent.cs
new file mode 100644
index 00000000000..9487dec8ef9
--- /dev/null
+++ b/Content.Shared/Damage/Components/DamageOnInteractComponent.cs
@@ -0,0 +1,47 @@
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Damage.Components;
+
+
+/// <summary>
+/// This component is added to entities that you want to damage the player
+/// if the player interacts with it. For example, if a player tries touching
+/// a hot light bulb or an anomaly. This damage can be cancelled if the user
+/// has a component that protects them from this.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class DamageOnInteractComponent : Component
+{
+    /// <summary>
+    /// How much damage to apply to the person making contact
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
+    public DamageSpecifier Damage = default!;
+
+    /// <summary>
+    /// Whether the damage should be resisted by a person's armor values
+    /// and the <see cref="DamageOnInteractProtectionComponent"/>
+    /// </summary>
+    [DataField]
+    public bool IgnoreResistances;
+
+    /// <summary>
+    /// What kind of localized text should pop up when they interact with the entity
+    /// </summary>
+    [DataField]
+    public LocId? PopupText;
+
+    /// <summary>
+    /// The sound that should be made when interacting with the entity
+    /// </summary>
+    [DataField]
+    public SoundSpecifier InteractSound = new SoundPathSpecifier("/Audio/Effects/lightburn.ogg");
+
+    /// <summary>
+    /// Generic boolean to toggle the damage application on and off
+    /// This is useful for things that can be toggled on or off, like a stovetop
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool IsDamageActive = true;
+}
diff --git a/Content.Shared/Damage/Components/DamageOnInteractProtectionComponent.cs b/Content.Shared/Damage/Components/DamageOnInteractProtectionComponent.cs
new file mode 100644
index 00000000000..f57c3d22c17
--- /dev/null
+++ b/Content.Shared/Damage/Components/DamageOnInteractProtectionComponent.cs
@@ -0,0 +1,29 @@
+using Content.Shared.Inventory;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Damage.Components;
+
+
+/// <summary>
+/// This component is added to entities to protect them from being damaged
+/// when interacting with objects with the <see cref="DamageOnInteractComponent"/>
+/// If the entity has sufficient protection, interaction with the object is not cancelled.
+/// This allows the user to do things like remove a lightbulb.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class DamageOnInteractProtectionComponent : Component, IClothingSlots
+{
+    /// <summary>
+    /// How much and what kind of damage to protect the user from
+    /// when interacting with something with <see cref="DamageOnInteractComponent"/>
+    /// </summary>
+    [DataField(required: true)]
+    public DamageModifierSet DamageProtection = default!;
+
+    /// <summary>
+    /// Only protects if the item is in the correct slot
+    /// i.e. having gloves in your pocket doesn't protect you, it has to be on your hands
+    /// </summary>
+    [DataField]
+    public SlotFlags Slots { get; set; } = SlotFlags.GLOVES;
+}
diff --git a/Content.Shared/Damage/Components/DamageProtectionBuffComponent.cs b/Content.Shared/Damage/Components/DamageProtectionBuffComponent.cs
new file mode 100644
index 00000000000..99b055a6456
--- /dev/null
+++ b/Content.Shared/Damage/Components/DamageProtectionBuffComponent.cs
@@ -0,0 +1,17 @@
+using Content.Shared.Damage.Prototypes;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Damage.Components;
+
+/// <summary>
+///     Applies the specified DamageModifierSets when the entity takes damage.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class DamageProtectionBuffComponent : Component
+{
+    /// <summary>
+    ///     The damage modifiers for entities with this component.
+    /// </summary>
+    [DataField]
+    public Dictionary<string, DamageModifierSetPrototype> Modifiers = new();
+}
diff --git a/Content.Shared/Damage/Components/DamageableComponent.cs b/Content.Shared/Damage/Components/DamageableComponent.cs
index f8205568f10..a99840e1ae6 100644
--- a/Content.Shared/Damage/Components/DamageableComponent.cs
+++ b/Content.Shared/Damage/Components/DamageableComponent.cs
@@ -66,7 +66,7 @@ public sealed partial class DamageableComponent : Component
         public List<ProtoId<DamageTypePrototype>> RadiationDamageTypeIDs = new() { "Radiation" };
 
         [DataField]
-        public Dictionary<MobState, ProtoId<StatusIconPrototype>> HealthIcons = new()
+        public Dictionary<MobState, ProtoId<HealthIconPrototype>> HealthIcons = new()
         {
             { MobState.Alive, "HealthIconFine" },
             { MobState.Critical, "HealthIconCritical" },
@@ -74,7 +74,7 @@ public sealed partial class DamageableComponent : Component
         };
 
         [DataField]
-        public ProtoId<StatusIconPrototype> RottingIcon = "HealthIconRotting";
+        public ProtoId<HealthIconPrototype> RottingIcon = "HealthIconRotting";
 
         [DataField]
         public FixedPoint2? HealthBarThreshold;
diff --git a/Content.Shared/Damage/Systems/DamageOnAttackedSystem.cs b/Content.Shared/Damage/Systems/DamageOnAttackedSystem.cs
new file mode 100644
index 00000000000..ab5866c5aa5
--- /dev/null
+++ b/Content.Shared/Damage/Systems/DamageOnAttackedSystem.cs
@@ -0,0 +1,99 @@
+using Content.Shared.Administration.Logs;
+using Content.Shared.Damage.Components;
+using Content.Shared.Database;
+using Content.Shared.Hands.Components;
+using Content.Shared.Hands.EntitySystems;
+using Content.Shared.Inventory;
+using Content.Shared.Popups;
+using Content.Shared.Weapons.Melee.Events;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Network;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Damage.Systems;
+
+public sealed class DamageOnAttackedSystem : EntitySystem
+{
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly DamageableSystem _damageableSystem = default!;
+    [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+    [Dependency] private readonly InventorySystem _inventorySystem = default!;
+    [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DamageOnAttackedComponent, AttackedEvent>(OnAttacked);
+    }
+
+    /// <summary>
+    /// Damages the user that attacks the entity and potentially
+    /// plays a sound or pops up text in response
+    /// </summary>
+    /// <param name="entity">The entity being hit</param>
+    /// <param name="args">Contains the user that hit the entity</param>
+    private void OnAttacked(Entity<DamageOnAttackedComponent> entity, ref AttackedEvent args)
+    {
+        if (!entity.Comp.IsDamageActive)
+            return;
+
+        var totalDamage = entity.Comp.Damage;
+
+        if (!entity.Comp.IgnoreResistances)
+        {
+            // try to get the damage on attacked protection component from something the entity has in their inventory
+            _inventorySystem.TryGetInventoryEntity<DamageOnAttackedProtectionComponent>(args.User, out var protectiveEntity);
+
+            // if comp is null that means the user didn't have anything equipped that protected them
+            // let's check their hands to see if the thing they attacked with gives them protection, like the GORILLA gauntlet
+            if (protectiveEntity.Comp == null && TryComp<HandsComponent>(args.User, out var handsComp))
+            {
+                if (_handsSystem.TryGetActiveItem((args.User, handsComp), out var itemInHand) &&
+                    TryComp<DamageOnAttackedProtectionComponent>(itemInHand, out var itemProtectComp)
+                    && itemProtectComp.Slots == SlotFlags.NONE)
+                {
+                    protectiveEntity = (itemInHand.Value, itemProtectComp);
+                }
+            }
+
+            // if comp is null, that means both the inventory and hands had nothing to protect them
+            // let's check if the entity itself has the protective comp, like with borgs
+            if (protectiveEntity.Comp == null &&
+                TryComp<DamageOnAttackedProtectionComponent>(args.User, out var protectiveComp))
+            {
+                protectiveEntity = (args.User, protectiveComp);
+            }
+
+            // if comp is NOT NULL that means they have damage protection!
+            if (protectiveEntity.Comp != null)
+            {
+                totalDamage = DamageSpecifier.ApplyModifierSet(totalDamage, protectiveEntity.Comp.DamageProtection);
+            }
+        }
+
+        totalDamage = _damageableSystem.TryChangeDamage(args.User, totalDamage, entity.Comp.IgnoreResistances, origin: entity);
+
+        if (totalDamage != null && totalDamage.AnyPositive())
+        {
+            _adminLogger.Add(LogType.Damaged, $"{ToPrettyString(args.User):user} injured themselves by attacking {ToPrettyString(entity):target} and received {totalDamage.GetTotal():damage} damage");
+            _audioSystem.PlayPredicted(entity.Comp.InteractSound, entity, args.User);
+
+            if (entity.Comp.PopupText != null)
+                _popupSystem.PopupClient(Loc.GetString(entity.Comp.PopupText), args.User, args.User);
+
+        }
+    }
+
+    public void SetIsDamageActiveTo(Entity<DamageOnAttackedComponent> entity, bool mode)
+    {
+        if (entity.Comp.IsDamageActive == mode)
+            return;
+
+        entity.Comp.IsDamageActive = mode;
+        Dirty(entity);
+    }
+}
diff --git a/Content.Shared/Damage/Systems/DamageOnHoldingSystem.cs b/Content.Shared/Damage/Systems/DamageOnHoldingSystem.cs
index c13ec0a1b9f..78e86f5ab42 100644
--- a/Content.Shared/Damage/Systems/DamageOnHoldingSystem.cs
+++ b/Content.Shared/Damage/Systems/DamageOnHoldingSystem.cs
@@ -37,7 +37,7 @@ public override void Update(float frameTime)
         {
             if (!component.Enabled || component.NextDamage > _timing.CurTime)
                 continue;
-            if (_container.TryGetContainingContainer(uid, out var container))
+            if (_container.TryGetContainingContainer((uid, null, null), out var container))
             {
                 _damageableSystem.TryChangeDamage(container.Owner, component.Damage, origin: uid);
             }
diff --git a/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs b/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs
new file mode 100644
index 00000000000..4b50a1fd0e0
--- /dev/null
+++ b/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs
@@ -0,0 +1,85 @@
+using Content.Shared.Administration.Logs;
+using Content.Shared.Damage.Components;
+using Content.Shared.Database;
+using Content.Shared.Interaction;
+using Content.Shared.Inventory;
+using Content.Shared.Popups;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Network;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Damage.Systems;
+
+public sealed class DamageOnInteractSystem : EntitySystem
+{
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly DamageableSystem _damageableSystem = default!;
+    [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+    [Dependency] private readonly InventorySystem _inventorySystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DamageOnInteractComponent, InteractHandEvent>(OnHandInteract);
+    }
+
+    /// <summary>
+    /// Damages the user that interacts with the entity with an empty hand and
+    /// plays a sound or pops up text in response. If the user does not have
+    /// proper protection, the user will only be damaged and other interactions
+    /// will be cancelled.
+    /// </summary>
+    /// <param name="entity">The entity being interacted with</param>
+    /// <param name="args">Contains the user that interacted with the entity</param>
+    private void OnHandInteract(Entity<DamageOnInteractComponent> entity, ref InteractHandEvent args)
+    {
+        if (!entity.Comp.IsDamageActive)
+            return;
+
+        var totalDamage = entity.Comp.Damage;
+
+        if (!entity.Comp.IgnoreResistances)
+        {
+            // try to get damage on interact protection from either the inventory slots of the entity
+            _inventorySystem.TryGetInventoryEntity<DamageOnInteractProtectionComponent>(args.User, out var protectiveEntity);
+
+            // or checking the entity for  the comp itself if the inventory didn't work
+            if (protectiveEntity.Comp == null && TryComp<DamageOnInteractProtectionComponent>(args.User, out var protectiveComp))
+            {
+                protectiveEntity = (args.User, protectiveComp);
+            }
+
+            // if protectiveComp isn't null after all that, it means the user has protection,
+            // so let's calculate how much they resist
+            if (protectiveEntity.Comp != null)
+            {
+                totalDamage = DamageSpecifier.ApplyModifierSet(totalDamage, protectiveEntity.Comp.DamageProtection);
+            }
+        }
+
+        totalDamage = _damageableSystem.TryChangeDamage(args.User, totalDamage,  origin: args.Target);
+
+        if (totalDamage != null && totalDamage.AnyPositive())
+        {
+            args.Handled = true;
+            _adminLogger.Add(LogType.Damaged, $"{ToPrettyString(args.User):user} injured their hand by interacting with {ToPrettyString(args.Target):target} and received {totalDamage.GetTotal():damage} damage");
+            _audioSystem.PlayPredicted(entity.Comp.InteractSound, args.Target, args.User);
+
+            if (entity.Comp.PopupText != null)
+                _popupSystem.PopupClient(Loc.GetString(entity.Comp.PopupText), args.User, args.User);
+        }
+    }
+
+    public void SetIsDamageActiveTo(Entity<DamageOnInteractComponent> entity, bool mode)
+    {
+        if (entity.Comp.IsDamageActive == mode)
+            return;
+
+        entity.Comp.IsDamageActive = mode;
+        Dirty(entity);
+    }
+}
diff --git a/Content.Shared/Damage/Systems/DamageProtectionBuffSystem.cs b/Content.Shared/Damage/Systems/DamageProtectionBuffSystem.cs
new file mode 100644
index 00000000000..bbb7bfda323
--- /dev/null
+++ b/Content.Shared/Damage/Systems/DamageProtectionBuffSystem.cs
@@ -0,0 +1,19 @@
+using Content.Shared.Damage.Components;
+
+namespace Content.Shared.Damage.Systems;
+
+public sealed class DamageProtectionBuffSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DamageProtectionBuffComponent, DamageModifyEvent>(OnDamageModify);
+    }
+
+    private void OnDamageModify(EntityUid uid, DamageProtectionBuffComponent component, DamageModifyEvent args)
+    {
+        foreach (var modifier in component.Modifiers.Values)
+            args.Damage = DamageSpecifier.ApplyModifierSet(args.Damage, modifier);
+    }
+}
diff --git a/Content.Shared/Damage/Systems/RequireProjectileTargetSystem.cs b/Content.Shared/Damage/Systems/RequireProjectileTargetSystem.cs
index 79b374a60f3..12838eb04d9 100644
--- a/Content.Shared/Damage/Systems/RequireProjectileTargetSystem.cs
+++ b/Content.Shared/Damage/Systems/RequireProjectileTargetSystem.cs
@@ -2,11 +2,14 @@
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Standing;
 using Robust.Shared.Physics.Events;
+using Robust.Shared.Containers;
 
 namespace Content.Shared.Damage.Components;
 
 public sealed class RequireProjectileTargetSystem : EntitySystem
 {
+    [Dependency] private readonly SharedContainerSystem _container = default!;
+
     public override void Initialize()
     {
         SubscribeLocalEvent<RequireProjectileTargetComponent, PreventCollideEvent>(PreventCollide);
@@ -23,10 +26,16 @@ private void PreventCollide(Entity<RequireProjectileTargetComponent> ent, ref Pr
             return;
 
         var other = args.OtherEntity;
-        if (HasComp<ProjectileComponent>(other) &&
+        if (TryComp(other, out ProjectileComponent? projectile) &&
             CompOrNull<TargetedProjectileComponent>(other)?.Target != ent)
         {
-            args.Cancelled = true;
+            // Prevents shooting out of while inside of crates
+            var shooter = projectile.Shooter;
+            if (!shooter.HasValue)
+                return;
+
+            if (!_container.IsEntityOrParentInContainer(shooter.Value))
+               args.Cancelled = true;
         }
     }
 
diff --git a/Content.Shared/Damage/Systems/StaminaSystem.cs b/Content.Shared/Damage/Systems/StaminaSystem.cs
index 1f9a7f1dd84..a5c8a4b38de 100644
--- a/Content.Shared/Damage/Systems/StaminaSystem.cs
+++ b/Content.Shared/Damage/Systems/StaminaSystem.cs
@@ -192,6 +192,11 @@ private void OnThrowHit(EntityUid uid, StaminaDamageOnCollideComponent component
 
     private void OnCollide(EntityUid uid, StaminaDamageOnCollideComponent component, EntityUid target)
     {
+        // you can't inflict stamina damage on things with no stamina component
+        // this prevents stun batons from using up charges when throwing it at lockers or lights
+        if (!HasComp<StaminaComponent>(target))
+            return;
+
         var ev = new StaminaDamageOnHitAttemptEvent();
         RaiseLocalEvent(uid, ref ev);
         if (ev.Cancelled)
diff --git a/Content.Shared/Decals/DecalGridChunkCollectionTypeSerializer.cs b/Content.Shared/Decals/DecalGridChunkCollectionTypeSerializer.cs
index ba89c8a6959..85364fe5f40 100644
--- a/Content.Shared/Decals/DecalGridChunkCollectionTypeSerializer.cs
+++ b/Content.Shared/Decals/DecalGridChunkCollectionTypeSerializer.cs
@@ -62,41 +62,18 @@ public DecalGridChunkCollection Read(ISerializationManager serializationManager,
                 dictionary = serializationManager.Read<Dictionary<Vector2i, DecalChunk>>(node, hookCtx, context, notNullableOverride: true);
             }
 
-            var uids = new SortedSet<uint>();
-            var uidChunkMap = new Dictionary<uint, Vector2i>();
-            var allIndices = dictionary.Keys.ToList();
-            allIndices.Sort((x, y) => x.X == y.X ? x.Y.CompareTo(y.Y) : x.X.CompareTo(y.X));
+            uint nextIndex = 0;
 
-            foreach (var indices in allIndices)
+            foreach (var decals in dictionary.Values)
             {
-                var decals = dictionary[indices];
-                var decalUids = decals.Decals.Keys.ToList();
-                decalUids.Sort();
-
-                foreach (var uid in decalUids)
+                foreach (var uid in decals.Decals.Keys)
                 {
-                    uids.Add(uid);
-                    uidChunkMap[uid] = indices;
+                    nextIndex = Math.Max(uid, nextIndex);
                 }
             }
 
-            var uidMap = new Dictionary<uint, uint>();
-            uint nextIndex = 0;
-            foreach (var uid in uids)
-            {
-                uidMap[uid] = nextIndex++;
-            }
-
-            var newDict = new Dictionary<Vector2i, DecalChunk>();
-            foreach (var (oldUid, newUid) in uidMap)
-            {
-                var indices = uidChunkMap[oldUid];
-                if(!newDict.ContainsKey(indices))
-                    newDict[indices] = new();
-                newDict[indices].Decals[newUid] = dictionary[indices].Decals[oldUid];
-            }
-
-            return new DecalGridChunkCollection(newDict) { NextDecalId = nextIndex };
+            nextIndex++;
+            return new DecalGridChunkCollection(dictionary) { NextDecalId = nextIndex };
         }
 
         public DataNode Write(ISerializationManager serializationManager,
@@ -109,8 +86,6 @@ public DataNode Write(ISerializationManager serializationManager,
 
             var allData = new MappingDataNode();
             // Want consistent chunk + decal ordering so diffs aren't mangled
-            var chunks = new List<Vector2i>(value.ChunkCollection.Keys);
-            chunks.Sort((x, y) => x.X == y.X ? x.Y.CompareTo(y.Y) : x.X.CompareTo(y.X));
             var nodes = new SequenceDataNode();
 
             // Assuming decal indices stay consistent:
@@ -122,9 +97,6 @@ public DataNode Write(ISerializationManager serializationManager,
             // Build all of the decal lookups first.
             foreach (var chunk in value.ChunkCollection.Values)
             {
-                var sortedDecals = new List<uint>(chunk.Decals.Keys);
-                sortedDecals.Sort();
-
                 foreach (var (uid, decal) in chunk.Decals)
                 {
                     var data = new DecalData(decal);
diff --git a/Content.Server/DeltaV/Paper/SignatureSystem.cs b/Content.Shared/DeltaV/Paper/SignatureSystem.cs
similarity index 64%
rename from Content.Server/DeltaV/Paper/SignatureSystem.cs
rename to Content.Shared/DeltaV/Paper/SignatureSystem.cs
index 18c80f33051..38a50b1e1a8 100644
--- a/Content.Server/DeltaV/Paper/SignatureSystem.cs
+++ b/Content.Shared/DeltaV/Paper/SignatureSystem.cs
@@ -1,23 +1,20 @@
-using Content.Server.Access.Systems;
-using Content.Server.Paper;
-using Content.Server.Popups;
-using Content.Shared.DeltaV.Paper;
+using Content.Shared.Access.Systems;
 using Content.Shared.Paper;
 using Content.Shared.Popups;
 using Content.Shared.Tag;
 using Content.Shared.Verbs;
-using Robust.Server.Audio;
+using Robust.Shared.Audio.Systems;
 using Robust.Shared.Player;
 
-namespace Content.Server.DeltaV.Paper;
+namespace Content.Shared.DeltaV.Paper;
 
 public sealed class SignatureSystem : EntitySystem
 {
-    [Dependency] private readonly AudioSystem _audio = default!;
-    [Dependency] private readonly IdCardSystem _idCard = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedIdCardSystem _idCard = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly PaperSystem _paper = default!;
-    [Dependency] private readonly PopupSystem _popup = default!;
-    [Dependency] private readonly TagSystem _tagSystem = default!;
+    [Dependency] private readonly TagSystem _tag = default!;
 
     // The sprite used to visualize "signatures" on paper entities.
     private const string SignatureStampState = "paper_stamp-signature";
@@ -32,7 +29,7 @@ private void OnGetAltVerbs(Entity<PaperComponent> ent, ref GetVerbsEvent<Alterna
         if (!args.CanAccess || !args.CanInteract)
             return;
 
-        if (args.Using is not {} pen || !_tagSystem.HasTag(pen, "Write"))
+        if (args.Using is not {} pen || !_tag.HasTag(pen, "Write"))
             return;
 
         var user = args.User;
@@ -69,28 +66,25 @@ public bool TrySignPaper(Entity<PaperComponent> paper, EntityUid signer, EntityU
             StampedColor = Color.DarkSlateGray, // TODO: make configurable? Perhaps it should depend on the pen.
         };
 
-        if (!comp.StampedBy.Contains(stampInfo) && _paper.TryStamp(paper, stampInfo, SignatureStampState, comp))
-        {
-            // Show popups and play a paper writing sound
-            var signedOtherMessage = Loc.GetString("paper-signed-other", ("user", signer), ("target", paper.Owner));
-            _popup.PopupEntity(signedOtherMessage, signer, Filter.PvsExcept(signer, entityManager: EntityManager), true);
-
-            var signedSelfMessage = Loc.GetString("paper-signed-self", ("target", paper.Owner));
-            _popup.PopupEntity(signedSelfMessage, signer, signer);
-
-            _audio.PlayPvs(comp.Sound, signer);
-
-            _paper.UpdateUserInterface(paper, comp);
-
-            return true;
-        }
-        else
+        // TODO: remove redunant contains check when TryStamp isnt a meme
+        if (comp.StampedBy.Contains(stampInfo) || !_paper.TryStamp(paper, stampInfo, SignatureStampState))
         {
             // Show an error popup
             _popup.PopupEntity(Loc.GetString("paper-signed-failure", ("target", paper.Owner)), signer, signer, PopupType.SmallCaution);
 
             return false;
         }
+
+        // Show popups and play a paper writing sound
+        var signedOtherMessage = Loc.GetString("paper-signed-other", ("user", signer), ("target", paper.Owner));
+        _popup.PopupEntity(signedOtherMessage, signer, Filter.PvsExcept(signer, entityManager: EntityManager), true);
+
+        var signedSelfMessage = Loc.GetString("paper-signed-self", ("target", paper.Owner));
+        _popup.PopupClient(signedSelfMessage, signer, signer);
+
+        _audio.PlayPredicted(comp.Sound, signer, signer);
+
+        return true;
     }
 
     private string DetermineEntitySignature(EntityUid uid)
diff --git a/Content.Shared/DeltaV/Roles/JobRequirement/WhitelistRequirement.cs b/Content.Shared/DeltaV/Roles/JobRequirement/WhitelistRequirement.cs
new file mode 100644
index 00000000000..dfebb583d1d
--- /dev/null
+++ b/Content.Shared/DeltaV/Roles/JobRequirement/WhitelistRequirement.cs
@@ -0,0 +1,29 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Preferences;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Roles;
+
+/// <summary>
+/// Requires the player be globally whitelisted to play a role.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed partial class WhitelistRequirement : JobRequirement
+{
+    public override bool Check(IEntityManager entManager,
+        IPrototypeManager protoManager,
+        HumanoidCharacterProfile? profile,
+        IReadOnlyDictionary<string, TimeSpan> playTimes,
+        [NotNullWhen(false)] out FormattedMessage? reason,
+        bool isWhitelisted)
+    {
+        reason = null;
+        if (isWhitelisted)
+            return true;
+
+        reason = FormattedMessage.FromMarkup(Loc.GetString("playtime-deny-reason-not-whitelisted"));
+        return false;
+    }
+}
diff --git a/Content.Shared/DeltaV/Roles/JobRequirements.Whitelist.cs b/Content.Shared/DeltaV/Roles/JobRequirements.Whitelist.cs
deleted file mode 100644
index a6e352991e9..00000000000
--- a/Content.Shared/DeltaV/Roles/JobRequirements.Whitelist.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using JetBrains.Annotations;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Roles
-{
-    [UsedImplicitly]
-    [Serializable, NetSerializable]
-    public sealed partial class WhitelistRequirement : JobRequirement
-    {
-    }
-}
diff --git a/Content.Shared/Destructible/Thresholds/MinMax.cs b/Content.Shared/Destructible/Thresholds/MinMax.cs
new file mode 100644
index 00000000000..e086a0f61c3
--- /dev/null
+++ b/Content.Shared/Destructible/Thresholds/MinMax.cs
@@ -0,0 +1,24 @@
+using Robust.Shared.Random;
+
+namespace Content.Shared.Destructible.Thresholds;
+
+[DataDefinition, Serializable]
+public partial struct MinMax
+{
+    [DataField]
+    public int Min;
+
+    [DataField]
+    public int Max;
+
+    public MinMax(int min, int max)
+    {
+        Min = min;
+        Max = max;
+    }
+
+    public int Next(IRobustRandom random)
+    {
+        return random.Next(Min, Max + 1);
+    }
+}
diff --git a/Content.Shared/DisplacementMap/DisplacementData.cs b/Content.Shared/DisplacementMap/DisplacementData.cs
new file mode 100644
index 00000000000..7bd5b580e14
--- /dev/null
+++ b/Content.Shared/DisplacementMap/DisplacementData.cs
@@ -0,0 +1,14 @@
+namespace Content.Shared.DisplacementMap;
+
+[DataDefinition]
+public sealed partial class DisplacementData
+{
+    /// <summary>
+    /// allows you to attach different maps for layers of different sizes.
+    /// </summary>
+    [DataField(required: true)]
+    public Dictionary<int, PrototypeLayerData> SizeMaps = new();
+
+    [DataField]
+    public string? ShaderOverride = "DisplacedStencilDraw";
+}
diff --git a/Content.Shared/DoAfter/DoAfterArgs.cs b/Content.Shared/DoAfter/DoAfterArgs.cs
index d96ea84e172..ac662785385 100644
--- a/Content.Shared/DoAfter/DoAfterArgs.cs
+++ b/Content.Shared/DoAfter/DoAfterArgs.cs
@@ -19,14 +19,14 @@ public sealed partial class DoAfterArgs
     /// <summary>
     ///     How long does the do_after require to complete
     /// </summary>
-    [DataField("delay", required: true)]
+    [DataField(required: true)]
     public TimeSpan Delay;
 
     /// <summary>
     ///     Applicable target (if relevant)
     /// </summary>
     [NonSerialized]
-    [DataField("target")]
+    [DataField]
     public EntityUid? Target;
 
     public NetEntity? NetTarget;
@@ -50,7 +50,7 @@ public sealed partial class DoAfterArgs
     /// <summary>
     ///     The event that will get raised when the DoAfter has finished. If null, this will simply raise a <see cref="SimpleDoAfterEvent"/>
     /// </summary>
-    [DataField("event", required: true)]
+    [DataField(required: true)]
     public DoAfterEvent Event = default!;
 
     /// <summary>
@@ -64,7 +64,7 @@ public sealed partial class DoAfterArgs
     ///     Entity which will receive the directed event. If null, no directed event will be raised.
     /// </summary>
     [NonSerialized]
-    [DataField("eventTarget")]
+    [DataField]
     public EntityUid? EventTarget;
 
     public NetEntity? NetEventTarget;
@@ -72,7 +72,7 @@ public sealed partial class DoAfterArgs
     /// <summary>
     /// Should the DoAfter event broadcast? If this is false, then <see cref="EventTarget"/> should be a valid entity.
     /// </summary>
-    [DataField("broadcast")]
+    [DataField]
     public bool Broadcast;
     #endregion
 
@@ -81,16 +81,24 @@ public sealed partial class DoAfterArgs
     /// <summary>
     ///     Whether or not this do after requires the user to have hands.
     /// </summary>
-    [DataField("needHand")]
+    [DataField]
     public bool NeedHand;
 
     /// <summary>
     ///     Whether we need to keep our active hand as is (i.e. can't change hand or change item). This also covers
     ///     requiring the hand to be free (if applicable). This does nothing if <see cref="NeedHand"/> is false.
     /// </summary>
-    [DataField("breakOnHandChange")]
+    [DataField]
     public bool BreakOnHandChange = true;
 
+    /// <summary>
+    ///     Whether the do-after should get interrupted if we drop the
+    ///     active item we started the do-after with
+    ///     This does nothing if <see cref="NeedHand"/> is false.
+    /// </summary>
+    [DataField]
+    public bool BreakOnDropItem = true;
+
     /// <summary>
     ///     If do_after stops when the user or target moves
     /// </summary>
@@ -107,31 +115,31 @@ public sealed partial class DoAfterArgs
     /// <summary>
     ///     Threshold for user and target movement
     /// </summary>
-    [DataField("movementThreshold")]
+    [DataField]
     public float MovementThreshold = 0.3f;
 
     /// <summary>
     ///     Threshold for distance user from the used OR target entities.
     /// </summary>
-    [DataField("distanceThreshold")]
+    [DataField]
     public float? DistanceThreshold;
 
     /// <summary>
     ///     Whether damage will cancel the DoAfter. See also <see cref="DamageThreshold"/>.
     /// </summary>
-    [DataField("breakOnDamage")]
+    [DataField]
     public bool BreakOnDamage;
 
     /// <summary>
     ///     Threshold for user damage. This damage has to be dealt in a single event, not over time.
     /// </summary>
-    [DataField("damageThreshold")]
+    [DataField]
     public FixedPoint2 DamageThreshold = 1;
 
     /// <summary>
     ///     If true, this DoAfter will be canceled if the user can no longer interact with the target.
     /// </summary>
-    [DataField("requireCanInteract")]
+    [DataField]
     public bool RequireCanInteract = true;
     #endregion
 
@@ -143,7 +151,7 @@ public sealed partial class DoAfterArgs
     ///     Note that this will block even if the duplicate is cancelled because either DoAfter had
     ///     <see cref="CancelDuplicate"/> enabled.
     /// </remarks>
-    [DataField("blockDuplicate")]
+    [DataField]
     public bool BlockDuplicate = true;
 
     //TODO: User pref to not cancel on second use on specific doafters
@@ -151,7 +159,7 @@ public sealed partial class DoAfterArgs
     ///     If true, this will cancel any duplicate DoAfters when attempting to add a new DoAfter. See also
     ///     <see cref="DuplicateConditions"/>.
     /// </summary>
-    [DataField("cancelDuplicate")]
+    [DataField]
     public bool CancelDuplicate = true;
 
     /// <summary>
@@ -162,7 +170,7 @@ public sealed partial class DoAfterArgs
     ///     Note that both DoAfters may have their own conditions, and they will be considered duplicated if either set
     ///     of conditions is satisfied.
     /// </remarks>
-    [DataField("duplicateCondition")]
+    [DataField]
     public DuplicateConditions DuplicateCondition = DuplicateConditions.All;
     #endregion
 
@@ -244,6 +252,7 @@ public DoAfterArgs(DoAfterArgs other)
         Broadcast = other.Broadcast;
         NeedHand = other.NeedHand;
         BreakOnHandChange = other.BreakOnHandChange;
+        BreakOnDropItem = other.BreakOnDropItem;
         BreakOnMove = other.BreakOnMove;
         BreakOnWeightlessMove = other.BreakOnWeightlessMove;
         MovementThreshold = other.MovementThreshold;
diff --git a/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs b/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs
index 4f77a271b37..f9718be52de 100644
--- a/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs
+++ b/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Gravity;
 using Content.Shared.Hands.Components;
+using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
 using Content.Shared.Physics;
 using Robust.Shared.Utility;
@@ -11,6 +12,7 @@ public abstract partial class SharedDoAfterSystem : EntitySystem
     [Dependency] private readonly IDynamicTypeFactory _factory = default!;
     [Dependency] private readonly SharedGravitySystem _gravity = default!;
     [Dependency] private readonly SharedInteractionSystem _interaction = default!;
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
 
     private DoAfter[] _doAfters = Array.Empty<DoAfter>();
 
@@ -170,7 +172,7 @@ private bool ShouldCancel(DoAfter doAfter,
         if (args.BreakOnMove && !(!args.BreakOnWeightlessMove && _gravity.IsWeightless(args.User, xform: userXform)))
         {
             // Whether the user has moved too much from their original position.
-            if (!userXform.Coordinates.InRange(EntityManager, _transform, doAfter.UserPosition, args.MovementThreshold))
+            if (!_transform.InRange(userXform.Coordinates, doAfter.UserPosition, args.MovementThreshold))
                 return true;
 
             // Whether the distance between the user and target(if any) has changed too much.
@@ -217,16 +219,22 @@ private bool ShouldCancel(DoAfter doAfter,
         if (args.AttemptFrequency == AttemptFrequency.EveryTick && !TryAttemptEvent(doAfter))
             return true;
 
+        // Check if the do-after requires hands to perform at first
+        // For example, you need hands to strip clothes off of someone
+        // This does not mean their hand needs to be empty.
         if (args.NeedHand)
         {
             if (!handsQuery.TryGetComponent(args.User, out var hands) || hands.Count == 0)
                 return true;
 
-            if (args.BreakOnHandChange && (hands.ActiveHand?.Name != doAfter.InitialHand
-                                           || hands.ActiveHandEntity != doAfter.InitialItem))
-            {
+            // If an item was in the user's hand to begin with,
+            // check if the user is no longer holding the item.
+            if (args.BreakOnDropItem && doAfter.InitialItem != null && !_hands.IsHolding((args.User, hands), doAfter.InitialItem))
+                    return true;
+
+            // If the user changes which hand is active at all, interrupt the do-after
+            if (args.BreakOnHandChange && hands.ActiveHand?.Name != doAfter.InitialHand)
                 return true;
-            }
         }
 
         if (args.RequireCanInteract && !_actionBlocker.CanInteract(args.User, args.Target))
diff --git a/Content.Shared/DoAfter/SharedDoAfterSystem.cs b/Content.Shared/DoAfter/SharedDoAfterSystem.cs
index 77b47415333..86f29fd49c8 100644
--- a/Content.Shared/DoAfter/SharedDoAfterSystem.cs
+++ b/Content.Shared/DoAfter/SharedDoAfterSystem.cs
@@ -227,7 +227,7 @@ public bool TryStartDoAfter(DoAfterArgs args, [NotNullWhen(true)] out DoAfterId?
 
         // For this we need to stay on the same hand slot and need the same item in that hand slot
         // (or if there is no item there we need to keep it free).
-        if (args.NeedHand && args.BreakOnHandChange)
+        if (args.NeedHand && (args.BreakOnHandChange || args.BreakOnDropItem))
         {
             if (!TryComp(args.User, out HandsComponent? handsComponent))
                 return false;
@@ -393,5 +393,18 @@ public DoAfterStatus GetStatus(EntityUid entity, ushort id, DoAfterComponent? co
         // networking whether a do-after has raised its events or not.
         return DoAfterStatus.Finished;
     }
+
+    public bool IsRunning(DoAfterId? id, DoAfterComponent? comp = null)
+    {
+        if (id == null)
+            return false;
+
+        return GetStatus(id.Value.Uid, id.Value.Index, comp) == DoAfterStatus.Running;
+    }
+
+    public bool IsRunning(EntityUid entity, ushort id, DoAfterComponent? comp = null)
+    {
+        return GetStatus(entity, id, comp) == DoAfterStatus.Running;
+    }
     #endregion
 }
diff --git a/Content.Shared/Doors/Systems/SharedDoorSystem.cs b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
index ab2df72568e..2319d5e916b 100644
--- a/Content.Shared/Doors/Systems/SharedDoorSystem.cs
+++ b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
@@ -21,6 +21,7 @@
 using Robust.Shared.Timing;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Network;
+using Robust.Shared.Map.Components;
 
 namespace Content.Shared.Doors.Systems;
 
@@ -40,6 +41,8 @@ public abstract partial class SharedDoorSystem : EntitySystem
     [Dependency] private readonly AccessReaderSystem _accessReaderSystem = default!;
     [Dependency] private readonly PryingSystem _pryingSystem = default!;
     [Dependency] protected readonly SharedPopupSystem Popup = default!;
+    [Dependency] private readonly SharedMapSystem _mapSystem = default!;
+
 
     [ValidatePrototypeId<TagPrototype>]
     public const string DoorBumpTag = "DoorBumpOpener";
@@ -546,29 +549,37 @@ public IEnumerable<EntityUid> GetColliding(EntityUid uid, PhysicsComponent? phys
         if (!Resolve(uid, ref physics))
             yield break;
 
+        var xform = Transform(uid);
+        // Getting the world bounds from the gridUid allows us to use the version of
+        // GetCollidingEntities that returns Entity<PhysicsComponent>
+        if (!TryComp<MapGridComponent>(xform.GridUid, out var mapGridComp))
+            yield break;
+        var tileRef = _mapSystem.GetTileRef(xform.GridUid.Value, mapGridComp, xform.Coordinates);
+        var doorWorldBounds = _entityLookup.GetWorldBounds(tileRef);
+
         // TODO SLOTH fix electro's code.
         // ReSharper disable once InconsistentNaming
         var doorAABB = _entityLookup.GetWorldAABB(uid);
 
-        foreach (var otherPhysics in PhysicsSystem.GetCollidingEntities(Transform(uid).MapID, doorAABB))
+        foreach (var otherPhysics in PhysicsSystem.GetCollidingEntities(Transform(uid).MapID, doorWorldBounds))
         {
-            if (otherPhysics == physics)
+            if (otherPhysics.Comp == physics)
                 continue;
 
             //TODO: Make only shutters ignore these objects upon colliding instead of all airlocks
             // Excludes Glasslayer for windows, GlassAirlockLayer for windoors, TableLayer for tables
-            if (!otherPhysics.CanCollide || otherPhysics.CollisionLayer == (int)CollisionGroup.GlassLayer || otherPhysics.CollisionLayer == (int)CollisionGroup.GlassAirlockLayer || otherPhysics.CollisionLayer == (int)CollisionGroup.TableLayer)
+            if (!otherPhysics.Comp.CanCollide || otherPhysics.Comp.CollisionLayer == (int) CollisionGroup.GlassLayer || otherPhysics.Comp.CollisionLayer == (int) CollisionGroup.GlassAirlockLayer || otherPhysics.Comp.CollisionLayer == (int) CollisionGroup.TableLayer)
                 continue;
 
             //If the colliding entity is a slippable item ignore it by the airlock
-            if (otherPhysics.CollisionLayer == (int)CollisionGroup.SlipLayer && otherPhysics.CollisionMask == (int)CollisionGroup.ItemMask)
+            if (otherPhysics.Comp.CollisionLayer == (int) CollisionGroup.SlipLayer && otherPhysics.Comp.CollisionMask == (int) CollisionGroup.ItemMask)
                 continue;
 
             //For when doors need to close over conveyor belts
-            if (otherPhysics.CollisionLayer == (int) CollisionGroup.ConveyorMask)
+            if (otherPhysics.Comp.CollisionLayer == (int) CollisionGroup.ConveyorMask)
                 continue;
 
-            if ((physics.CollisionMask & otherPhysics.CollisionLayer) == 0 && (otherPhysics.CollisionMask & physics.CollisionLayer) == 0)
+            if ((physics.CollisionMask & otherPhysics.Comp.CollisionLayer) == 0 && (otherPhysics.Comp.CollisionMask & physics.CollisionLayer) == 0)
                 continue;
 
             if (_entityLookup.GetWorldAABB(otherPhysics.Owner).IntersectPercentage(doorAABB) < IntersectPercentage)
diff --git a/Content.Shared/Drowsiness/DrowsinessComponent.cs b/Content.Shared/Drowsiness/DrowsinessComponent.cs
new file mode 100644
index 00000000000..7e170ed232e
--- /dev/null
+++ b/Content.Shared/Drowsiness/DrowsinessComponent.cs
@@ -0,0 +1,28 @@
+using System.Numerics;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.Drowsiness;
+
+/// <summary>
+///     Exists for use as a status effect. Adds a shader to the client that scales with the effect duration.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentPause]
+public sealed partial class DrowsinessComponent : Component
+{
+    /// <summary>
+    /// The random time between sleeping incidents, (min, max).
+    /// </summary>
+    [DataField(required: true)]
+    public Vector2 TimeBetweenIncidents = new Vector2(5f, 60f);
+
+    /// <summary>
+    /// The duration of sleeping incidents, (min, max).
+    /// </summary>
+    [DataField(required: true)]
+    public Vector2 DurationOfIncident = new Vector2(2, 5);
+
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
+    public TimeSpan NextIncidentTime = TimeSpan.Zero;
+}
diff --git a/Content.Shared/Drowsiness/DrowsinessSystem.cs b/Content.Shared/Drowsiness/DrowsinessSystem.cs
new file mode 100644
index 00000000000..97d7c0952dc
--- /dev/null
+++ b/Content.Shared/Drowsiness/DrowsinessSystem.cs
@@ -0,0 +1,9 @@
+using Content.Shared.StatusEffect;
+
+namespace Content.Shared.Drowsiness;
+
+public abstract class SharedDrowsinessSystem : EntitySystem
+{
+    [ValidatePrototypeId<StatusEffectPrototype>]
+    public const string DrowsinessKey = "Drowsiness";
+}
diff --git a/Content.Shared/Ensnaring/Components/EnsnareableComponent.cs b/Content.Shared/Ensnaring/Components/EnsnareableComponent.cs
index 2536fac4edc..cd7824bb960 100644
--- a/Content.Shared/Ensnaring/Components/EnsnareableComponent.cs
+++ b/Content.Shared/Ensnaring/Components/EnsnareableComponent.cs
@@ -47,6 +47,8 @@ public sealed partial class EnsnareableComponent : Component
     public ProtoId<AlertPrototype> EnsnaredAlert = "Ensnared";
 }
 
+public sealed partial class RemoveEnsnareAlertEvent : BaseAlertEvent;
+
 [Serializable, NetSerializable]
 public sealed class EnsnareableComponentState : ComponentState
 {
diff --git a/Content.Shared/Examine/ExamineSystemShared.cs b/Content.Shared/Examine/ExamineSystemShared.cs
index 4100b07483f..f0406c53989 100644
--- a/Content.Shared/Examine/ExamineSystemShared.cs
+++ b/Content.Shared/Examine/ExamineSystemShared.cs
@@ -18,6 +18,7 @@ namespace Content.Shared.Examine
 {
     public abstract partial class ExamineSystemShared : EntitySystem
     {
+        [Dependency] private readonly OccluderSystem _occluder = default!;
         [Dependency] private readonly SharedTransformSystem _transform = default!;
         [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
         [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
@@ -182,12 +183,9 @@ public bool InRangeUnOccluded<TState>(MapCoordinates origin, MapCoordinates othe
                 length = MaxRaycastRange;
             }
 
-            var occluderSystem = Get<OccluderSystem>();
-            IoCManager.Resolve(ref entMan);
-
             var ray = new Ray(origin.Position, dir.Normalized());
-            var rayResults = occluderSystem
-                .IntersectRayWithPredicate(origin.MapId, ray, length, state, predicate, false).ToList();
+            var rayResults = _occluder
+                .IntersectRayWithPredicate(origin.MapId, ray, length, state, predicate, false);
 
             if (rayResults.Count == 0) return true;
 
@@ -195,13 +193,13 @@ public bool InRangeUnOccluded<TState>(MapCoordinates origin, MapCoordinates othe
 
             foreach (var result in rayResults)
             {
-                if (!entMan.TryGetComponent(result.HitEntity, out OccluderComponent? o))
+                if (!TryComp(result.HitEntity, out OccluderComponent? o))
                 {
                     continue;
                 }
 
                 var bBox = o.BoundingBox;
-                bBox = bBox.Translated(entMan.GetComponent<TransformComponent>(result.HitEntity).WorldPosition);
+                bBox = bBox.Translated(_transform.GetWorldPosition(result.HitEntity));
 
                 if (bBox.Contains(origin.Position) || bBox.Contains(other.Position))
                 {
@@ -216,7 +214,6 @@ public bool InRangeUnOccluded<TState>(MapCoordinates origin, MapCoordinates othe
 
         public bool InRangeUnOccluded(EntityUid origin, EntityUid other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
         {
-            var entMan = IoCManager.Resolve<IEntityManager>();
             var originPos = _transform.GetMapCoordinates(origin);
             var otherPos = _transform.GetMapCoordinates(other);
 
@@ -225,16 +222,14 @@ public bool InRangeUnOccluded(EntityUid origin, EntityUid other, float range = E
 
         public bool InRangeUnOccluded(EntityUid origin, EntityCoordinates other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
         {
-            var entMan = IoCManager.Resolve<IEntityManager>();
             var originPos = _transform.GetMapCoordinates(origin);
-            var otherPos = other.ToMap(entMan, _transform);
+            var otherPos = _transform.ToMapCoordinates(other);
 
             return InRangeUnOccluded(originPos, otherPos, range, predicate, ignoreInsideBlocker);
         }
 
         public bool InRangeUnOccluded(EntityUid origin, MapCoordinates other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
         {
-            var entMan = IoCManager.Resolve<IEntityManager>();
             var originPos = _transform.GetMapCoordinates(origin);
 
             return InRangeUnOccluded(originPos, other, range, predicate, ignoreInsideBlocker);
@@ -250,11 +245,12 @@ public FormattedMessage GetExamineText(EntityUid entity, EntityUid? examiner)
             }
 
             var hasDescription = false;
+            var metadata = MetaData(entity);
 
             //Add an entity description if one is declared
-            if (!string.IsNullOrEmpty(EntityManager.GetComponent<MetaDataComponent>(entity).EntityDescription))
+            if (!string.IsNullOrEmpty(metadata.EntityDescription))
             {
-                message.AddText(EntityManager.GetComponent<MetaDataComponent>(entity).EntityDescription);
+                message.AddText(metadata.EntityDescription);
                 hasDescription = true;
             }
 
@@ -356,7 +352,7 @@ int Comparison(ExamineMessagePart a, ExamineMessagePart b)
             var totalMessage = new FormattedMessage(Message);
             parts.Sort(Comparison);
 
-            if (_hasDescription)
+            if (_hasDescription && parts.Count > 0)
             {
                 totalMessage.PushNewline();
             }
diff --git a/Content.Server/Explosion/Components/ExplosionResistanceComponent.cs b/Content.Shared/Explosion/Components/ExplosionResistanceComponent.cs
similarity index 89%
rename from Content.Server/Explosion/Components/ExplosionResistanceComponent.cs
rename to Content.Shared/Explosion/Components/ExplosionResistanceComponent.cs
index d4a93c2b569..3b5c64c3ec9 100644
--- a/Content.Server/Explosion/Components/ExplosionResistanceComponent.cs
+++ b/Content.Shared/Explosion/Components/ExplosionResistanceComponent.cs
@@ -1,8 +1,8 @@
-using Content.Server.Explosion.EntitySystems;
-using Content.Shared.Explosion;
+using Content.Shared.Explosion.EntitySystems;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
+using Robust.Shared.GameStates;
 
-namespace Content.Server.Explosion.Components;
+namespace Content.Shared.Explosion.Components;
 
 /// <summary>
 /// Component that provides entities with explosion resistance.
@@ -13,8 +13,8 @@ namespace Content.Server.Explosion.Components;
 ///     This is desirable over just using damage modifier sets, given that equipment like bomb-suits need to
 ///     significantly reduce the damage, but shouldn't be silly overpowered in regular combat.
 /// </remarks>
-[RegisterComponent]
-[Access(typeof(ExplosionSystem))]
+[NetworkedComponent, RegisterComponent]
+[Access(typeof(SharedExplosionSystem))]
 public sealed partial class ExplosionResistanceComponent : Component
 {
     /// <summary>
diff --git a/Content.Shared/Explosion/Components/OnTrigger/SmokeOnTriggerComponent.cs b/Content.Shared/Explosion/Components/OnTrigger/SmokeOnTriggerComponent.cs
index 80d65f4c2cd..1138e74af8f 100644
--- a/Content.Shared/Explosion/Components/OnTrigger/SmokeOnTriggerComponent.cs
+++ b/Content.Shared/Explosion/Components/OnTrigger/SmokeOnTriggerComponent.cs
@@ -29,7 +29,7 @@ public sealed partial class SmokeOnTriggerComponent : Component
     /// Defaults to smoke but you can use foam if you want.
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public ProtoId<EntityPrototype> SmokePrototype = "Smoke";
+    public EntProtoId SmokePrototype = "Smoke";
 
     /// <summary>
     /// Solution to add to each smoke cloud.
diff --git a/Content.Shared/Explosion/EntitySystems/SharedExplosionSystem.cs b/Content.Shared/Explosion/EntitySystems/SharedExplosionSystem.cs
new file mode 100644
index 00000000000..1d926dd0b67
--- /dev/null
+++ b/Content.Shared/Explosion/EntitySystems/SharedExplosionSystem.cs
@@ -0,0 +1,25 @@
+using Content.Shared.Explosion.Components;
+using Content.Shared.Armor;
+
+namespace Content.Shared.Explosion.EntitySystems;
+
+public abstract class SharedExplosionSystem : EntitySystem
+{
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<ExplosionResistanceComponent, ArmorExamineEvent>(OnArmorExamine);
+    }
+
+    private void OnArmorExamine(EntityUid uid, ExplosionResistanceComponent component, ref ArmorExamineEvent args)
+    {
+        var value = MathF.Round((1f - component.DamageCoefficient) * 100, 1);
+
+        if (value == 0)
+            return;
+
+        args.Msg.PushNewline();
+        args.Msg.AddMarkupOrThrow(Loc.GetString(component.Examine, ("value", value)));
+    }
+}
diff --git a/Content.Shared/Extinguisher/SharedFireExtinguisherComponent.cs b/Content.Shared/Extinguisher/SharedFireExtinguisherComponent.cs
deleted file mode 100644
index dbb1f6f2c4d..00000000000
--- a/Content.Shared/Extinguisher/SharedFireExtinguisherComponent.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Robust.Shared.Audio;
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Extinguisher;
-
-[NetworkedComponent]
-public abstract partial class SharedFireExtinguisherComponent : Component
-{
-    [DataField("refillSound")] public SoundSpecifier RefillSound = new SoundPathSpecifier("/Audio/Effects/refill.ogg");
-
-    [DataField("hasSafety")] public bool HasSafety = true;
-
-    [DataField("safety")] public bool Safety = true;
-
-    [DataField("safetySound")]
-    public SoundSpecifier SafetySound { get; private set; } = new SoundPathSpecifier("/Audio/Machines/button.ogg");
-}
-
-
-[Serializable, NetSerializable]
-public enum FireExtinguisherVisuals : byte
-{
-    Safety
-}
diff --git a/Content.Server/Eye/Blinding/ActivatableUIRequiresVisionComponent.cs b/Content.Shared/Eye/Blinding/Components/ActivatableUIRequiresVisionComponent.cs
similarity index 58%
rename from Content.Server/Eye/Blinding/ActivatableUIRequiresVisionComponent.cs
rename to Content.Shared/Eye/Blinding/Components/ActivatableUIRequiresVisionComponent.cs
index 725b871b16d..afb270414f3 100644
--- a/Content.Server/Eye/Blinding/ActivatableUIRequiresVisionComponent.cs
+++ b/Content.Shared/Eye/Blinding/Components/ActivatableUIRequiresVisionComponent.cs
@@ -1,8 +1,6 @@
-namespace Content.Server.Eye.Blinding
+namespace Content.Shared.Eye.Blinding.Components
 {
     [RegisterComponent]
-    public sealed partial class ActivatableUIRequiresVisionComponent : Component
-    {
-    }
+    public sealed partial class ActivatableUIRequiresVisionComponent : Component;
 }
 
diff --git a/Content.Server/Eye/Blinding/ActivatableUIRequiresVisionSystem.cs b/Content.Shared/Eye/Blinding/Systems/ActivatableUIRequiresVisionSystem.cs
similarity index 77%
rename from Content.Server/Eye/Blinding/ActivatableUIRequiresVisionSystem.cs
rename to Content.Shared/Eye/Blinding/Systems/ActivatableUIRequiresVisionSystem.cs
index 7b937cf0d81..6ed0c4cd6db 100644
--- a/Content.Server/Eye/Blinding/ActivatableUIRequiresVisionSystem.cs
+++ b/Content.Shared/Eye/Blinding/Systems/ActivatableUIRequiresVisionSystem.cs
@@ -1,18 +1,14 @@
-using Content.Shared.Eye.Blinding;
 using Content.Shared.UserInterface;
-using Content.Server.Popups;
 using Content.Shared.Eye.Blinding.Components;
-using Content.Shared.Eye.Blinding.Systems;
-using Robust.Shared.Player;
-using Robust.Server.GameObjects;
+using Content.Shared.Popups;
 using Robust.Shared.Collections;
 
-namespace Content.Server.Eye.Blinding;
+namespace Content.Shared.Eye.Blinding.Systems;
 
 public sealed class ActivatableUIRequiresVisionSystem : EntitySystem
 {
-    [Dependency] private readonly PopupSystem _popupSystem = default!;
-    [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+    [Dependency] private readonly SharedUserInterfaceSystem _userInterfaceSystem = default!;
 
     public override void Initialize()
     {
@@ -28,7 +24,7 @@ private void OnOpenAttempt(EntityUid uid, ActivatableUIRequiresVisionComponent c
 
         if (TryComp<BlindableComponent>(args.User, out var blindable) && blindable.IsBlind)
         {
-            _popupSystem.PopupCursor(Loc.GetString("blindness-fail-attempt"), args.User, Shared.Popups.PopupType.MediumCaution);
+            _popupSystem.PopupClient(Loc.GetString("blindness-fail-attempt"), args.User, Shared.Popups.PopupType.MediumCaution);
             args.Cancel();
         }
     }
diff --git a/Content.Server/Eye/Blinding/EyeProtection/EyeProtectionSystem.cs b/Content.Shared/Eye/Blinding/Systems/EyeProtectionSystem.cs
similarity index 96%
rename from Content.Server/Eye/Blinding/EyeProtection/EyeProtectionSystem.cs
rename to Content.Shared/Eye/Blinding/Systems/EyeProtectionSystem.cs
index 2d54c03b51b..0fc01f1b4e5 100644
--- a/Content.Server/Eye/Blinding/EyeProtection/EyeProtectionSystem.cs
+++ b/Content.Shared/Eye/Blinding/Systems/EyeProtectionSystem.cs
@@ -1,17 +1,16 @@
 using Content.Shared.StatusEffect;
 using Content.Shared.Inventory;
 using Content.Shared.Eye.Blinding.Components;
-using Content.Shared.Eye.Blinding.Systems;
 using Content.Shared.Tools.Components;
 using Content.Shared.Item.ItemToggle.Components;
 
-namespace Content.Server.Eye.Blinding.EyeProtection
+namespace Content.Shared.Eye.Blinding.Systems
 {
     public sealed class EyeProtectionSystem : EntitySystem
     {
         [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
         [Dependency] private readonly BlindableSystem _blindingSystem = default!;
-        
+
         public override void Initialize()
         {
             base.Initialize();
@@ -58,6 +57,7 @@ private void OnUseAttempt(EntityUid uid, RequiresEyeProtectionComponent componen
         private void OnWelderToggled(EntityUid uid, RequiresEyeProtectionComponent component, ItemToggledEvent args)
         {
             component.Toggled = args.Activated;
+            Dirty(uid, component);
         }
     }
 }
diff --git a/Content.Shared/Fax/AdminFaxEui.cs b/Content.Shared/Fax/AdminFaxEui.cs
index 7b3e1fae8d3..613a13d0124 100644
--- a/Content.Shared/Fax/AdminFaxEui.cs
+++ b/Content.Shared/Fax/AdminFaxEui.cs
@@ -56,8 +56,9 @@ public sealed class Send : EuiMessageBase
         public string Content { get; }
         public string StampState { get; }
         public Color StampColor { get; }
+        public bool Locked { get; }
 
-        public Send(NetEntity target, string title, string from, string content, string stamp, Color stampColor)
+        public Send(NetEntity target, string title, string from, string content, string stamp, Color stampColor, bool locked)
         {
             Target = target;
             Title = title;
@@ -65,6 +66,7 @@ public Send(NetEntity target, string title, string from, string content, string
             Content = content;
             StampState = stamp;
             StampColor = stampColor;
+            Locked = locked;
         }
     }
 }
diff --git a/Content.Shared/Fax/Components/FaxMachineComponent.cs b/Content.Shared/Fax/Components/FaxMachineComponent.cs
index 6664ce023dd..161c878e275 100644
--- a/Content.Shared/Fax/Components/FaxMachineComponent.cs
+++ b/Content.Shared/Fax/Components/FaxMachineComponent.cs
@@ -127,6 +127,20 @@ public sealed partial class FaxMachineComponent : Component
     /// </summary>
     [ViewVariables]
     public float PrintingTime = 2.3f;
+
+    /// <summary>
+    ///     The prototype ID to use for faxed or copied entities if we can't get one from
+    ///     the paper entity for whatever reason.
+    /// </summary>
+    [DataField]
+    public EntProtoId PrintPaperId = "Paper";
+
+    /// <summary>
+    ///     The prototype ID to use for faxed or copied entities if we can't get one from
+    ///     the paper entity for whatever reason of the Office type.
+    /// </summary>
+    [DataField]
+    public EntProtoId PrintOfficePaperId = "PaperOffice";
 }
 
 [DataDefinition]
@@ -150,11 +164,14 @@ public sealed partial class FaxPrintout
     [DataField("stampedBy")]
     public List<StampDisplayInfo> StampedBy { get; private set; } = new();
 
+    [DataField]
+    public bool Locked { get; private set; }
+
     private FaxPrintout()
     {
     }
 
-    public FaxPrintout(string content, string name, string? label = null, string? prototypeId = null, string? stampState = null, List<StampDisplayInfo>? stampedBy = null)
+    public FaxPrintout(string content, string name, string? label = null, string? prototypeId = null, string? stampState = null, List<StampDisplayInfo>? stampedBy = null, bool locked = false)
     {
         Content = content;
         Name = name;
@@ -162,5 +179,6 @@ public FaxPrintout(string content, string name, string? label = null, string? pr
         PrototypeId = prototypeId ?? "";
         StampState = stampState;
         StampedBy = stampedBy ?? new List<StampDisplayInfo>();
+        Locked = locked;
     }
 }
diff --git a/Content.Shared/FixedPoint/FixedPoint2.cs b/Content.Shared/FixedPoint/FixedPoint2.cs
index 6439ee6c5e2..7316d22f113 100644
--- a/Content.Shared/FixedPoint/FixedPoint2.cs
+++ b/Content.Shared/FixedPoint/FixedPoint2.cs
@@ -48,6 +48,8 @@ public static FixedPoint2 New(int value)
 
         public static FixedPoint2 FromCents(int value) => new(value);
 
+        public static FixedPoint2 FromHundredths(int value) => new(value);
+
         public static FixedPoint2 New(float value)
         {
             return new((int) ApplyFloatEpsilon(value * ShiftConstant));
@@ -245,14 +247,14 @@ public static FixedPoint2 Dist(FixedPoint2 a, FixedPoint2 b)
             return FixedPoint2.Abs(a - b);
         }
 
-        public static FixedPoint2 Clamp(FixedPoint2 reagent, FixedPoint2 min, FixedPoint2 max)
+        public static FixedPoint2 Clamp(FixedPoint2 number, FixedPoint2 min, FixedPoint2 max)
         {
             if (min > max)
             {
                 throw new ArgumentException($"{nameof(min)} {min} cannot be larger than {nameof(max)} {max}");
             }
 
-            return reagent < min ? min : reagent > max ? max : reagent;
+            return number < min ? min : number > max ? max : number;
         }
 
         public override readonly bool Equals(object? obj)
@@ -274,7 +276,7 @@ public void Deserialize(string value)
             if (value == "MaxValue")
                 Value = int.MaxValue;
             else
-                this = New(Parse.Float(value));
+                this = New(Parse.Double(value));
         }
 
         public override readonly string ToString() => $"{ShiftDown().ToString(CultureInfo.InvariantCulture)}";
@@ -314,7 +316,7 @@ public readonly int CompareTo(FixedPoint2 other)
 
     }
 
-    public static class FixedPointEnumerableExt
+    public static class FixedPoint2EnumerableExt
     {
         public static FixedPoint2 Sum(this IEnumerable<FixedPoint2> source)
         {
diff --git a/Content.Shared/FixedPoint/FixedPoint4.cs b/Content.Shared/FixedPoint/FixedPoint4.cs
new file mode 100644
index 00000000000..b17587f684b
--- /dev/null
+++ b/Content.Shared/FixedPoint/FixedPoint4.cs
@@ -0,0 +1,339 @@
+using System.Globalization;
+using System.Linq;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.FixedPoint
+{
+    /// <summary>
+    ///     Represents a quantity of something, to a precision of 0.01.
+    ///     To enforce this level of precision, floats are shifted by 2 decimal points, rounded, and converted to an int.
+    /// </summary>
+    [Serializable, CopyByRef]
+    public struct FixedPoint4 : ISelfSerialize, IComparable<FixedPoint4>, IEquatable<FixedPoint4>, IFormattable
+    {
+        public long Value { get; private set; }
+        private const long Shift = 4;
+        private const long ShiftConstant = 10000; // Must be equal to pow(10, Shift)
+
+        public static FixedPoint4 MaxValue { get; } = new(long.MaxValue);
+        public static FixedPoint4 Epsilon { get; } = new(1);
+        public static FixedPoint4 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 FixedPoint4()
+        {
+            // ReSharper disable once CompareOfFloatsByEqualityOperator
+            DebugTools.Assert(Math.Pow(10, Shift) == ShiftConstant, "ShiftConstant must be equal to pow(10, Shift)");
+        }
+#endif
+
+        private readonly double ShiftDown()
+        {
+            return Value / (double) ShiftConstant;
+        }
+
+        private FixedPoint4(long value)
+        {
+            Value = value;
+        }
+
+        public static FixedPoint4 New(long value)
+        {
+            return new(value * ShiftConstant);
+        }
+        public static FixedPoint4 FromTenThousandths(long value) => new(value);
+
+        public static FixedPoint4 New(float value)
+        {
+            return new((long) 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>
+        /// Create the closest <see cref="FixedPoint4"/> for a float value, always rounding up.
+        /// </summary>
+        public static FixedPoint4 NewCeiling(float value)
+        {
+            return new((long) MathF.Ceiling(value * ShiftConstant));
+        }
+
+        public static FixedPoint4 New(double value)
+        {
+            return new((long) ApplyFloatEpsilon(value * ShiftConstant));
+        }
+
+        public static FixedPoint4 New(string value)
+        {
+            return New(Parse.Float(value));
+        }
+
+        public static FixedPoint4 operator +(FixedPoint4 a) => a;
+
+        public static FixedPoint4 operator -(FixedPoint4 a) => new(-a.Value);
+
+        public static FixedPoint4 operator +(FixedPoint4 a, FixedPoint4 b)
+            => new(a.Value + b.Value);
+
+        public static FixedPoint4 operator -(FixedPoint4 a, FixedPoint4 b)
+            => new(a.Value - b.Value);
+
+        public static FixedPoint4 operator *(FixedPoint4 a, FixedPoint4 b)
+        {
+            return new(b.Value * a.Value / ShiftConstant);
+        }
+
+        public static FixedPoint4 operator *(FixedPoint4 a, float b)
+        {
+            return new((long) ApplyFloatEpsilon(a.Value * b));
+        }
+
+        public static FixedPoint4 operator *(FixedPoint4 a, double b)
+        {
+            return new((long) ApplyFloatEpsilon(a.Value * b));
+        }
+
+        public static FixedPoint4 operator *(FixedPoint4 a, long b)
+        {
+            return new(a.Value * b);
+        }
+
+        public static FixedPoint4 operator /(FixedPoint4 a, FixedPoint4 b)
+        {
+            return new((long) (ShiftConstant * (long) a.Value / b.Value));
+        }
+
+        public static FixedPoint4 operator /(FixedPoint4 a, float b)
+        {
+            return new((long) ApplyFloatEpsilon(a.Value / b));
+        }
+
+        public static bool operator <=(FixedPoint4 a, long b)
+        {
+            return a <= New(b);
+        }
+
+        public static bool operator >=(FixedPoint4 a, long b)
+        {
+            return a >= New(b);
+        }
+
+        public static bool operator <(FixedPoint4 a, long b)
+        {
+            return a < New(b);
+        }
+
+        public static bool operator >(FixedPoint4 a, long b)
+        {
+            return a > New(b);
+        }
+
+        public static bool operator ==(FixedPoint4 a, long b)
+        {
+            return a == New(b);
+        }
+
+        public static bool operator !=(FixedPoint4 a, long b)
+        {
+            return a != New(b);
+        }
+
+        public static bool operator ==(FixedPoint4 a, FixedPoint4 b)
+        {
+            return a.Equals(b);
+        }
+
+        public static bool operator !=(FixedPoint4 a, FixedPoint4 b)
+        {
+            return !a.Equals(b);
+        }
+
+        public static bool operator <=(FixedPoint4 a, FixedPoint4 b)
+        {
+            return a.Value <= b.Value;
+        }
+
+        public static bool operator >=(FixedPoint4 a, FixedPoint4 b)
+        {
+            return a.Value >= b.Value;
+        }
+
+        public static bool operator <(FixedPoint4 a, FixedPoint4 b)
+        {
+            return a.Value < b.Value;
+        }
+
+        public static bool operator >(FixedPoint4 a, FixedPoint4 b)
+        {
+            return a.Value > b.Value;
+        }
+
+        public readonly float Float()
+        {
+            return (float) ShiftDown();
+        }
+
+        public readonly double Double()
+        {
+            return ShiftDown();
+        }
+
+        public readonly long Long()
+        {
+            return Value / ShiftConstant;
+        }
+
+        public readonly int Int()
+        {
+            return (int)Long();
+        }
+
+        // Implicit operators ftw
+        public static implicit operator FixedPoint4(FixedPoint2 n) => New(n.Int());
+        public static implicit operator FixedPoint4(float n) => New(n);
+        public static implicit operator FixedPoint4(double n) => New(n);
+        public static implicit operator FixedPoint4(int n) => New(n);
+        public static implicit operator FixedPoint4(long n) => New(n);
+
+        public static explicit operator FixedPoint2(FixedPoint4 n) => n.Int();
+        public static explicit operator float(FixedPoint4 n) => n.Float();
+        public static explicit operator double(FixedPoint4 n) => n.Double();
+        public static explicit operator int(FixedPoint4 n) => n.Int();
+        public static explicit operator long(FixedPoint4 n) => n.Long();
+
+        public static FixedPoint4 Min(params FixedPoint4[] fixedPoints)
+        {
+            return fixedPoints.Min();
+        }
+
+        public static FixedPoint4 Min(FixedPoint4 a, FixedPoint4 b)
+        {
+            return a < b ? a : b;
+        }
+
+        public static FixedPoint4 Max(FixedPoint4 a, FixedPoint4 b)
+        {
+            return a > b ? a : b;
+        }
+
+        public static long Sign(FixedPoint4 value)
+        {
+            if (value < Zero)
+            {
+                return -1;
+            }
+
+            if (value > Zero)
+            {
+                return 1;
+            }
+
+            return 0;
+        }
+
+        public static FixedPoint4 Abs(FixedPoint4 a)
+        {
+            return FromTenThousandths(Math.Abs(a.Value));
+        }
+
+        public static FixedPoint4 Dist(FixedPoint4 a, FixedPoint4 b)
+        {
+            return FixedPoint4.Abs(a - b);
+        }
+
+        public static FixedPoint4 Clamp(FixedPoint4 number, FixedPoint4 min, FixedPoint4 max)
+        {
+            if (min > max)
+            {
+                throw new ArgumentException($"{nameof(min)} {min} cannot be larger than {nameof(max)} {max}");
+            }
+
+            return number < min ? min : number > max ? max : number;
+        }
+
+        public override readonly bool Equals(object? obj)
+        {
+            return obj is FixedPoint4 unit &&
+                   Value == unit.Value;
+        }
+
+        public override readonly int GetHashCode()
+        {
+            // ReSharper disable once NonReadonlyMemberInGetHashCode
+            return HashCode.Combine(Value);
+        }
+
+        public void Deserialize(string value)
+        {
+            // TODO implement "lossless" serializer.
+            // I.e., dont use floats.
+            if (value == "MaxValue")
+                Value = int.MaxValue;
+            else
+                this = New(Parse.Double(value));
+        }
+
+        public override readonly string ToString() => $"{ShiftDown().ToString(CultureInfo.InvariantCulture)}";
+
+        public string ToString(string? format, IFormatProvider? formatProvider)
+        {
+            return ToString();
+        }
+
+        public readonly string Serialize()
+        {
+            // TODO implement "lossless" serializer.
+            // I.e., dont use floats.
+            if (Value == int.MaxValue)
+                return "MaxValue";
+
+            return ToString();
+        }
+
+        public readonly bool Equals(FixedPoint4 other)
+        {
+            return Value == other.Value;
+        }
+
+        public readonly int CompareTo(FixedPoint4 other)
+        {
+            if (other.Value > Value)
+            {
+                return -1;
+            }
+            if (other.Value < Value)
+            {
+                return 1;
+            }
+            return 0;
+        }
+
+    }
+
+    public static class FixedPoint4EnumerableExt
+    {
+        public static FixedPoint4 Sum(this IEnumerable<FixedPoint4> source)
+        {
+            var acc = FixedPoint4.Zero;
+
+            foreach (var n in source)
+            {
+                acc += n;
+            }
+
+            return acc;
+        }
+    }
+}
diff --git a/Content.Shared/Fluids/Components/SpraySafetyComponent.cs b/Content.Shared/Fluids/Components/SpraySafetyComponent.cs
new file mode 100644
index 00000000000..30827d4fd1c
--- /dev/null
+++ b/Content.Shared/Fluids/Components/SpraySafetyComponent.cs
@@ -0,0 +1,24 @@
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Fluids.Components;
+
+/// <summary>
+/// Uses <c>ItemToggle</c> to control safety for a spray item.
+/// You can't spray or refill it while safety is on.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(SpraySafetySystem))]
+public sealed partial class SpraySafetyComponent : Component
+{
+    /// <summary>
+    /// Popup shown when trying to spray or refill with safety on.
+    /// </summary>
+    [DataField]
+    public LocId Popup = "fire-extinguisher-component-safety-on-message";
+
+    /// <summary>
+    /// Sound to play after refilling.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier RefillSound = new SoundPathSpecifier("/Audio/Effects/refill.ogg");
+}
diff --git a/Content.Shared/Fluids/Events.cs b/Content.Shared/Fluids/Events.cs
index e281de91377..198e8887742 100644
--- a/Content.Shared/Fluids/Events.cs
+++ b/Content.Shared/Fluids/Events.cs
@@ -34,3 +34,15 @@ public AbsorbantDoAfterEvent(string targetSolution, string message, SoundSpecifi
 
     public override DoAfterEvent Clone() => this;
 }
+
+/// <summary>
+/// Raised when trying to spray something, for example a fire extinguisher.
+/// </summary>
+[ByRefEvent]
+public record struct SprayAttemptEvent(EntityUid User, bool Cancelled = false)
+{
+    public void Cancel()
+    {
+        Cancelled = true;
+    }
+}
diff --git a/Content.Shared/Fluids/SpraySafetySystem.cs b/Content.Shared/Fluids/SpraySafetySystem.cs
new file mode 100644
index 00000000000..82006a995b9
--- /dev/null
+++ b/Content.Shared/Fluids/SpraySafetySystem.cs
@@ -0,0 +1,44 @@
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Fluids.Components;
+using Content.Shared.Item.ItemToggle;
+using Content.Shared.Popups;
+using Robust.Shared.Audio.Systems;
+
+namespace Content.Shared.Fluids;
+
+public sealed class SpraySafetySystem : EntitySystem
+{
+    [Dependency] private readonly ItemToggleSystem _toggle = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<SpraySafetyComponent, SolutionTransferAttemptEvent>(OnTransferAttempt);
+        SubscribeLocalEvent<SpraySafetyComponent, SolutionTransferredEvent>(OnTransferred);
+        SubscribeLocalEvent<SpraySafetyComponent, SprayAttemptEvent>(OnSprayAttempt);
+    }
+
+    private void OnTransferAttempt(Entity<SpraySafetyComponent> ent, ref SolutionTransferAttemptEvent args)
+    {
+        var (uid, comp) = ent;
+        if (uid == args.To && !_toggle.IsActivated(uid))
+            args.Cancel(Loc.GetString(comp.Popup));
+    }
+
+    private void OnTransferred(Entity<SpraySafetyComponent> ent, ref SolutionTransferredEvent args)
+    {
+        _audio.PlayPredicted(ent.Comp.RefillSound, ent, args.User);
+    }
+
+    private void OnSprayAttempt(Entity<SpraySafetyComponent> ent, ref SprayAttemptEvent args)
+    {
+        if (!_toggle.IsActivated(ent.Owner))
+        {
+            _popup.PopupEntity(Loc.GetString(ent.Comp.Popup), ent, args.User);
+            args.Cancel();
+        }
+    }
+}
diff --git a/Content.Shared/Foldable/DeployFoldableComponent.cs b/Content.Shared/Foldable/DeployFoldableComponent.cs
new file mode 100644
index 00000000000..4ccca6b7427
--- /dev/null
+++ b/Content.Shared/Foldable/DeployFoldableComponent.cs
@@ -0,0 +1,7 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Foldable;
+
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(DeployFoldableSystem))]
+public sealed partial class DeployFoldableComponent : Component;
diff --git a/Content.Shared/Foldable/DeployFoldableSystem.cs b/Content.Shared/Foldable/DeployFoldableSystem.cs
new file mode 100644
index 00000000000..16315cde699
--- /dev/null
+++ b/Content.Shared/Foldable/DeployFoldableSystem.cs
@@ -0,0 +1,72 @@
+using Content.Shared.DragDrop;
+using Content.Shared.Hands.Components;
+using Content.Shared.Hands.EntitySystems;
+using Content.Shared.Interaction;
+
+namespace Content.Shared.Foldable;
+
+public sealed class DeployFoldableSystem : EntitySystem
+{
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
+    [Dependency] private readonly FoldableSystem _foldable = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DeployFoldableComponent, AfterInteractEvent>(OnAfterInteract);
+        SubscribeLocalEvent<DeployFoldableComponent, CanDragEvent>(OnCanDrag);
+        SubscribeLocalEvent<DeployFoldableComponent, DragDropDraggedEvent>(OnDragDropDragged);
+        SubscribeLocalEvent<DeployFoldableComponent, CanDropDraggedEvent>(OnCanDropDragged);
+    }
+
+    private void OnCanDropDragged(Entity<DeployFoldableComponent> ent, ref CanDropDraggedEvent args)
+    {
+        if (args.User != args.Target)
+            return;
+
+        args.Handled = true;
+        args.CanDrop = true;
+    }
+
+    private void OnDragDropDragged(Entity<DeployFoldableComponent> ent, ref DragDropDraggedEvent args)
+    {
+        if (!TryComp<FoldableComponent>(ent, out var foldable)
+            || !_foldable.TrySetFolded(ent, foldable, true))
+            return;
+
+        _hands.PickupOrDrop(args.User, ent.Owner);
+
+        args.Handled = true;
+    }
+
+    private void OnCanDrag(Entity<DeployFoldableComponent> ent, ref CanDragEvent args)
+    {
+        if (!TryComp<FoldableComponent>(ent, out var foldable)
+            || foldable.IsFolded)
+            return;
+
+        args.Handled = true;
+    }
+
+    private void OnAfterInteract(Entity<DeployFoldableComponent> ent, ref AfterInteractEvent args)
+    {
+        if (args.Handled || !args.CanReach)
+            return;
+
+        if (!TryComp<FoldableComponent>(ent, out var foldable))
+            return;
+
+        if (!TryComp(args.User, out HandsComponent? hands)
+            || !_hands.TryDrop(args.User, args.Used, targetDropLocation: args.ClickLocation, handsComp: hands))
+            return;
+
+        if (!_foldable.TrySetFolded(ent, foldable, false))
+        {
+            _hands.TryPickup(args.User, args.Used, handsComp: hands);
+            return;
+        }
+
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Follower/FollowerSystem.cs b/Content.Shared/Follower/FollowerSystem.cs
index 8027ee449c4..8c35617e2c3 100644
--- a/Content.Shared/Follower/FollowerSystem.cs
+++ b/Content.Shared/Follower/FollowerSystem.cs
@@ -227,7 +227,7 @@ public void StopFollowingEntity(EntityUid uid, EntityUid target, FollowedCompone
 
         if (_netMan.IsClient)
         {
-            _transform.DetachParentToNull(uid, xform);
+            _transform.DetachEntity(uid, xform);
             return;
         }
 
diff --git a/Content.Shared/Forensics/Events.cs b/Content.Shared/Forensics/Events.cs
index 7300b78d76b..f7b9475cb57 100644
--- a/Content.Shared/Forensics/Events.cs
+++ b/Content.Shared/Forensics/Events.cs
@@ -51,3 +51,20 @@ public record struct TransferDnaEvent()
     /// </summary>
     public bool CanDnaBeCleaned = true;
 }
+
+/// <summary>
+/// An event to generate and act upon new DNA for an entity.
+/// </summary>
+[ByRefEvent]
+public record struct GenerateDnaEvent()
+{
+    /// <summary>
+    /// The entity getting new DNA.
+    /// </summary>
+    public EntityUid Owner;
+
+    /// <summary>
+    /// The generated DNA.
+    /// </summary>
+    public string DNA;
+}
diff --git a/Content.Shared/Forensics/ForensicScannerEvent.cs b/Content.Shared/Forensics/ForensicScannerEvent.cs
index ce84b1f7b36..f275680b057 100644
--- a/Content.Shared/Forensics/ForensicScannerEvent.cs
+++ b/Content.Shared/Forensics/ForensicScannerEvent.cs
@@ -7,7 +7,8 @@ public sealed class ForensicScannerBoundUserInterfaceState : BoundUserInterfaceS
     {
         public readonly List<string> Fingerprints = new();
         public readonly List<string> Fibers = new();
-        public readonly List<string> DNAs = new();
+        public readonly List<string> TouchDNAs = new();
+        public readonly List<string> SolutionDNAs = new();
         public readonly List<string> Residues = new();
         public readonly string LastScannedName = string.Empty;
         public readonly TimeSpan PrintCooldown = TimeSpan.Zero;
@@ -16,7 +17,8 @@ public sealed class ForensicScannerBoundUserInterfaceState : BoundUserInterfaceS
         public ForensicScannerBoundUserInterfaceState(
             List<string> fingerprints,
             List<string> fibers,
-            List<string> dnas,
+            List<string> touchDnas,
+            List<string> solutionDnas,
             List<string> residues,
             string lastScannedName,
             TimeSpan printCooldown,
@@ -24,7 +26,8 @@ public ForensicScannerBoundUserInterfaceState(
         {
             Fingerprints = fingerprints;
             Fibers = fibers;
-            DNAs = dnas;
+            TouchDNAs = touchDnas;
+            SolutionDNAs = solutionDnas;
             Residues = residues;
             LastScannedName = lastScannedName;
             PrintCooldown = printCooldown;
diff --git a/Content.Shared/Friends/Systems/PettableFriendSystem.cs b/Content.Shared/Friends/Systems/PettableFriendSystem.cs
index 00a4ddd155c..6e41f4bdea9 100644
--- a/Content.Shared/Friends/Systems/PettableFriendSystem.cs
+++ b/Content.Shared/Friends/Systems/PettableFriendSystem.cs
@@ -32,23 +32,23 @@ private void OnUseInHand(Entity<PettableFriendComponent> ent, ref UseInHandEvent
     {
         var (uid, comp) = ent;
         var user = args.User;
-        if (args.Handled || !_exceptionQuery.TryGetComponent(uid, out var exceptionComp))
-            return;
-
-        if (_useDelayQuery.TryGetComponent(uid, out var useDelay) && !_useDelay.TryResetDelay((uid, useDelay), true))
+        if (args.Handled || !_exceptionQuery.TryComp(uid, out var exceptionComp))
             return;
 
         var exception = (uid, exceptionComp);
-        if (_factionException.IsIgnored(exception, user))
+        if (!_factionException.IsIgnored(exception, user))
         {
-            _popup.PopupClient(Loc.GetString(comp.FailureString, ("target", uid)), user, user);
+            // you have made a new friend :)
+            _popup.PopupClient(Loc.GetString(comp.SuccessString, ("target", uid)), user, user);
+            _factionException.IgnoreEntity(exception, user);
+            args.Handled = true;
             return;
         }
 
-        // you have made a new friend :)
-        _popup.PopupClient(Loc.GetString(comp.SuccessString, ("target", uid)), user, user);
-        _factionException.IgnoreEntity(exception, user);
-        args.Handled = true;
+        if (_useDelayQuery.TryComp(uid, out var useDelay) && !_useDelay.TryResetDelay((uid, useDelay), true))
+            return;
+
+        _popup.PopupClient(Loc.GetString(comp.FailureString, ("target", uid)), user, user);
     }
 
     private void OnRehydrated(Entity<PettableFriendComponent> ent, ref GotRehydratedEvent args)
diff --git a/Content.Server/GameTicking/Components/ActiveGameRuleComponent.cs b/Content.Shared/GameTicking/Components/ActiveGameRuleComponent.cs
similarity index 67%
rename from Content.Server/GameTicking/Components/ActiveGameRuleComponent.cs
rename to Content.Shared/GameTicking/Components/ActiveGameRuleComponent.cs
index b9e6fa5d4b8..51bdd1c0371 100644
--- a/Content.Server/GameTicking/Components/ActiveGameRuleComponent.cs
+++ b/Content.Shared/GameTicking/Components/ActiveGameRuleComponent.cs
@@ -1,10 +1,8 @@
-namespace Content.Server.GameTicking.Components;
+namespace Content.Shared.GameTicking.Components;
 
 /// <summary>
 ///     Added to game rules before <see cref="GameRuleStartedEvent"/> and removed before <see cref="GameRuleEndedEvent"/>.
 ///     Mutually exclusive with <seealso cref="EndedGameRuleComponent"/>.
 /// </summary>
 [RegisterComponent]
-public sealed partial class ActiveGameRuleComponent : Component
-{
-}
+public sealed partial class ActiveGameRuleComponent : Component;
diff --git a/Content.Server/GameTicking/Components/DelayedStartRuleComponent.cs b/Content.Shared/GameTicking/Components/DelayedStartRuleComponent.cs
similarity index 91%
rename from Content.Server/GameTicking/Components/DelayedStartRuleComponent.cs
rename to Content.Shared/GameTicking/Components/DelayedStartRuleComponent.cs
index de4be83627d..9275da29b01 100644
--- a/Content.Server/GameTicking/Components/DelayedStartRuleComponent.cs
+++ b/Content.Shared/GameTicking/Components/DelayedStartRuleComponent.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
-namespace Content.Server.GameTicking.Components;
+namespace Content.Shared.GameTicking.Components;
 
 /// <summary>
 /// Generic component used to track a gamerule that's start has been delayed.
diff --git a/Content.Server/GameTicking/Components/EndedGameRuleComponent.cs b/Content.Shared/GameTicking/Components/EndedGameRuleComponent.cs
similarity index 61%
rename from Content.Server/GameTicking/Components/EndedGameRuleComponent.cs
rename to Content.Shared/GameTicking/Components/EndedGameRuleComponent.cs
index 3234bfff3a0..5e209ed78a2 100644
--- a/Content.Server/GameTicking/Components/EndedGameRuleComponent.cs
+++ b/Content.Shared/GameTicking/Components/EndedGameRuleComponent.cs
@@ -1,10 +1,8 @@
-namespace Content.Server.GameTicking.Components;
+namespace Content.Shared.GameTicking.Components;
 
 /// <summary>
 ///     Added to game rules before <see cref="GameRuleEndedEvent"/>.
 ///     Mutually exclusive with <seealso cref="ActiveGameRuleComponent"/>.
 /// </summary>
 [RegisterComponent]
-public sealed partial class EndedGameRuleComponent : Component
-{
-}
+public sealed partial class EndedGameRuleComponent : Component;
diff --git a/Content.Server/GameTicking/Components/GameRuleComponent.cs b/Content.Shared/GameTicking/Components/GameRuleComponent.cs
similarity index 89%
rename from Content.Server/GameTicking/Components/GameRuleComponent.cs
rename to Content.Shared/GameTicking/Components/GameRuleComponent.cs
index 1e6c3f0ab1d..4e93c2b0038 100644
--- a/Content.Server/GameTicking/Components/GameRuleComponent.cs
+++ b/Content.Shared/GameTicking/Components/GameRuleComponent.cs
@@ -1,13 +1,14 @@
-using Content.Server.Destructible.Thresholds;
+using Content.Shared.Destructible.Thresholds;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
-namespace Content.Server.GameTicking.Components;
+namespace Content.Shared.GameTicking.Components;
 
 /// <summary>
 /// Component attached to all gamerule entities.
 /// Used to both track the entity as well as store basic data
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, EntityCategory("GameRules")]
 public sealed partial class GameRuleComponent : Component
 {
     /// <summary>
diff --git a/Content.Shared/Ghost/GhostRoleRadioEvents.cs b/Content.Shared/Ghost/GhostRoleRadioEvents.cs
new file mode 100644
index 00000000000..8bdd6e58375
--- /dev/null
+++ b/Content.Shared/Ghost/GhostRoleRadioEvents.cs
@@ -0,0 +1,21 @@
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Ghost.Roles;
+
+[Serializable, NetSerializable]
+public sealed class GhostRoleRadioMessage : BoundUserInterfaceMessage
+{
+    public ProtoId<GhostRolePrototype> ProtoId;
+
+    public GhostRoleRadioMessage(ProtoId<GhostRolePrototype> protoId)
+    {
+        ProtoId = protoId;
+    }
+}
+
+[Serializable, NetSerializable]
+public enum GhostRoleRadioUiKey : byte
+{
+    Key
+}
diff --git a/Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs b/Content.Shared/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs
similarity index 85%
rename from Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs
rename to Content.Shared/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs
index 6116173f904..2e44effad96 100644
--- a/Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs
+++ b/Content.Shared/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs
@@ -1,12 +1,11 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 
-namespace Content.Server.Ghost.Roles.Components
+namespace Content.Shared.Ghost.Roles.Components
 {
     /// <summary>
     ///     Allows a ghost to take this role, spawning a new entity.
     /// </summary>
     [RegisterComponent, EntityCategory("Spawner")]
-    [Access(typeof(GhostRoleSystem))]
     public sealed partial class GhostRoleMobSpawnerComponent : Component
     {
         [DataField]
diff --git a/Content.Shared/Ghost/Roles/GhostRolePrototype.cs b/Content.Shared/Ghost/Roles/GhostRolePrototype.cs
index bc36774ea8b..3e81b5e46e8 100644
--- a/Content.Shared/Ghost/Roles/GhostRolePrototype.cs
+++ b/Content.Shared/Ghost/Roles/GhostRolePrototype.cs
@@ -30,6 +30,13 @@ public sealed partial class GhostRolePrototype : IPrototype
     [DataField(required: true)]
     public EntProtoId EntityPrototype;
 
+    /// <summary>
+    /// The entity prototype's sprite to use to represent the ghost role
+    /// Use this if you don't want to use the entity itself
+    /// </summary>
+    [DataField]
+    public EntProtoId? IconPrototype = null;
+
     /// <summary>
     ///     Rules of the ghostrole
     /// </summary>
diff --git a/Content.Shared/Hands/Components/HandsComponent.cs b/Content.Shared/Hands/Components/HandsComponent.cs
index 919d55f294a..f218455c0bb 100644
--- a/Content.Shared/Hands/Components/HandsComponent.cs
+++ b/Content.Shared/Hands/Components/HandsComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.DisplacementMap;
 using Content.Shared.Hands.EntitySystems;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
@@ -38,11 +39,11 @@ public sealed partial class HandsComponent : Component
     public bool DisableExplosionRecursion = false;
 
     /// <summary>
-    ///     The amount of throw impulse per distance the player is from the throw target.
+    ///     Modifies the speed at which items are thrown.
     /// </summary>
-    [DataField("throwForceMultiplier")]
+    [DataField]
     [ViewVariables(VVAccess.ReadWrite)]
-    public float ThrowForceMultiplier { get; set; } = 10f; //should be tuned so that a thrown item lands about under the player's cursor
+    public float BaseThrowspeed { get; set; } = 11f;
 
     /// <summary>
     ///     Distance after which longer throw targets stop increasing throw impulse.
@@ -76,6 +77,9 @@ public sealed partial class HandsComponent : Component
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public TimeSpan ThrowCooldown = TimeSpan.FromSeconds(0.5f);
+
+    [DataField]
+    public DisplacementData? HandDisplacement;
 }
 
 [Serializable, NetSerializable]
diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs
index 4d21e40a987..0579e997253 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Interaction;
 using Content.Shared.Inventory.VirtualItem;
 using Content.Shared.Tag;
+using Content.Shared.Interaction.Events;
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
 
@@ -110,7 +111,10 @@ public bool TryDrop(EntityUid uid, Hand hand, EntityCoordinates? targetDropLocat
             return false;
 
         var entity = hand.HeldEntity!.Value;
-        DoDrop(uid, hand, doDropInteraction: doDropInteraction, handsComp);
+
+        // if item is a fake item (like with pulling), just delete it rather than bothering with trying to drop it into the world
+        if (TryComp(entity, out VirtualItemComponent? @virtual))
+            _virtualSystem.DeleteVirtualItem((entity, @virtual), uid);
 
         if (TerminatingOrDeleted(entity))
             return true;
@@ -122,16 +126,16 @@ public bool TryDrop(EntityUid uid, Hand hand, EntityCoordinates? targetDropLocat
         var userXform = Transform(uid);
         var isInContainer = ContainerSystem.IsEntityOrParentInContainer(uid, xform: userXform);
 
+        DoDrop(uid, hand, doDropInteraction: doDropInteraction, handsComp);
+
+        // drop the item inside the container if the user is in a container
         if (targetDropLocation == null || isInContainer)
-        {
-            // If user is in a container, drop item into that container. Otherwise, attach to grid or map.
-            TransformSystem.DropNextTo((entity, itemXform), (uid, userXform));
             return true;
-        }
 
+        // otherwise, remove the item from their hands and place it at the calculated interaction range position
         var (itemPos, itemRot) = TransformSystem.GetWorldPositionRotation(entity);
         var origin = new MapCoordinates(itemPos, itemXform.MapID);
-        var target = targetDropLocation.Value.ToMap(EntityManager, TransformSystem);
+        var target = TransformSystem.ToMapCoordinates(targetDropLocation.Value);
         TransformSystem.SetWorldPositionRotation(entity, GetFinalDropCoordinates(uid, origin, target), itemRot);
         return true;
     }
diff --git a/Content.Shared/IconSmoothing/RandomIconSmoothComponent.cs b/Content.Shared/IconSmoothing/RandomIconSmoothComponent.cs
new file mode 100644
index 00000000000..6cdf167b295
--- /dev/null
+++ b/Content.Shared/IconSmoothing/RandomIconSmoothComponent.cs
@@ -0,0 +1,16 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.IconSmoothing;
+
+/// <summary>
+/// Allow randomize StateBase of IconSmoothComponent for random visual variation
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class RandomIconSmoothComponent : Component
+{
+    /// <summary>
+    /// StateBase will be randomly selected from this list. Allows to randomize the visual.
+    /// </summary>
+    [DataField(required: true)]
+    public List<string> RandomStates = new();
+}
diff --git a/Content.Shared/IconSmoothing/SharedRandomIconSmoothSystem.cs b/Content.Shared/IconSmoothing/SharedRandomIconSmoothSystem.cs
new file mode 100644
index 00000000000..5cb5299858c
--- /dev/null
+++ b/Content.Shared/IconSmoothing/SharedRandomIconSmoothSystem.cs
@@ -0,0 +1,12 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.IconSmoothing;
+
+public abstract class SharedRandomIconSmoothSystem : EntitySystem
+{
+}
+[Serializable, NetSerializable]
+public enum RandomIconSmoothState : byte
+{
+    State
+}
diff --git a/Content.Shared/Interaction/InteractionPopupSystem.cs b/Content.Shared/Interaction/InteractionPopupSystem.cs
index d956ff3d953..2a742d4211b 100644
--- a/Content.Shared/Interaction/InteractionPopupSystem.cs
+++ b/Content.Shared/Interaction/InteractionPopupSystem.cs
@@ -113,7 +113,7 @@ private void SharedInteract(
                 Spawn(component.InteractFailureSpawn, _transform.GetMapCoordinates(uid));
         }
 
-        if (component.MessagePerceivedByOthers != null)
+        if (!string.IsNullOrEmpty(component.MessagePerceivedByOthers))
         {
             var msgOthers = Loc.GetString(component.MessagePerceivedByOthers,
                 ("user", Identity.Entity(user, EntityManager)), ("target", Identity.Entity(uid, EntityManager)));
@@ -131,7 +131,7 @@ private void SharedInteract(
             return;
         }
 
-        _popupSystem.PopupPredicted(msg, uid, user);
+        _popupSystem.PopupClient(msg, uid, user);
 
         if (sfx == null)
             return;
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index 48076ca360f..972fa389e40 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -38,8 +38,6 @@
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
-#pragma warning disable 618
-
 namespace Content.Shared.Interaction
 {
     /// <summary>
@@ -167,10 +165,7 @@ private void OnBoundInterfaceInteractAttempt(BoundUserInterfaceMessageAttempt ev
                 return;
             }
 
-            if (!uiComp.RequireHands)
-                return;
-
-            if (!_handsQuery.TryComp(ev.Actor, out var hands) || hands.Hands.Count == 0)
+            if (uiComp.RequireHands && !_handsQuery.HasComp(ev.Actor))
                 ev.Cancel();
         }
 
@@ -522,11 +517,11 @@ public void InteractUsingRanged(EntityUid user, EntityUid used, EntityUid? targe
         protected bool ValidateInteractAndFace(EntityUid user, EntityCoordinates coordinates)
         {
             // Verify user is on the same map as the entity they clicked on
-            if (coordinates.GetMapId(EntityManager) != Transform(user).MapID)
+            if (_transform.GetMapId(coordinates) != Transform(user).MapID)
                 return false;
 
             if (!HasComp<NoRotateOnInteractComponent>(user))
-                _rotateToFaceSystem.TryFaceCoordinates(user, coordinates.ToMapPos(EntityManager, _transform));
+                _rotateToFaceSystem.TryFaceCoordinates(user, _transform.ToMapCoordinates(coordinates).Position);
 
             return true;
         }
@@ -859,7 +854,7 @@ public bool InRangeUnobstructed(
             Ignored? predicate = null,
             bool popup = false)
         {
-            return InRangeUnobstructed(origin, other.ToMap(EntityManager, _transform), range, collisionMask, predicate, popup);
+            return InRangeUnobstructed(origin, _transform.ToMapCoordinates(other), range, collisionMask, predicate, popup);
         }
 
         /// <summary>
@@ -954,7 +949,7 @@ public void InteractUsing(
             RaiseLocalEvent(target, interactUsingEvent, true);
             DoContactInteraction(user, used, interactUsingEvent);
             DoContactInteraction(user, target, interactUsingEvent);
-            DoContactInteraction(used, target, interactUsingEvent);
+            // Contact interactions are currently only used for forensics, so we don't raise used -> target
             if (interactUsingEvent.Handled)
                 return;
 
@@ -966,7 +961,7 @@ public void InteractUsing(
         /// </summary>
         public void InteractDoAfter(EntityUid user, EntityUid used, EntityUid? target, EntityCoordinates clickLocation, bool canReach)
         {
-            if (target is {Valid: false})
+            if (target is { Valid: false })
                 target = null;
 
             var afterInteractEvent = new AfterInteractEvent(user, used, target, clickLocation, canReach);
@@ -975,7 +970,7 @@ public void InteractDoAfter(EntityUid user, EntityUid used, EntityUid? target, E
             if (canReach)
             {
                 DoContactInteraction(user, target, afterInteractEvent);
-                DoContactInteraction(used, target, afterInteractEvent);
+                // Contact interactions are currently only used for forensics, so we don't raise used -> target
             }
 
             if (afterInteractEvent.Handled)
@@ -991,7 +986,7 @@ public void InteractDoAfter(EntityUid user, EntityUid used, EntityUid? target, E
             if (canReach)
             {
                 DoContactInteraction(user, target, afterInteractUsingEvent);
-                DoContactInteraction(used, target, afterInteractUsingEvent);
+                // Contact interactions are currently only used for forensics, so we don't raise used -> target
             }
         }
 
@@ -1176,7 +1171,7 @@ public bool IsAccessible(Entity<TransformComponent?> user, Entity<TransformCompo
         /// </summary>
         public bool CanAccessViaStorage(EntityUid user, EntityUid target)
         {
-            if (!_containerSystem.TryGetContainingContainer(target, out var container))
+            if (!_containerSystem.TryGetContainingContainer((target, null, null), out var container))
                 return false;
 
             return CanAccessViaStorage(user, target, container);
@@ -1202,7 +1197,7 @@ public bool CanAccessEquipment(EntityUid user, EntityUid target)
             if (Deleted(target))
                 return false;
 
-            if (!_containerSystem.TryGetContainingContainer(target, out var container))
+            if (!_containerSystem.TryGetContainingContainer((target, null, null), out var container))
                 return false;
 
             var wearer = container.Owner;
diff --git a/Content.Shared/Interaction/SmartEquipSystem.cs b/Content.Shared/Interaction/SmartEquipSystem.cs
index bba294db28d..4feb0445f8f 100644
--- a/Content.Shared/Interaction/SmartEquipSystem.cs
+++ b/Content.Shared/Interaction/SmartEquipSystem.cs
@@ -62,21 +62,22 @@ private void HandleSmartEquip(ICommonSession? session, string equipmentSlot)
         if (playerSession.AttachedEntity is not { Valid: true } uid || !Exists(uid))
             return;
 
-        if (!_actionBlocker.CanInteract(uid, null))
-            return;
-
         // early out if we don't have any hands or a valid inventory slot
         if (!TryComp<HandsComponent>(uid, out var hands) || hands.ActiveHand == null)
             return;
 
+        var handItem = hands.ActiveHand.HeldEntity;
+
+        // can the user interact, and is the item interactable? e.g. virtual items
+        if (!_actionBlocker.CanInteract(uid, handItem))
+            return;
+
         if (!TryComp<InventoryComponent>(uid, out var inventory) || !_inventory.HasSlot(uid, equipmentSlot, inventory))
         {
             _popup.PopupClient(Loc.GetString("smart-equip-missing-equipment-slot", ("slotName", equipmentSlot)), uid, uid);
             return;
         }
 
-        var handItem = hands.ActiveHand.HeldEntity;
-
         // early out if we have an item and cant drop it at all
         if (handItem != null && !_hands.CanDropHeld(uid, hands.ActiveHand))
         {
diff --git a/Content.Shared/Internals/InternalsDoAfterEvent.cs b/Content.Shared/Internals/InternalsDoAfterEvent.cs
index 13b6087ec0e..9c0174b4fd2 100644
--- a/Content.Shared/Internals/InternalsDoAfterEvent.cs
+++ b/Content.Shared/Internals/InternalsDoAfterEvent.cs
@@ -1,4 +1,5 @@
-using Content.Shared.DoAfter;
+using Content.Shared.Alert;
+using Content.Shared.DoAfter;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Internals;
@@ -7,3 +8,5 @@ namespace Content.Shared.Internals;
 public sealed partial class InternalsDoAfterEvent : SimpleDoAfterEvent
 {
 }
+
+public sealed partial class ToggleInternalsAlertEvent : BaseAlertEvent;
diff --git a/Content.Shared/Inventory/InventoryComponent.cs b/Content.Shared/Inventory/InventoryComponent.cs
index 02b3a5b2583..629cf1169c4 100644
--- a/Content.Shared/Inventory/InventoryComponent.cs
+++ b/Content.Shared/Inventory/InventoryComponent.cs
@@ -1,4 +1,5 @@
-using Robust.Shared.Containers;
+using Content.Shared.DisplacementMap;
+using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
@@ -13,18 +14,21 @@ public sealed partial class InventoryComponent : Component
 
     [DataField("speciesId")] public string? SpeciesId { get; set; }
 
-    [DataField] public Dictionary<string, SlotDisplacementData> Displacements = [];
-
     public SlotDefinition[] Slots = Array.Empty<SlotDefinition>();
     public ContainerSlot[] Containers = Array.Empty<ContainerSlot>();
 
-    [DataDefinition]
-    public sealed partial class SlotDisplacementData
-    {
-        [DataField(required: true)]
-        public PrototypeLayerData Layer = default!;
+    [DataField]
+    public Dictionary<string, DisplacementData> Displacements = new();
+
+    /// <summary>
+    /// Alternate displacement maps, which if available, will be selected for the player of the appropriate gender.
+    /// </summary>
+    [DataField]
+    public Dictionary<string, DisplacementData> FemaleDisplacements = new();
 
-        [DataField]
-        public string? ShaderOverride = "DisplacedStencilDraw";
-    }
+    /// <summary>
+    /// Alternate displacement maps, which if available, will be selected for the player of the appropriate gender.
+    /// </summary>
+    [DataField]
+    public Dictionary<string, DisplacementData> MaleDisplacements = new();
 }
diff --git a/Content.Shared/Inventory/InventorySystem.Equip.cs b/Content.Shared/Inventory/InventorySystem.Equip.cs
index 324d6a7af02..762561ed322 100644
--- a/Content.Shared/Inventory/InventorySystem.Equip.cs
+++ b/Content.Shared/Inventory/InventorySystem.Equip.cs
@@ -169,12 +169,8 @@ public bool TryEquip(EntityUid actor, EntityUid target, EntityUid itemUid, strin
                 target,
                 itemUid)
             {
-                BlockDuplicate = true,
-                BreakOnHandChange = true,
                 BreakOnMove = true,
-                CancelDuplicate = true,
-                RequireCanInteract = true,
-                NeedHand = true
+                NeedHand = true,
             };
 
             _doAfter.TryStartDoAfter(args);
@@ -420,12 +416,8 @@ public bool TryUnequip(
                 target,
                 removedItem.Value)
             {
-                BlockDuplicate = true,
-                BreakOnHandChange = true,
                 BreakOnMove = true,
-                CancelDuplicate = true,
-                RequireCanInteract = true,
-                NeedHand = true
+                NeedHand = true,
             };
 
             _doAfter.TryStartDoAfter(args);
diff --git a/Content.Shared/Inventory/InventorySystem.Slots.cs b/Content.Shared/Inventory/InventorySystem.Slots.cs
index 228b788722e..2522dd5d0a3 100644
--- a/Content.Shared/Inventory/InventorySystem.Slots.cs
+++ b/Content.Shared/Inventory/InventorySystem.Slots.cs
@@ -30,7 +30,7 @@ private void ShutdownSlots()
     /// <summary>
     /// Tries to find an entity in the specified slot with the specified component.
     /// </summary>
-    public bool TryGetInventoryEntity<T>(Entity<InventoryComponent?> entity, out EntityUid targetUid)
+    public bool TryGetInventoryEntity<T>(Entity<InventoryComponent?> entity, out Entity<T?> target)
         where T : IComponent, IClothingSlots
     {
         if (TryGetContainerSlotEnumerator(entity.Owner, out var containerSlotEnumerator))
@@ -43,12 +43,12 @@ public bool TryGetInventoryEntity<T>(Entity<InventoryComponent?> entity, out Ent
                 if ((((IClothingSlots) required).Slots & slot.SlotFlags) == 0x0)
                     continue;
 
-                targetUid = item;
+                target = (item, required);
                 return true;
             }
         }
 
-        targetUid = EntityUid.Invalid;
+        target = EntityUid.Invalid;
         return false;
     }
 
diff --git a/Content.Shared/Inventory/VirtualItem/SharedVirtualItemSystem.cs b/Content.Shared/Inventory/VirtualItem/SharedVirtualItemSystem.cs
index b31cc755763..8b9c052c8d5 100644
--- a/Content.Shared/Inventory/VirtualItem/SharedVirtualItemSystem.cs
+++ b/Content.Shared/Inventory/VirtualItem/SharedVirtualItemSystem.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Hands;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
+using Content.Shared.Interaction.Events;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Item;
 using Content.Shared.Popups;
@@ -43,6 +44,7 @@ public override void Initialize()
         SubscribeLocalEvent<VirtualItemComponent, BeingUnequippedAttemptEvent>(OnBeingUnequippedAttempt);
 
         SubscribeLocalEvent<VirtualItemComponent, BeforeRangedInteractEvent>(OnBeforeRangedInteract);
+        SubscribeLocalEvent<VirtualItemComponent, GettingInteractedWithAttemptEvent>(OnGettingInteractedWithAttemptEvent);
     }
 
     /// <summary>
@@ -72,6 +74,12 @@ private void OnBeforeRangedInteract(Entity<VirtualItemComponent> ent, ref Before
         args.Handled = true;
     }
 
+    private void OnGettingInteractedWithAttemptEvent(Entity<VirtualItemComponent> ent, ref GettingInteractedWithAttemptEvent args)
+    {
+        // No interactions with a virtual item, please.
+        args.Cancelled = true;
+    }
+
     #region Hands
 
     /// <summary>
@@ -99,7 +107,7 @@ public bool TrySpawnVirtualItemInHand(EntityUid blockingEnt, EntityUid user, [No
                 if (hand.HeldEntity is not { } held)
                     continue;
 
-                if (held == blockingEnt || HasComp<VirtualItemComponent>(held))
+                if (held == blockingEnt)
                     continue;
 
                 if (!_handsSystem.TryDrop(user, hand))
@@ -244,7 +252,7 @@ public void DeleteVirtualItem(Entity<VirtualItemComponent> item, EntityUid user)
         if (TerminatingOrDeleted(item))
             return;
 
-        _transformSystem.DetachParentToNull(item, Transform(item));
+        _transformSystem.DetachEntity(item, Transform(item));
         if (_netManager.IsServer)
             QueueDel(item);
     }
diff --git a/Content.Shared/Item/HeldSpeedModifierSystem.cs b/Content.Shared/Item/HeldSpeedModifierSystem.cs
index d7afa8f40fa..c3286191b98 100644
--- a/Content.Shared/Item/HeldSpeedModifierSystem.cs
+++ b/Content.Shared/Item/HeldSpeedModifierSystem.cs
@@ -29,7 +29,7 @@ private void OnGotUnequippedHand(Entity<HeldSpeedModifierComponent> ent, ref Got
         _movementSpeedModifier.RefreshMovementSpeedModifiers(args.User);
     }
 
-    private void OnRefreshMovementSpeedModifiers(EntityUid uid, HeldSpeedModifierComponent component, HeldRelayedEvent<RefreshMovementSpeedModifiersEvent> args)
+    public (float,float) GetHeldMovementSpeedModifiers(EntityUid uid, HeldSpeedModifierComponent component)
     {
         var walkMod = component.WalkModifier;
         var sprintMod = component.SprintModifier;
@@ -39,6 +39,12 @@ private void OnRefreshMovementSpeedModifiers(EntityUid uid, HeldSpeedModifierCom
             sprintMod = clothingSpeedModifier.SprintModifier;
         }
 
+        return (walkMod, sprintMod);
+    }
+
+    private void OnRefreshMovementSpeedModifiers(EntityUid uid, HeldSpeedModifierComponent component, HeldRelayedEvent<RefreshMovementSpeedModifiersEvent> args)
+    {
+        var (walkMod, sprintMod) = GetHeldMovementSpeedModifiers(uid, component);
         args.Args.ModifySpeed(walkMod, sprintMod);
     }
 }
diff --git a/Content.Shared/Item/ItemToggle/ComponentTogglerSystem.cs b/Content.Shared/Item/ItemToggle/ComponentTogglerSystem.cs
new file mode 100644
index 00000000000..760cefe27d4
--- /dev/null
+++ b/Content.Shared/Item/ItemToggle/ComponentTogglerSystem.cs
@@ -0,0 +1,26 @@
+using Content.Shared.Item.ItemToggle.Components;
+
+namespace Content.Shared.Item.ItemToggle;
+
+/// <summary>
+/// Handles <see cref="ComponentTogglerComponent"/> component manipulation.
+/// </summary>
+public sealed class ComponentTogglerSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ComponentTogglerComponent, ItemToggledEvent>(OnToggled);
+    }
+
+    private void OnToggled(Entity<ComponentTogglerComponent> ent, ref ItemToggledEvent args)
+    {
+        var target = ent.Comp.Parent ? Transform(ent).ParentUid : ent.Owner;
+
+        if (args.Activated)
+            EntityManager.AddComponents(target, ent.Comp.Components);
+        else
+            EntityManager.RemoveComponents(target, ent.Comp.RemoveComponents ?? ent.Comp.Components);
+    }
+}
diff --git a/Content.Shared/Item/ItemToggle/Components/ComponentTogglerComponent.cs b/Content.Shared/Item/ItemToggle/Components/ComponentTogglerComponent.cs
new file mode 100644
index 00000000000..20ef0a02315
--- /dev/null
+++ b/Content.Shared/Item/ItemToggle/Components/ComponentTogglerComponent.cs
@@ -0,0 +1,32 @@
+using Content.Shared.Item.ItemToggle;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Item.ItemToggle.Components;
+
+/// <summary>
+/// Adds or removes components when toggled.
+/// Requires <see cref="ItemToggleComponent"/>.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(ComponentTogglerSystem))]
+public sealed partial class ComponentTogglerComponent : Component
+{
+    /// <summary>
+    /// The components to add when activated.
+    /// </summary>
+    [DataField(required: true)]
+    public ComponentRegistry Components = new();
+
+    /// <summary>
+    /// The components to remove when deactivated.
+    /// If this is null <see cref="Components"/> is reused.
+    /// </summary>
+    [DataField]
+    public ComponentRegistry? RemoveComponents;
+
+    /// <summary>
+    /// If true, adds components on the entity's parent instead of the entity itself.
+    /// </summary>
+    [DataField]
+    public bool Parent;
+}
diff --git a/Content.Shared/Item/ItemToggle/Components/ItemToggleActiveSoundComponent.cs b/Content.Shared/Item/ItemToggle/Components/ItemToggleActiveSoundComponent.cs
index 6d534713578..cdac49ae6d6 100644
--- a/Content.Shared/Item/ItemToggle/Components/ItemToggleActiveSoundComponent.cs
+++ b/Content.Shared/Item/ItemToggle/Components/ItemToggleActiveSoundComponent.cs
@@ -12,12 +12,12 @@ public sealed partial class ItemToggleActiveSoundComponent : Component
     /// <summary>
     ///     The continuous noise this item makes when it's activated (like an e-sword's hum).
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    [DataField(required: true), AutoNetworkedField]
     public SoundSpecifier? ActiveSound;
 
     /// <summary>
     ///     Used when the item emits sound while active.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField]
+    [DataField]
     public EntityUid? PlayingStream;
 }
diff --git a/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs b/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs
index 620ddfd1942..46249fdd0de 100644
--- a/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs
+++ b/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs
@@ -8,7 +8,7 @@ namespace Content.Shared.Item.ItemToggle.Components;
 /// </summary>
 /// <remarks>
 /// If you need extended functionality (e.g. requiring power) then add a new component and use events:
-/// ItemToggleActivateAttemptEvent, ItemToggleDeactivateAttemptEvent or ItemToggleForceToggleEvent.
+/// ItemToggleActivateAttemptEvent, ItemToggleDeactivateAttemptEvent, ItemToggledEvent.
 /// </remarks>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class ItemToggleComponent : Component
@@ -19,6 +19,13 @@ public sealed partial class ItemToggleComponent : Component
     [DataField, AutoNetworkedField]
     public bool Activated = false;
 
+    /// <summary>
+    /// If this is set to false then the item can't be toggled by pressing Z.
+    /// Use another system to do it then.
+    /// </summary>
+    [DataField]
+    public bool OnUse = true;
+
     /// <summary>
     ///     Whether the item's toggle can be predicted by the client.
     /// </summary>
diff --git a/Content.Shared/Item/ItemToggle/Components/ToggleVerbComponent.cs b/Content.Shared/Item/ItemToggle/Components/ToggleVerbComponent.cs
new file mode 100644
index 00000000000..b673c55e0f1
--- /dev/null
+++ b/Content.Shared/Item/ItemToggle/Components/ToggleVerbComponent.cs
@@ -0,0 +1,18 @@
+using Content.Shared.Item.ItemToggle;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Item.ItemToggle.Components;
+
+/// <summary>
+/// Adds a verb for toggling something, requires <see cref="ItemToggleComponent"/>.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(ToggleVerbSystem))]
+public sealed partial class ToggleVerbComponent : Component
+{
+    /// <summary>
+    /// Text the verb will have.
+    /// Gets passed "entity" as the entity's identity string.
+    /// </summary>
+    [DataField(required: true)]
+    public LocId Text = string.Empty;
+}
diff --git a/Content.Shared/Item/ItemToggle/SharedItemToggleSystem.cs b/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs
similarity index 54%
rename from Content.Shared/Item/ItemToggle/SharedItemToggleSystem.cs
rename to Content.Shared/Item/ItemToggle/ItemToggleSystem.cs
index 523f67bac3d..6b969d1d62b 100644
--- a/Content.Shared/Item/ItemToggle/SharedItemToggleSystem.cs
+++ b/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs
@@ -15,12 +15,12 @@ namespace Content.Shared.Item.ItemToggle;
 /// <remarks>
 /// If you need extended functionality (e.g. requiring power) then add a new component and use events.
 /// </remarks>
-public abstract class SharedItemToggleSystem : EntitySystem
+public sealed class ItemToggleSystem : EntitySystem
 {
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly INetManager _netManager = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedPointLightSystem _light = default!;
-    [Dependency] private readonly INetManager _netManager = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
 
     public override void Initialize()
@@ -28,8 +28,9 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<ItemToggleComponent, ComponentStartup>(OnStartup);
-        SubscribeLocalEvent<ItemToggleComponent, ItemUnwieldedEvent>(TurnOffonUnwielded);
-        SubscribeLocalEvent<ItemToggleComponent, ItemWieldedEvent>(TurnOnonWielded);
+        SubscribeLocalEvent<ItemToggleComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<ItemToggleComponent, ItemUnwieldedEvent>(TurnOffOnUnwielded);
+        SubscribeLocalEvent<ItemToggleComponent, ItemWieldedEvent>(TurnOnOnWielded);
         SubscribeLocalEvent<ItemToggleComponent, UseInHandEvent>(OnUseInHand);
 
         SubscribeLocalEvent<ItemToggleHotComponent, IsHotEvent>(OnIsHotEvent);
@@ -42,57 +43,76 @@ private void OnStartup(Entity<ItemToggleComponent> ent, ref ComponentStartup arg
         UpdateVisuals(ent);
     }
 
-    private void OnUseInHand(EntityUid uid, ItemToggleComponent itemToggle, UseInHandEvent args)
+    private void OnMapInit(Entity<ItemToggleComponent> ent, ref MapInitEvent args)
+    {
+        if (!ent.Comp.Activated)
+            return;
+
+        var ev = new ItemToggledEvent(Predicted: ent.Comp.Predictable, Activated: ent.Comp.Activated, User: null);
+        RaiseLocalEvent(ent, ref ev);
+    }
+
+    private void OnUseInHand(Entity<ItemToggleComponent> ent, ref UseInHandEvent args)
     {
-        if (args.Handled)
+        if (args.Handled || !ent.Comp.OnUse)
             return;
 
         args.Handled = true;
 
-        Toggle(uid, args.User, predicted: itemToggle.Predictable, itemToggle: itemToggle);
+        Toggle((ent, ent.Comp), args.User, predicted: ent.Comp.Predictable);
     }
 
     /// <summary>
     /// Used when an item is attempted to be toggled.
+    /// Sets its state to the opposite of what it is.
     /// </summary>
-    public void Toggle(EntityUid uid, EntityUid? user = null, bool predicted = true, ItemToggleComponent? itemToggle = null)
+    /// <returns>Same as <see cref="TrySetActive"/></returns>
+    public bool Toggle(Entity<ItemToggleComponent?> ent, EntityUid? user = null, bool predicted = true)
     {
-        if (!Resolve(uid, ref itemToggle))
-            return;
+        if (!Resolve(ent, ref ent.Comp))
+            return false;
 
-        if (itemToggle.Activated)
-        {
-            TryDeactivate(uid, user, itemToggle: itemToggle, predicted: predicted);
-        }
+        return TrySetActive(ent, !ent.Comp.Activated, user, predicted);
+    }
+
+    /// <summary>
+    /// Tries to set the activated bool from a value.
+    /// </summary>
+    /// <returns>false if the attempt fails for any reason</returns>
+    public bool TrySetActive(Entity<ItemToggleComponent?> ent, bool active, EntityUid? user = null, bool predicted = true)
+    {
+        if (active)
+            return TryActivate(ent, user, predicted: predicted);
         else
-        {
-            TryActivate(uid, user, itemToggle: itemToggle, predicted: predicted);
-        }
+            return TryDeactivate(ent, user, predicted: predicted);
     }
 
     /// <summary>
     /// Used when an item is attempting to be activated. It returns false if the attempt fails any reason, interrupting the activation.
     /// </summary>
-    public bool TryActivate(EntityUid uid, EntityUid? user = null, bool predicted = true, ItemToggleComponent? itemToggle = null)
+    public bool TryActivate(Entity<ItemToggleComponent?> ent, EntityUid? user = null, bool predicted = true)
     {
-        if (!Resolve(uid, ref itemToggle))
+        if (!Resolve(ent, ref ent.Comp))
             return false;
 
-        if (itemToggle.Activated)
+        var uid = ent.Owner;
+        var comp = ent.Comp;
+        if (comp.Activated)
             return true;
 
-        if (!itemToggle.Predictable && _netManager.IsClient)
+        if (!comp.Predictable && _netManager.IsClient)
             return true;
 
         var attempt = new ItemToggleActivateAttemptEvent(user);
         RaiseLocalEvent(uid, ref attempt);
 
+        if (!comp.Predictable) predicted = false;
         if (attempt.Cancelled)
         {
             if (predicted)
-                _audio.PlayPredicted(itemToggle.SoundFailToActivate, uid, user);
+                _audio.PlayPredicted(comp.SoundFailToActivate, uid, user);
             else
-                _audio.PlayPvs(itemToggle.SoundFailToActivate, uid);
+                _audio.PlayPvs(comp.SoundFailToActivate, uid);
 
             if (attempt.Popup != null && user != null)
             {
@@ -105,7 +125,7 @@ public bool TryActivate(EntityUid uid, EntityUid? user = null, bool predicted =
             return false;
         }
 
-        Activate(uid, itemToggle, predicted, user);
+        Activate((uid, comp), predicted, user);
 
         return true;
     }
@@ -113,75 +133,65 @@ public bool TryActivate(EntityUid uid, EntityUid? user = null, bool predicted =
     /// <summary>
     /// Used when an item is attempting to be deactivated. It returns false if the attempt fails any reason, interrupting the deactivation.
     /// </summary>
-    public bool TryDeactivate(EntityUid uid, EntityUid? user = null, bool predicted = true, ItemToggleComponent? itemToggle = null)
+    public bool TryDeactivate(Entity<ItemToggleComponent?> ent, EntityUid? user = null, bool predicted = true)
     {
-        if (!Resolve(uid, ref itemToggle))
+        if (!Resolve(ent, ref ent.Comp))
             return false;
 
-        if (!itemToggle.Predictable && _netManager.IsClient)
+        var uid = ent.Owner;
+        var comp = ent.Comp;
+        if (!comp.Activated)
             return true;
 
-        if (!itemToggle.Activated)
+        if (!comp.Predictable && _netManager.IsClient)
             return true;
 
         var attempt = new ItemToggleDeactivateAttemptEvent(user);
         RaiseLocalEvent(uid, ref attempt);
 
         if (attempt.Cancelled)
-        {
             return false;
-        }
 
-        Deactivate(uid, itemToggle, predicted, user);
+        if (!comp.Predictable) predicted = false;
+        Deactivate((uid, comp), predicted, user);
         return true;
     }
 
-    private void Activate(EntityUid uid, ItemToggleComponent itemToggle, bool predicted, EntityUid? user = null)
+    private void Activate(Entity<ItemToggleComponent> ent, bool predicted, EntityUid? user = null)
     {
-        // TODO: Fix this hardcoding
-        TryComp(uid, out AppearanceComponent? appearance);
-        _appearance.SetData(uid, ToggleableLightVisuals.Enabled, true, appearance);
-        _appearance.SetData(uid, ToggleVisuals.Toggled, true, appearance);
-
-        if (_light.TryGetLight(uid, out var light))
-        {
-            _light.SetEnabled(uid, true, light);
-        }
-
-        var soundToPlay = itemToggle.SoundActivate;
+        var (uid, comp) = ent;
+        var soundToPlay = comp.SoundActivate;
         if (predicted)
             _audio.PlayPredicted(soundToPlay, uid, user);
         else
             _audio.PlayPvs(soundToPlay, uid);
 
-        // END FIX HARDCODING
+        comp.Activated = true;
+        UpdateVisuals((uid, comp));
+        Dirty(uid, comp);
 
         var toggleUsed = new ItemToggledEvent(predicted, Activated: true, user);
         RaiseLocalEvent(uid, ref toggleUsed);
-
-        itemToggle.Activated = true;
-        UpdateVisuals((uid, itemToggle));
-        Dirty(uid, itemToggle);
     }
 
     /// <summary>
     /// Used to make the actual changes to the item's components on deactivation.
     /// </summary>
-    private void Deactivate(EntityUid uid, ItemToggleComponent itemToggle, bool predicted, EntityUid? user = null)
+    private void Deactivate(Entity<ItemToggleComponent> ent, bool predicted, EntityUid? user = null)
     {
-        var soundToPlay = itemToggle.SoundDeactivate;
+        var (uid, comp) = ent;
+        var soundToPlay = comp.SoundDeactivate;
         if (predicted)
             _audio.PlayPredicted(soundToPlay, uid, user);
         else
             _audio.PlayPvs(soundToPlay, uid);
-        // END FIX HARDCODING
+
+        comp.Activated = false;
+        UpdateVisuals((uid, comp));
+        Dirty(uid, comp);
 
         var toggleUsed = new ItemToggledEvent(predicted, Activated: false, user);
         RaiseLocalEvent(uid, ref toggleUsed);
-
-        itemToggle.Activated = false;
-        UpdateVisuals((uid, itemToggle));
-        Dirty(uid, itemToggle);
     }
 
     private void UpdateVisuals(Entity<ItemToggleComponent> ent)
@@ -204,55 +214,56 @@ private void UpdateVisuals(Entity<ItemToggleComponent> ent)
     /// <summary>
     /// Used for items that require to be wielded in both hands to activate. For instance the dual energy sword will turn off if not wielded.
     /// </summary>
-    private void TurnOffonUnwielded(EntityUid uid, ItemToggleComponent itemToggle, ItemUnwieldedEvent args)
+    private void TurnOffOnUnwielded(Entity<ItemToggleComponent> ent, ref ItemUnwieldedEvent args)
     {
-        if (itemToggle.Activated)
-            TryDeactivate(uid, args.User, itemToggle: itemToggle);
+        TryDeactivate((ent, ent.Comp), args.User);
     }
 
     /// <summary>
     /// Wieldable items will automatically turn on when wielded.
     /// </summary>
-    private void TurnOnonWielded(EntityUid uid, ItemToggleComponent itemToggle, ref ItemWieldedEvent args)
+    private void TurnOnOnWielded(Entity<ItemToggleComponent> ent, ref ItemWieldedEvent args)
     {
-        if (!itemToggle.Activated)
-            TryActivate(uid, itemToggle: itemToggle);
+        // FIXME: for some reason both client and server play sound
+        TryActivate((ent, ent.Comp));
     }
 
-    public bool IsActivated(EntityUid uid, ItemToggleComponent? comp = null)
+    public bool IsActivated(Entity<ItemToggleComponent?> ent)
     {
-        if (!Resolve(uid, ref comp, false))
+        if (!Resolve(ent, ref ent.Comp, false))
             return true; // assume always activated if no component
 
-        return comp.Activated;
+        return ent.Comp.Activated;
     }
 
     /// <summary>
     /// Used to make the item hot when activated.
     /// </summary>
-    private void OnIsHotEvent(EntityUid uid, ItemToggleHotComponent itemToggleHot, IsHotEvent args)
+    private void OnIsHotEvent(Entity<ItemToggleHotComponent> ent, ref IsHotEvent args)
     {
-        args.IsHot |= IsActivated(uid);
+        args.IsHot |= IsActivated(ent.Owner);
     }
 
     /// <summary>
     /// Used to update the looping active sound linked to the entity.
     /// </summary>
-    private void UpdateActiveSound(EntityUid uid, ItemToggleActiveSoundComponent activeSound, ref ItemToggledEvent args)
+    private void UpdateActiveSound(Entity<ItemToggleActiveSoundComponent> ent, ref ItemToggledEvent args)
     {
-        if (args.Activated)
+        var (uid, comp) = ent;
+        if (!args.Activated)
         {
-            if (activeSound.ActiveSound != null && activeSound.PlayingStream == null)
-            {
-                if (args.Predicted)
-                    activeSound.PlayingStream = _audio.PlayPredicted(activeSound.ActiveSound, uid, args.User, AudioParams.Default.WithLoop(true)).Value.Entity;
-                else
-                    activeSound.PlayingStream = _audio.PlayPvs(activeSound.ActiveSound, uid, AudioParams.Default.WithLoop(true)).Value.Entity;
-            }
+            comp.PlayingStream = _audio.Stop(comp.PlayingStream);
+            return;
         }
-        else
+
+        if (comp.ActiveSound != null && comp.PlayingStream == null)
         {
-            activeSound.PlayingStream = _audio.Stop(activeSound.PlayingStream);
+            var loop = AudioParams.Default.WithLoop(true);
+            var stream = args.Predicted
+                ? _audio.PlayPredicted(comp.ActiveSound, uid, args.User, loop)
+                : _audio.PlayPvs(comp.ActiveSound, uid, loop);
+            if (stream?.Entity is {} entity)
+                comp.PlayingStream = entity;
         }
     }
 }
diff --git a/Content.Shared/Item/ItemToggle/ToggleVerbSystem.cs b/Content.Shared/Item/ItemToggle/ToggleVerbSystem.cs
new file mode 100644
index 00000000000..858cd9bc111
--- /dev/null
+++ b/Content.Shared/Item/ItemToggle/ToggleVerbSystem.cs
@@ -0,0 +1,34 @@
+using Content.Shared.IdentityManagement;
+using Content.Shared.Item.ItemToggle.Components;
+using Content.Shared.Verbs;
+
+namespace Content.Shared.Item.ItemToggle;
+
+/// <summary>
+/// Adds a verb for toggling something with <see cref="ToggleVerbComponent"/>.
+/// </summary>
+public sealed class ToggleVerbSystem : EntitySystem
+{
+    [Dependency] private readonly ItemToggleSystem _toggle = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ToggleVerbComponent, GetVerbsEvent<ActivationVerb>>(OnGetVerbs);
+    }
+
+    private void OnGetVerbs(Entity<ToggleVerbComponent> ent, ref GetVerbsEvent<ActivationVerb> args)
+    {
+        if (!args.CanAccess || !args.CanInteract)
+            return;
+
+        var name = Identity.Entity(ent, EntityManager);
+        var user = args.User;
+        args.Verbs.Add(new ActivationVerb()
+        {
+            Text = Loc.GetString(ent.Comp.Text, ("entity", name)),
+            Act = () => _toggle.Toggle(ent.Owner, user)
+        });
+    }
+}
diff --git a/Content.Shared/Item/SharedItemSystem.cs b/Content.Shared/Item/SharedItemSystem.cs
index 5eaa25f4847..a058cb86588 100644
--- a/Content.Shared/Item/SharedItemSystem.cs
+++ b/Content.Shared/Item/SharedItemSystem.cs
@@ -110,8 +110,8 @@ private void AddPickupVerb(EntityUid uid, ItemComponent component, GetVerbsEvent
 
         // if the item already in a container (that is not the same as the user's), then change the text.
         // this occurs when the item is in their inventory or in an open backpack
-        Container.TryGetContainingContainer(args.User, out var userContainer);
-        if (Container.TryGetContainingContainer(args.Target, out var container) && container != userContainer)
+        Container.TryGetContainingContainer((args.User, null, null), out var userContainer);
+        if (Container.TryGetContainingContainer((args.Target, null, null), out var container) && container != userContainer)
             verb.Text = Loc.GetString("pick-up-verb-get-data-text-inventory");
         else
             verb.Text = Loc.GetString("pick-up-verb-get-data-text");
diff --git a/Content.Shared/Lathe/LatheComponent.cs b/Content.Shared/Lathe/LatheComponent.cs
index 88ac8c05bfb..d776a65e233 100644
--- a/Content.Shared/Lathe/LatheComponent.cs
+++ b/Content.Shared/Lathe/LatheComponent.cs
@@ -33,12 +33,21 @@ public sealed partial class LatheComponent : Component
         [DataField]
         public SoundSpecifier? ProducingSound;
 
+        [DataField]
+        public string? ReagentOutputSlotId;
+
         #region Visualizer info
         [DataField]
         public string? IdleState;
 
         [DataField]
         public string? RunningState;
+
+        [DataField]
+        public string? UnlitIdleState;
+
+        [DataField]
+        public string? UnlitRunningState;
         #endregion
 
         /// <summary>
diff --git a/Content.Shared/Lathe/SharedLatheSystem.cs b/Content.Shared/Lathe/SharedLatheSystem.cs
index b41a91f9c34..e240571f315 100644
--- a/Content.Shared/Lathe/SharedLatheSystem.cs
+++ b/Content.Shared/Lathe/SharedLatheSystem.cs
@@ -1,5 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using Content.Shared.Emag.Systems;
+using Content.Shared.Examine;
+using Content.Shared.Localizations;
 using Content.Shared.Materials;
 using Content.Shared.Research.Prototypes;
 using JetBrains.Annotations;
@@ -23,10 +26,21 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<EmagLatheRecipesComponent, GotEmaggedEvent>(OnEmagged);
+        SubscribeLocalEvent<LatheComponent, ExaminedEvent>(OnExamined);
         SubscribeLocalEvent<PrototypesReloadedEventArgs>(OnPrototypesReloaded);
+
         BuildInverseRecipeDictionary();
     }
 
+    private void OnExamined(Entity<LatheComponent> ent, ref ExaminedEvent args)
+    {
+        if (!args.IsInDetailsRange)
+            return;
+
+        if (ent.Comp.ReagentOutputSlotId != null)
+            args.PushMarkup(Loc.GetString("lathe-menu-reagent-slot-examine"));
+    }
+
     [PublicAPI]
     public bool CanProduce(EntityUid uid, string recipe, int amount = 1, LatheComponent? component = null)
     {
@@ -40,7 +54,7 @@ public bool CanProduce(EntityUid uid, LatheRecipePrototype recipe, int amount =
         if (!HasRecipe(uid, recipe, component))
             return false;
 
-        foreach (var (material, needed) in recipe.RequiredMaterials)
+        foreach (var (material, needed) in recipe.Materials)
         {
             var adjustedAmount = AdjustMaterial(needed, recipe.ApplyMaterialDiscount, component.MaterialUseMultiplier);
 
@@ -72,6 +86,9 @@ private void BuildInverseRecipeDictionary()
         _inverseRecipeDictionary.Clear();
         foreach (var latheRecipe in _proto.EnumeratePrototypes<LatheRecipePrototype>())
         {
+            if (latheRecipe.Result == null)
+                continue;
+
             _inverseRecipeDictionary.GetOrNew(latheRecipe.Result).Add(latheRecipe);
         }
     }
@@ -83,4 +100,55 @@ public bool TryGetRecipesFromEntity(string prototype, [NotNullWhen(true)] out Li
             recipes.AddRange(r);
         return recipes.Count != 0;
     }
+
+    public string GetRecipeName(ProtoId<LatheRecipePrototype> proto)
+    {
+        return GetRecipeName(_proto.Index(proto));
+    }
+
+    public string GetRecipeName(LatheRecipePrototype proto)
+    {
+        if (!string.IsNullOrWhiteSpace(proto.Name))
+            return Loc.GetString(proto.Name);
+
+        if (proto.Result is { } result)
+        {
+            return _proto.Index(result).Name;
+        }
+
+        if (proto.ResultReagents is { } resultReagents)
+        {
+            return ContentLocalizationManager.FormatList(resultReagents
+                .Select(p => Loc.GetString("lathe-menu-result-reagent-display", ("reagent", _proto.Index(p.Key).LocalizedName), ("amount", p.Value)))
+                .ToList());
+        }
+
+        return string.Empty;
+    }
+
+    [PublicAPI]
+    public string GetRecipeDescription(ProtoId<LatheRecipePrototype> proto)
+    {
+        return GetRecipeDescription(_proto.Index(proto));
+    }
+
+    public string GetRecipeDescription(LatheRecipePrototype proto)
+    {
+        if (!string.IsNullOrWhiteSpace(proto.Description))
+            return Loc.GetString(proto.Description);
+
+        if (proto.Result is { } result)
+        {
+            return _proto.Index(result).Description;
+        }
+
+        if (proto.ResultReagents is { } resultReagents)
+        {
+            // We only use the first one for the description since these descriptions don't combine very well.
+            var reagent = resultReagents.First().Key;
+            return _proto.Index(reagent).LocalizedDescription;
+        }
+
+        return string.Empty;
+    }
 }
diff --git a/Content.Shared/Lock/LockComponent.cs b/Content.Shared/Lock/LockComponent.cs
index e3e2bc6df13..070d5801c1c 100644
--- a/Content.Shared/Lock/LockComponent.cs
+++ b/Content.Shared/Lock/LockComponent.cs
@@ -86,6 +86,13 @@ public sealed partial class LockComponent : Component
 [ByRefEvent]
 public record struct LockToggleAttemptEvent(EntityUid User, bool Silent = false, bool Cancelled = false);
 
+/// <summary>
+/// Event raised on the user when a toggle is attempted.
+/// Can be cancelled to prevent it.
+/// </summary>
+[ByRefEvent]
+public record struct UserLockToggleAttemptEvent(EntityUid Target, bool Silent = false, bool Cancelled = false);
+
 /// <summary>
 /// Event raised on a lock after it has been toggled.
 /// </summary>
diff --git a/Content.Shared/Lock/LockSystem.cs b/Content.Shared/Lock/LockSystem.cs
index bf4af1cb9a4..3349034f32e 100644
--- a/Content.Shared/Lock/LockSystem.cs
+++ b/Content.Shared/Lock/LockSystem.cs
@@ -124,8 +124,10 @@ public bool TryLock(EntityUid uid, EntityUid user, LockComponent? lockComp = nul
             return _doAfter.TryStartDoAfter(
                 new DoAfterArgs(EntityManager, user, lockComp.LockTime, new LockDoAfter(), uid, uid)
                 {
-                    BreakOnDamage = true, BreakOnMove = true, RequireCanInteract = true,
-                    NeedHand = true
+                    BreakOnDamage = true,
+                    BreakOnMove = true,
+                    NeedHand = true,
+                    BreakOnDropItem = false,
                 });
         }
 
@@ -200,8 +202,10 @@ public bool TryUnlock(EntityUid uid, EntityUid user, LockComponent? lockComp = n
             return _doAfter.TryStartDoAfter(
                 new DoAfterArgs(EntityManager, user, lockComp.LockTime, new UnlockDoAfter(), uid, uid)
                 {
-                    BreakOnDamage = true, BreakOnMove = true, RequireCanInteract = true,
-                    NeedHand = true
+                    BreakOnDamage = true,
+                    BreakOnMove = true,
+                    NeedHand = true,
+                    BreakOnDropItem = false,
                 });
         }
 
@@ -232,7 +236,12 @@ public bool CanToggleLock(EntityUid uid, EntityUid user, bool quiet = true)
 
         var ev = new LockToggleAttemptEvent(user, quiet);
         RaiseLocalEvent(uid, ref ev, true);
-        return !ev.Cancelled;
+        if (ev.Cancelled)
+            return false;
+
+        var userEv = new UserLockToggleAttemptEvent(uid, quiet);
+        RaiseLocalEvent(user, ref userEv, true);
+        return !userEv.Cancelled;
     }
 
     // TODO: this should be a helper on AccessReaderSystem since so many systems copy paste it
@@ -365,7 +374,7 @@ private void OnUIOpenAttempt(EntityUid uid, ActivatableUIRequiresLockComponent c
         {
             args.Cancel();
             if (lockComp.Locked)
-                _sharedPopupSystem.PopupEntity(Loc.GetString("entity-storage-component-locked-message"), uid, args.User);
+                _sharedPopupSystem.PopupClient(Loc.GetString("entity-storage-component-locked-message"), uid, args.User);
         }
     }
 
@@ -377,4 +386,3 @@ private void LockToggled(EntityUid uid, ActivatableUIRequiresLockComponent compo
         _activatableUI.CloseAll(uid);
     }
 }
-
diff --git a/Content.Shared/Lock/LockingWhitelistComponent.cs b/Content.Shared/Lock/LockingWhitelistComponent.cs
new file mode 100644
index 00000000000..4ac832e4384
--- /dev/null
+++ b/Content.Shared/Lock/LockingWhitelistComponent.cs
@@ -0,0 +1,18 @@
+using Content.Shared.Whitelist;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Lock;
+
+/// <summary>
+/// Adds whitelist and blacklist for this mob to lock things.
+/// The whitelist and blacklist are checked against the object being locked, not the mob.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(LockingWhitelistSystem))]
+public sealed partial class LockingWhitelistComponent : Component
+{
+    [DataField]
+    public EntityWhitelist? Whitelist;
+
+    [DataField]
+    public EntityWhitelist? Blacklist;
+}
diff --git a/Content.Shared/Lock/LockingWhitelistSystem.cs b/Content.Shared/Lock/LockingWhitelistSystem.cs
new file mode 100644
index 00000000000..ba495fba905
--- /dev/null
+++ b/Content.Shared/Lock/LockingWhitelistSystem.cs
@@ -0,0 +1,28 @@
+using Content.Shared.Popups;
+using Content.Shared.Whitelist;
+
+namespace Content.Shared.Lock;
+
+public sealed class LockingWhitelistSystem : EntitySystem
+{
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<LockingWhitelistComponent, UserLockToggleAttemptEvent>(OnUserLockToggleAttempt);
+    }
+
+    private void OnUserLockToggleAttempt(Entity<LockingWhitelistComponent> ent, ref UserLockToggleAttemptEvent args)
+    {
+        if (_whitelistSystem.CheckBoth(args.Target, ent.Comp.Blacklist, ent.Comp.Whitelist))
+            return;
+
+        if (!args.Silent)
+            _popupSystem.PopupClient(Loc.GetString("locking-whitelist-component-lock-toggle-deny"), ent.Owner);
+
+        args.Cancelled = true;
+    }
+}
diff --git a/Content.Shared/Magic/SharedMagicSystem.cs b/Content.Shared/Magic/SharedMagicSystem.cs
index cc7a297aa40..02d483c0a3f 100644
--- a/Content.Shared/Magic/SharedMagicSystem.cs
+++ b/Content.Shared/Magic/SharedMagicSystem.cs
@@ -369,11 +369,10 @@ private void OnChangeComponentsSpell(ChangeComponentsSpellEvent ev)
             if (HasComp(ev.Target, data.Component.GetType()))
                 continue;
 
-            var component = (Component) _compFact.GetComponent(name);
-            component.Owner = ev.Target;
-            var temp = (object) component;
+            var component = (Component)_compFact.GetComponent(name);
+            var temp = (object)component;
             _seriMan.CopyTo(data.Component, ref temp);
-            EntityManager.AddComponent(ev.Target, (Component) temp!);
+            EntityManager.AddComponent(ev.Target, (Component)temp!);
         }
     }
     // End Change Component Spells
diff --git a/Content.Shared/Magic/SpellbookSystem.cs b/Content.Shared/Magic/SpellbookSystem.cs
index 84b2b232980..ce1628bacbf 100644
--- a/Content.Shared/Magic/SpellbookSystem.cs
+++ b/Content.Shared/Magic/SpellbookSystem.cs
@@ -88,7 +88,7 @@ private void AttemptLearn(Entity<SpellbookComponent> ent, UseInHandEvent args)
         {
             BreakOnMove = true,
             BreakOnDamage = true,
-            NeedHand = true //What, are you going to read with your eyes only??
+            NeedHand = true, //What, are you going to read with your eyes only??
         };
 
         _doAfter.TryStartDoAfter(doAfterEventArgs);
diff --git a/Content.Shared/MagicMirror/MagicMirrorComponent.cs b/Content.Shared/MagicMirror/MagicMirrorComponent.cs
index 95b17369795..97738be228a 100644
--- a/Content.Shared/MagicMirror/MagicMirrorComponent.cs
+++ b/Content.Shared/MagicMirror/MagicMirrorComponent.cs
@@ -20,28 +20,28 @@ public sealed partial class MagicMirrorComponent : Component
     public EntityUid? Target;
 
     /// <summary>
-    /// doafter time required to add a new slot
+    /// Do after time to add a new slot, adding hair to a person
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public TimeSpan AddSlotTime = TimeSpan.FromSeconds(5);
+    public TimeSpan AddSlotTime = TimeSpan.FromSeconds(7);
 
     /// <summary>
-    /// doafter time required to remove a existing slot
+    /// Do after time to remove a slot, removing hair from a person
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public TimeSpan RemoveSlotTime = TimeSpan.FromSeconds(2);
+    public TimeSpan RemoveSlotTime = TimeSpan.FromSeconds(7);
 
     /// <summary>
-    /// doafter time required to change slot
+    /// Do after time to change a person's hairstyle
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public TimeSpan SelectSlotTime = TimeSpan.FromSeconds(3);
+    public TimeSpan SelectSlotTime = TimeSpan.FromSeconds(7);
 
     /// <summary>
-    /// doafter time required to recolor slot
+    /// Do after time to change a person's hair color
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public TimeSpan ChangeSlotTime = TimeSpan.FromSeconds(1);
+    public TimeSpan ChangeSlotTime = TimeSpan.FromSeconds(7);
 
     /// <summary>
     /// Sound emitted when slots are changed
diff --git a/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs b/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
index 8641dbb3b8f..dac53c65aea 100644
--- a/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
+++ b/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
@@ -97,7 +97,7 @@ public bool TryStartProcessItem(EntityUid uid, EntityUid item, MaterialReclaimer
             _whitelistSystem.IsBlacklistPass(component.Blacklist, item))
             return false;
 
-        if (Container.TryGetContainingContainer(item, out _) && !Container.TryRemoveFromContainer(item))
+        if (Container.TryGetContainingContainer((item, null, null), out _) && !Container.TryRemoveFromContainer(item))
             return false;
 
         if (user != null)
diff --git a/Content.Shared/Medical/DefibrillatorComponent.cs b/Content.Shared/Medical/DefibrillatorComponent.cs
index 61a02187d09..e4cd8077d26 100644
--- a/Content.Shared/Medical/DefibrillatorComponent.cs
+++ b/Content.Shared/Medical/DefibrillatorComponent.cs
@@ -10,16 +10,11 @@ namespace Content.Shared.Medical;
 /// <summary>
 /// This is used for defibrillators; a machine that shocks a dead
 /// person back into the world of the living.
+/// Uses <c>ItemToggleComponent</c>
 /// </summary>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentPause]
 public sealed partial class DefibrillatorComponent : Component
 {
-    /// <summary>
-    /// Whether or not it's turned on and able to be used.
-    /// </summary>
-    [DataField("enabled"), ViewVariables(VVAccess.ReadWrite)]
-    public bool Enabled;
-
     /// <summary>
     /// The time at which the zap cooldown will be completed
     /// </summary>
@@ -72,15 +67,6 @@ public sealed partial class DefibrillatorComponent : Component
     [ViewVariables(VVAccess.ReadWrite), DataField("zapSound")]
     public SoundSpecifier? ZapSound = new SoundPathSpecifier("/Audio/Items/Defib/defib_zap.ogg");
 
-    /// <summary>
-    /// The sound when the defib is powered on.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("powerOnSound")]
-    public SoundSpecifier? PowerOnSound = new SoundPathSpecifier("/Audio/Items/Defib/defib_safety_on.ogg");
-
-    [ViewVariables(VVAccess.ReadWrite), DataField("powerOffSound")]
-    public SoundSpecifier? PowerOffSound = new SoundPathSpecifier("/Audio/Items/Defib/defib_safety_off.ogg");
-
     [ViewVariables(VVAccess.ReadWrite), DataField("chargeSound")]
     public SoundSpecifier? ChargeSound = new SoundPathSpecifier("/Audio/Items/Defib/defib_charge.ogg");
 
diff --git a/Content.Shared/Mind/SharedMindSystem.cs b/Content.Shared/Mind/SharedMindSystem.cs
index bf1065c1b1d..ba365daf15c 100644
--- a/Content.Shared/Mind/SharedMindSystem.cs
+++ b/Content.Shared/Mind/SharedMindSystem.cs
@@ -370,7 +370,7 @@ public bool TryGetObjectiveComp<T>(EntityUid mindId, [NotNullWhen(true)] out T?
         if (Resolve(mindId, ref mind))
         {
             var query = GetEntityQuery<T>();
-            foreach (var uid in mind.AllObjectives)
+            foreach (var uid in mind.Objectives)
             {
                 if (query.TryGetComponent(uid, out objective))
                 {
diff --git a/Content.Shared/Mindshield/Components/MindShieldComponent.cs b/Content.Shared/Mindshield/Components/MindShieldComponent.cs
index 235862ed02d..77f5497973f 100644
--- a/Content.Shared/Mindshield/Components/MindShieldComponent.cs
+++ b/Content.Shared/Mindshield/Components/MindShieldComponent.cs
@@ -12,5 +12,5 @@ namespace Content.Shared.Mindshield.Components;
 public sealed partial class MindShieldComponent : Component
 {
     [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public ProtoId<StatusIconPrototype> MindShieldStatusIcon = "MindShieldIcon";
+    public ProtoId<SecurityIconPrototype> MindShieldStatusIcon = "MindShieldIcon";
 }
diff --git a/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs b/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs
index 9ee8a064e54..f99bd43febc 100644
--- a/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs
+++ b/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs
@@ -80,11 +80,6 @@ private void OnStateExitSubscribers(EntityUid target, MobStateComponent componen
             case MobState.Dead:
                 RemComp<CollisionWakeComponent>(target);
                 _standing.Stand(target);
-                if (!_standing.IsDown(target) && TryComp<PhysicsComponent>(target, out var physics))
-                {
-                    _physics.SetCanCollide(target, true, body: physics);
-                }
-
                 break;
             case MobState.Invalid:
                 //unused
@@ -115,12 +110,6 @@ private void OnStateEnteredSubscribers(EntityUid target, MobStateComponent compo
             case MobState.Dead:
                 EnsureComp<CollisionWakeComponent>(target);
                 _standing.Down(target);
-
-                if (_standing.IsDown(target) && TryComp<PhysicsComponent>(target, out var physics))
-                {
-                    _physics.SetCanCollide(target, false, body: physics);
-                }
-
                 _appearance.SetData(target, MobStateVisuals.State, MobState.Dead);
                 break;
             case MobState.Invalid:
diff --git a/Content.Shared/MouseRotator/MouseRotatorComponent.cs b/Content.Shared/MouseRotator/MouseRotatorComponent.cs
index a35dfe0a288..2844b3cb8b5 100644
--- a/Content.Shared/MouseRotator/MouseRotatorComponent.cs
+++ b/Content.Shared/MouseRotator/MouseRotatorComponent.cs
@@ -30,8 +30,7 @@ public sealed partial class MouseRotatorComponent : Component
     public double RotationSpeed = float.MaxValue;
 
     /// <summary>
-    ///     This one is important. If this is true, <see cref="AngleTolerance"/> does not apply, and the system will
-    ///     use <see cref="RequestMouseRotatorRotationSimpleEvent"/> instead. In this mode, the client will only send
+    ///     This one is important. If this is true, <see cref="AngleTolerance"/> does not apply. In this mode, the client will only send
     ///     events when an entity should snap to a different cardinal direction, rather than for every angle change.
     ///
     ///     This is useful for cases like humans, where what really matters is the visual sprite direction, as opposed to something
@@ -50,13 +49,3 @@ public sealed class RequestMouseRotatorRotationEvent : EntityEventArgs
 {
     public Angle Rotation;
 }
-
-/// <summary>
-///     Simpler version of <see cref="RequestMouseRotatorRotationEvent"/> for implementations
-///     that only require snapping to 4-dir and not full angle rotation.
-/// </summary>
-[Serializable, NetSerializable]
-public sealed class RequestMouseRotatorRotationSimpleEvent : EntityEventArgs
-{
-    public Direction Direction;
-}
diff --git a/Content.Shared/MouseRotator/SharedMouseRotatorSystem.cs b/Content.Shared/MouseRotator/SharedMouseRotatorSystem.cs
index c57d477bd2f..9663b3363d1 100644
--- a/Content.Shared/MouseRotator/SharedMouseRotatorSystem.cs
+++ b/Content.Shared/MouseRotator/SharedMouseRotatorSystem.cs
@@ -1,5 +1,4 @@
 using Content.Shared.Interaction;
-using Robust.Shared.Timing;
 
 namespace Content.Shared.MouseRotator;
 
@@ -16,7 +15,6 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeAllEvent<RequestMouseRotatorRotationEvent>(OnRequestRotation);
-        SubscribeAllEvent<RequestMouseRotatorRotationSimpleEvent>(OnRequestSimpleRotation);
     }
 
     public override void Update(float frameTime)
@@ -50,7 +48,7 @@ public override void Update(float frameTime)
     private void OnRequestRotation(RequestMouseRotatorRotationEvent msg, EntitySessionEventArgs args)
     {
         if (args.SenderSession.AttachedEntity is not { } ent
-            || !TryComp<MouseRotatorComponent>(ent, out var rotator) || rotator.Simple4DirMode)
+            || !TryComp<MouseRotatorComponent>(ent, out var rotator))
         {
             Log.Error($"User {args.SenderSession.Name} ({args.SenderSession.UserId}) tried setting local rotation directly without a valid mouse rotator component attached!");
             return;
@@ -59,17 +57,4 @@ private void OnRequestRotation(RequestMouseRotatorRotationEvent msg, EntitySessi
         rotator.GoalRotation = msg.Rotation;
         Dirty(ent, rotator);
     }
-
-    private void OnRequestSimpleRotation(RequestMouseRotatorRotationSimpleEvent ev, EntitySessionEventArgs args)
-    {
-        if (args.SenderSession.AttachedEntity is not { } ent
-            || !TryComp<MouseRotatorComponent>(ent, out var rotator) || !rotator.Simple4DirMode)
-        {
-            Log.Error($"User {args.SenderSession.Name} ({args.SenderSession.UserId}) tried setting 4-dir rotation directly without a valid mouse rotator component attached!");
-            return;
-        }
-
-        rotator.GoalRotation = ev.Direction.ToAngle();
-        Dirty(ent, rotator);
-    }
 }
diff --git a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs
index a0feab7052c..02a85385314 100644
--- a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs
+++ b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs
@@ -15,6 +15,7 @@ public sealed partial class MovementSpeedModifierComponent : Component
         public const float DefaultMinimumFrictionSpeed = 0.005f;
         public const float DefaultWeightlessFriction = 1f;
         public const float DefaultWeightlessFrictionNoInput = 0.2f;
+        public const float DefaultOffGridFriction = 0.05f;
         public const float DefaultWeightlessModifier = 0.7f;
         public const float DefaultWeightlessAcceleration = 1f;
 
@@ -72,6 +73,12 @@ private float _baseSprintSpeedVV
         [ViewVariables(VVAccess.ReadWrite), DataField]
         public float WeightlessFrictionNoInput = DefaultWeightlessFrictionNoInput;
 
+        /// <summary>
+        /// The negative velocity applied for friction when weightless and not standing on a grid or mapgrid
+        /// </summary>
+        [ViewVariables(VVAccess.ReadWrite), DataField]
+        public float OffGridFriction = DefaultOffGridFriction;
+
         /// <summary>
         /// The movement speed modifier applied to a mob's total input velocity when weightless.
         /// </summary>
diff --git a/Content.Shared/Movement/Events/MoveInputEvent.cs b/Content.Shared/Movement/Events/MoveInputEvent.cs
index 1c677a42e87..9c49da722cb 100644
--- a/Content.Shared/Movement/Events/MoveInputEvent.cs
+++ b/Content.Shared/Movement/Events/MoveInputEvent.cs
@@ -9,16 +9,14 @@ namespace Content.Shared.Movement.Events;
 [ByRefEvent]
 public readonly struct MoveInputEvent
 {
-    public readonly EntityUid Entity;
-    public readonly InputMoverComponent Component;
+    public readonly Entity<InputMoverComponent> Entity;
     public readonly MoveButtons OldMovement;
 
-    public bool HasDirectionalMovement => (Component.HeldMoveButtons & MoveButtons.AnyDirection) != MoveButtons.None;
+    public bool HasDirectionalMovement => (Entity.Comp.HeldMoveButtons & MoveButtons.AnyDirection) != MoveButtons.None;
 
-    public MoveInputEvent(EntityUid entity, InputMoverComponent component, MoveButtons oldMovement)
+    public MoveInputEvent(Entity<InputMoverComponent> entity, MoveButtons oldMovement)
     {
         Entity = entity;
-        Component = component;
         OldMovement = oldMovement;
     }
 }
diff --git a/Content.Shared/Movement/Pulling/Components/PullableComponent.cs b/Content.Shared/Movement/Pulling/Components/PullableComponent.cs
index 100cd9d6d3e..aa44669fd14 100644
--- a/Content.Shared/Movement/Pulling/Components/PullableComponent.cs
+++ b/Content.Shared/Movement/Pulling/Components/PullableComponent.cs
@@ -42,3 +42,5 @@ public sealed partial class PullableComponent : Component
     [DataField]
     public ProtoId<AlertPrototype> PulledAlert = "Pulled";
 }
+
+public sealed partial class StopBeingPulledAlertEvent : BaseAlertEvent;
diff --git a/Content.Shared/Movement/Pulling/Components/PullerComponent.cs b/Content.Shared/Movement/Pulling/Components/PullerComponent.cs
index 32e4d9b1f31..197d7cfd7c8 100644
--- a/Content.Shared/Movement/Pulling/Components/PullerComponent.cs
+++ b/Content.Shared/Movement/Pulling/Components/PullerComponent.cs
@@ -44,3 +44,5 @@ public sealed partial class PullerComponent : Component
     [DataField]
     public ProtoId<AlertPrototype> PullingAlert = "Pulling";
 }
+
+public sealed partial class StopPullingAlertEvent : BaseAlertEvent;
diff --git a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
index eb2872df9c1..b5fc6948334 100644
--- a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
+++ b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
@@ -8,6 +8,7 @@
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Input;
 using Content.Shared.Interaction;
+using Content.Shared.Item;
 using Content.Shared.Movement.Events;
 using Content.Shared.Movement.Pulling.Components;
 using Content.Shared.Movement.Pulling.Events;
@@ -42,7 +43,7 @@ public sealed class PullingSystem : EntitySystem
     [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
     [Dependency] private readonly SharedInteractionSystem _interaction = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly HeldSpeedModifierSystem _clothingMoveSpeed = default!;
 
     public override void Initialize()
     {
@@ -57,6 +58,7 @@ public override void Initialize()
         SubscribeLocalEvent<PullableComponent, GetVerbsEvent<Verb>>(AddPullVerbs);
         SubscribeLocalEvent<PullableComponent, EntGotInsertedIntoContainerMessage>(OnPullableContainerInsert);
         SubscribeLocalEvent<PullableComponent, ModifyUncuffDurationEvent>(OnModifyUncuffDuration);
+        SubscribeLocalEvent<PullableComponent, StopBeingPulledAlertEvent>(OnStopBeingPulledAlert);
 
         SubscribeLocalEvent<PullerComponent, AfterAutoHandleStateEvent>(OnAfterState);
         SubscribeLocalEvent<PullerComponent, EntGotInsertedIntoContainerMessage>(OnPullerContainerInsert);
@@ -64,6 +66,7 @@ public override void Initialize()
         SubscribeLocalEvent<PullerComponent, VirtualItemDeletedEvent>(OnVirtualItemDeleted);
         SubscribeLocalEvent<PullerComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovespeed);
         SubscribeLocalEvent<PullerComponent, DropHandItemsEvent>(OnDropHandItems);
+        SubscribeLocalEvent<PullerComponent, StopPullingAlertEvent>(OnStopPullingAlert);
 
         SubscribeLocalEvent<PullableComponent, StrappedEvent>(OnBuckled);
         SubscribeLocalEvent<PullableComponent, BuckledEvent>(OnGotBuckled);
@@ -104,6 +107,15 @@ private void OnDropHandItems(EntityUid uid, PullerComponent pullerComp, DropHand
         TryStopPull(pullerComp.Pulling.Value, pullableComp, uid);
     }
 
+    private void OnStopPullingAlert(Entity<PullerComponent> ent, ref StopPullingAlertEvent args)
+    {
+        if (args.Handled)
+            return;
+        if (!TryComp<PullableComponent>(ent.Comp.Pulling, out var pullable))
+            return;
+        args.Handled = TryStopPull(ent.Comp.Pulling.Value, pullable, ent);
+    }
+
     private void OnPullerContainerInsert(Entity<PullerComponent> ent, ref EntGotInsertedIntoContainerMessage args)
     {
         if (ent.Comp.Pulling == null)
@@ -132,6 +144,14 @@ private void OnModifyUncuffDuration(Entity<PullableComponent> ent, ref ModifyUnc
         args.Duration *= 2;
     }
 
+    private void OnStopBeingPulledAlert(Entity<PullableComponent> ent, ref StopBeingPulledAlertEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        args.Handled = TryStopPull(ent, ent, ent);
+    }
+
     public override void Shutdown()
     {
         base.Shutdown();
@@ -192,6 +212,14 @@ private void AddPullVerbs(EntityUid uid, PullableComponent component, GetVerbsEv
 
     private void OnRefreshMovespeed(EntityUid uid, PullerComponent component, RefreshMovementSpeedModifiersEvent args)
     {
+        if (TryComp<HeldSpeedModifierComponent>(component.Pulling, out var heldMoveSpeed) && component.Pulling.HasValue)
+        {
+            var (walkMod, sprintMod) =
+                _clothingMoveSpeed.GetHeldMovementSpeedModifiers(component.Pulling.Value, heldMoveSpeed);
+            args.ModifySpeed(walkMod, sprintMod);
+            return;
+        }
+
         args.ModifySpeed(component.WalkSpeedModifier, component.SprintSpeedModifier);
     }
 
@@ -300,7 +328,7 @@ public bool IsPulling(EntityUid puller, PullerComponent? component = null)
 
     private void OnReleasePulledObject(ICommonSession? session)
     {
-        if (session?.AttachedEntity is not {Valid: true} player)
+        if (session?.AttachedEntity is not { Valid: true } player)
         {
             return;
         }
@@ -437,6 +465,9 @@ public bool TryStartPull(EntityUid pullerUid, EntityUid pullableUid,
         pullerComp.Pulling = pullableUid;
         pullableComp.Puller = pullerUid;
 
+        // store the pulled entity's physics FixedRotation setting in case we change it
+        pullableComp.PrevFixedRotation = pullablePhysics.FixedRotation;
+
         // joint state handling will manage its own state
         if (!_timing.ApplyingState)
         {
@@ -455,10 +486,9 @@ public bool TryStartPull(EntityUid pullerUid, EntityUid pullableUid,
             _physics.SetFixedRotation(pullableUid, pullableComp.FixedRotationOnPull, body: pullablePhysics);
         }
 
-        pullableComp.PrevFixedRotation = pullablePhysics.FixedRotation;
-
         // Messaging
         var message = new PullStartedMessage(pullerUid, pullableUid);
+        _modifierSystem.RefreshMovementSpeedModifiers(pullerUid);
         _alertsSystem.ShowAlert(pullerUid, pullerComp.PullingAlert);
         _alertsSystem.ShowAlert(pullableUid, pullableComp.PulledAlert);
 
@@ -480,6 +510,9 @@ public bool TryStopPull(EntityUid pullableUid, PullableComponent pullable, Entit
         if (pullerUidNull == null)
             return true;
 
+        if (user != null && !_blocker.CanInteract(user.Value, pullableUid))
+            return false;
+
         var msg = new AttemptStopPullingEvent(user);
         RaiseLocalEvent(pullableUid, msg, true);
 
diff --git a/Content.Shared/Movement/Systems/SharedContentEyeSystem.cs b/Content.Shared/Movement/Systems/SharedContentEyeSystem.cs
index 207f14a258a..faade44c858 100644
--- a/Content.Shared/Movement/Systems/SharedContentEyeSystem.cs
+++ b/Content.Shared/Movement/Systems/SharedContentEyeSystem.cs
@@ -1,6 +1,7 @@
 using System.Numerics;
 using Content.Shared.Administration;
 using Content.Shared.Administration.Managers;
+using Content.Shared.Camera;
 using Content.Shared.Ghost;
 using Content.Shared.Input;
 using Content.Shared.Movement.Components;
@@ -17,6 +18,9 @@ public abstract class SharedContentEyeSystem : EntitySystem
 {
     [Dependency] private readonly ISharedAdminManager _admin = default!;
 
+    // Admin flags required to ignore normal eye restrictions.
+    public const AdminFlags EyeFlag = AdminFlags.Debug;
+
     public const float ZoomMod = 1.5f;
     public static readonly Vector2 DefaultZoom = Vector2.One;
     public static readonly Vector2 MinZoom = DefaultZoom * (float)Math.Pow(ZoomMod, -3);
@@ -28,6 +32,7 @@ public override void Initialize()
         base.Initialize();
         SubscribeLocalEvent<ContentEyeComponent, ComponentStartup>(OnContentEyeStartup);
         SubscribeAllEvent<RequestTargetZoomEvent>(OnContentZoomRequest);
+        SubscribeAllEvent<RequestPvsScaleEvent>(OnPvsScale);
         SubscribeAllEvent<RequestEyeEvent>(OnRequestEye);
 
         CommandBinds.Builder
@@ -83,12 +88,18 @@ public void SetZoom(EntityUid uid, Vector2 zoom, bool ignoreLimits = false, Cont
 
     private void OnContentZoomRequest(RequestTargetZoomEvent msg, EntitySessionEventArgs args)
     {
-        var ignoreLimit = msg.IgnoreLimit && _admin.HasAdminFlag(args.SenderSession, AdminFlags.Debug);
+        var ignoreLimit = msg.IgnoreLimit && _admin.HasAdminFlag(args.SenderSession, EyeFlag);
 
         if (TryComp<ContentEyeComponent>(args.SenderSession.AttachedEntity, out var content))
             SetZoom(args.SenderSession.AttachedEntity.Value, msg.TargetZoom, ignoreLimit, eye: content);
     }
 
+    private void OnPvsScale(RequestPvsScaleEvent ev, EntitySessionEventArgs args)
+    {
+        if (args.SenderSession.AttachedEntity is {} uid && _admin.HasAdminFlag(args.SenderSession, EyeFlag))
+            _eye.SetPvsScale(uid, ev.Scale);
+    }
+
     private void OnRequestEye(RequestEyeEvent msg, EntitySessionEventArgs args)
     {
         if (args.SenderSession.AttachedEntity is not { } player)
@@ -115,6 +126,7 @@ private void OnContentEyeStartup(EntityUid uid, ContentEyeComponent component, C
 
     public void ResetZoom(EntityUid uid, ContentEyeComponent? component = null)
     {
+        _eye.SetPvsScale(uid, 1);
         SetZoom(uid, DefaultZoom, eye: component);
     }
 
@@ -128,6 +140,13 @@ public void SetMaxZoom(EntityUid uid, Vector2 value, ContentEyeComponent? compon
         Dirty(uid, component);
     }
 
+    public void UpdateEyeOffset(Entity<EyeComponent?> eye)
+    {
+        var ev = new GetEyeOffsetEvent();
+        RaiseLocalEvent(eye, ref ev);
+        _eye.SetOffset(eye, ev.Offset, eye);
+    }
+
     /// <summary>
     /// Sendable from client to server to request a target zoom.
     /// </summary>
@@ -138,6 +157,15 @@ public sealed class RequestTargetZoomEvent : EntityEventArgs
         public bool IgnoreLimit;
     }
 
+    /// <summary>
+    /// Client->Server request for new PVS scale.
+    /// </summary>
+    [Serializable, NetSerializable]
+    public sealed class RequestPvsScaleEvent(float scale) : EntityEventArgs
+    {
+        public float Scale = scale;
+    }
+
     /// <summary>
     /// Sendable from client to server to request changing fov.
     /// </summary>
diff --git a/Content.Shared/Movement/Systems/SharedJetpackSystem.cs b/Content.Shared/Movement/Systems/SharedJetpackSystem.cs
index 724eca682fb..548594c01f7 100644
--- a/Content.Shared/Movement/Systems/SharedJetpackSystem.cs
+++ b/Content.Shared/Movement/Systems/SharedJetpackSystem.cs
@@ -13,12 +13,12 @@ namespace Content.Shared.Movement.Systems;
 
 public abstract class SharedJetpackSystem : EntitySystem
 {
-    [Dependency] private   readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
-    [Dependency] protected  readonly SharedAppearanceSystem Appearance = default!;
+    [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
+    [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
     [Dependency] protected readonly SharedContainerSystem Container = default!;
-    [Dependency] private   readonly SharedMoverController _mover = default!;
-    [Dependency] private   readonly SharedPopupSystem _popup = default!;
-    [Dependency] private   readonly SharedPhysicsSystem _physics = default!;
+    [Dependency] private readonly SharedMoverController _mover = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
 
     public override void Initialize()
@@ -125,6 +125,8 @@ private void OnJetpackToggle(EntityUid uid, JetpackComponent component, ToggleJe
 
     private bool CanEnableOnGrid(EntityUid? gridUid)
     {
+        // No and no again! Do not attempt to activate the jetpack on a grid with gravity disabled. You will not be the first or the last to try this.
+        // https://discord.com/channels/310555209753690112/310555209753690112/1270067921682694234
         return gridUid == null ||
                (!HasComp<GravityComponent>(gridUid));
     }
@@ -158,7 +160,7 @@ public void SetEnabled(EntityUid uid, JetpackComponent component, bool enabled,
 
         if (user == null)
         {
-            Container.TryGetContainingContainer(uid, out var container);
+            Container.TryGetContainingContainer((uid, null, null), out var container);
             user = container?.Owner;
         }
 
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
index 1ccb7f0c3f1..9dda249423e 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
@@ -83,53 +83,53 @@ public static MoveButtons GetNormalizedMovement(MoveButtons buttons)
             return oldMovement;
         }
 
-        protected void SetMoveInput(InputMoverComponent component, MoveButtons buttons)
+        protected void SetMoveInput(Entity<InputMoverComponent> entity, MoveButtons buttons)
         {
-            if (component.HeldMoveButtons == buttons)
+            if (entity.Comp.HeldMoveButtons == buttons)
                 return;
 
             // Relay the fact we had any movement event.
             // TODO: Ideally we'd do these in a tick instead of out of sim.
-            var moveEvent = new MoveInputEvent(component.Owner, component, component.HeldMoveButtons);
-            component.HeldMoveButtons = buttons;
-            RaiseLocalEvent(component.Owner, ref moveEvent);
-            Dirty(component.Owner, component);
+            var moveEvent = new MoveInputEvent(entity, entity.Comp.HeldMoveButtons);
+            entity.Comp.HeldMoveButtons = buttons;
+            RaiseLocalEvent(entity, ref moveEvent);
+            Dirty(entity, entity.Comp);
         }
 
-        private void OnMoverHandleState(EntityUid uid, InputMoverComponent component, ComponentHandleState args)
+        private void OnMoverHandleState(Entity<InputMoverComponent> entity, ref ComponentHandleState args)
         {
             if (args.Current is not InputMoverComponentState state)
                 return;
 
             // Handle state
-            component.LerpTarget = state.LerpTarget;
-            component.RelativeRotation = state.RelativeRotation;
-            component.TargetRelativeRotation = state.TargetRelativeRotation;
-            component.CanMove = state.CanMove;
-            component.RelativeEntity = EnsureEntity<InputMoverComponent>(state.RelativeEntity, uid);
+            entity.Comp.LerpTarget = state.LerpTarget;
+            entity.Comp.RelativeRotation = state.RelativeRotation;
+            entity.Comp.TargetRelativeRotation = state.TargetRelativeRotation;
+            entity.Comp.CanMove = state.CanMove;
+            entity.Comp.RelativeEntity = EnsureEntity<InputMoverComponent>(state.RelativeEntity, entity.Owner);
 
             // Reset
-            component.LastInputTick = GameTick.Zero;
-            component.LastInputSubTick = 0;
+            entity.Comp.LastInputTick = GameTick.Zero;
+            entity.Comp.LastInputSubTick = 0;
 
-            if (component.HeldMoveButtons != state.HeldMoveButtons)
+            if (entity.Comp.HeldMoveButtons != state.HeldMoveButtons)
             {
-                var moveEvent = new MoveInputEvent(uid, component, component.HeldMoveButtons);
-                component.HeldMoveButtons = state.HeldMoveButtons;
-                RaiseLocalEvent(uid, ref moveEvent);
+                var moveEvent = new MoveInputEvent(entity, entity.Comp.HeldMoveButtons);
+                entity.Comp.HeldMoveButtons = state.HeldMoveButtons;
+                RaiseLocalEvent(entity.Owner, ref moveEvent);
             }
         }
 
-        private void OnMoverGetState(EntityUid uid, InputMoverComponent component, ref ComponentGetState args)
+        private void OnMoverGetState(Entity<InputMoverComponent> entity, ref ComponentGetState args)
         {
             args.State = new InputMoverComponentState()
             {
-                CanMove = component.CanMove,
-                RelativeEntity = GetNetEntity(component.RelativeEntity),
-                LerpTarget = component.LerpTarget,
-                HeldMoveButtons = component.HeldMoveButtons,
-                RelativeRotation = component.RelativeRotation,
-                TargetRelativeRotation = component.TargetRelativeRotation,
+                CanMove = entity.Comp.CanMove,
+                RelativeEntity = GetNetEntity(entity.Comp.RelativeEntity),
+                LerpTarget = entity.Comp.LerpTarget,
+                HeldMoveButtons = entity.Comp.HeldMoveButtons,
+                RelativeRotation = entity.Comp.RelativeRotation,
+                TargetRelativeRotation = entity.Comp.TargetRelativeRotation,
             };
         }
 
@@ -142,9 +142,9 @@ private void ShutdownInput()
 
         protected virtual void HandleShuttleInput(EntityUid uid, ShuttleButtons button, ushort subTick, bool state) {}
 
-        private void OnAutoParentChange(EntityUid uid, AutoOrientComponent component, ref EntParentChangedMessage args)
+        private void OnAutoParentChange(Entity<AutoOrientComponent> entity, ref EntParentChangedMessage args)
         {
-            ResetCamera(uid);
+            ResetCamera(entity.Owner);
         }
 
         public void RotateCamera(EntityUid uid, Angle angle)
@@ -233,28 +233,28 @@ public Angle GetParentGridAngle(InputMoverComponent mover)
             return rotation;
         }
 
-        private void OnFollowedParentChange(EntityUid uid, FollowedComponent component, ref EntParentChangedMessage args)
+        private void OnFollowedParentChange(Entity<FollowedComponent> entity, ref EntParentChangedMessage args)
         {
-            foreach (var foll in component.Following)
+            foreach (var foll in entity.Comp.Following)
             {
                 if (!MoverQuery.TryGetComponent(foll, out var mover))
                     continue;
 
                 var ev = new EntParentChangedMessage(foll, null, args.OldMapId, XformQuery.GetComponent(foll));
-                OnInputParentChange(foll, mover, ref ev);
+                OnInputParentChange((foll, mover), ref ev);
             }
         }
 
-        private void OnInputParentChange(EntityUid uid, InputMoverComponent component, ref EntParentChangedMessage args)
+        private void OnInputParentChange(Entity<InputMoverComponent> entity, ref EntParentChangedMessage args)
         {
             // If we change our grid / map then delay updating our LastGridAngle.
             var relative = args.Transform.GridUid;
             relative ??= args.Transform.MapUid;
 
-            if (component.LifeStage < ComponentLifeStage.Running)
+            if (entity.Comp.LifeStage < ComponentLifeStage.Running)
             {
-                component.RelativeEntity = relative;
-                Dirty(uid, component);
+                entity.Comp.RelativeEntity = relative;
+                Dirty(entity.Owner, entity.Comp);
                 return;
             }
 
@@ -264,28 +264,28 @@ private void OnInputParentChange(EntityUid uid, InputMoverComponent component, r
             // If we change maps then reset eye rotation entirely.
             if (oldMapId != mapId)
             {
-                component.RelativeEntity = relative;
-                component.TargetRelativeRotation = Angle.Zero;
-                component.RelativeRotation = Angle.Zero;
-                component.LerpTarget = TimeSpan.Zero;
-                Dirty(uid, component);
+                entity.Comp.RelativeEntity = relative;
+                entity.Comp.TargetRelativeRotation = Angle.Zero;
+                entity.Comp.RelativeRotation = Angle.Zero;
+                entity.Comp.LerpTarget = TimeSpan.Zero;
+                Dirty(entity.Owner, entity.Comp);
                 return;
             }
 
             // If we go on a grid and back off then just reset the accumulator.
-            if (relative == component.RelativeEntity)
+            if (relative == entity.Comp.RelativeEntity)
             {
-                if (component.LerpTarget >= Timing.CurTime)
+                if (entity.Comp.LerpTarget >= Timing.CurTime)
                 {
-                    component.LerpTarget = TimeSpan.Zero;
-                    Dirty(uid, component);
+                    entity.Comp.LerpTarget = TimeSpan.Zero;
+                    Dirty(entity.Owner, entity.Comp);
                 }
 
                 return;
             }
 
-            component.LerpTarget = TimeSpan.FromSeconds(InputMoverComponent.LerpTime) + Timing.CurTime;
-            Dirty(uid, component);
+            entity.Comp.LerpTarget = TimeSpan.FromSeconds(InputMoverComponent.LerpTime) + Timing.CurTime;
+            Dirty(entity.Owner, entity.Comp);
         }
 
         private void HandleDirChange(EntityUid entity, Direction dir, ushort subTick, bool state)
@@ -299,7 +299,7 @@ private void HandleDirChange(EntityUid entity, Direction dir, ushort subTick, bo
                 DebugTools.AssertNotNull(relayMover.RelayEntity);
 
                 if (MoverQuery.TryGetComponent(entity, out var mover))
-                    SetMoveInput(mover, MoveButtons.None);
+                    SetMoveInput((entity, mover), MoveButtons.None);
 
                 if (!_mobState.IsIncapacitated(entity))
                     HandleDirChange(relayMover.RelayEntity, dir, subTick, state);
@@ -321,18 +321,18 @@ private void HandleDirChange(EntityUid entity, Direction dir, ushort subTick, bo
                 RaiseLocalEvent(xform.ParentUid, ref relayMoveEvent);
             }
 
-            SetVelocityDirection(entity, moverComp, dir, subTick, state);
+            SetVelocityDirection((entity, moverComp), dir, subTick, state);
         }
 
-        private void OnInputInit(EntityUid uid, InputMoverComponent component, ComponentInit args)
+        private void OnInputInit(Entity<InputMoverComponent> entity, ref ComponentInit args)
         {
-            var xform = Transform(uid);
+            var xform = Transform(entity.Owner);
 
             if (!xform.ParentUid.IsValid())
                 return;
 
-            component.RelativeEntity = xform.GridUid ?? xform.MapUid;
-            component.TargetRelativeRotation = Angle.Zero;
+            entity.Comp.RelativeEntity = xform.GridUid ?? xform.MapUid;
+            entity.Comp.TargetRelativeRotation = Angle.Zero;
         }
 
         private void HandleRunChange(EntityUid uid, ushort subTick, bool walking)
@@ -344,7 +344,7 @@ private void HandleRunChange(EntityUid uid, ushort subTick, bool walking)
                 // if we swap to relay then stop our existing input if we ever change back.
                 if (moverComp != null)
                 {
-                    SetMoveInput(moverComp, MoveButtons.None);
+                    SetMoveInput((uid, moverComp), MoveButtons.None);
                 }
 
                 HandleRunChange(relayMover.RelayEntity, subTick, walking);
@@ -353,7 +353,7 @@ private void HandleRunChange(EntityUid uid, ushort subTick, bool walking)
 
             if (moverComp == null) return;
 
-            SetSprinting(uid, moverComp, subTick, walking);
+            SetSprinting((uid, moverComp), subTick, walking);
         }
 
         public (Vector2 Walking, Vector2 Sprinting) GetVelocityInput(InputMoverComponent mover)
@@ -404,7 +404,7 @@ private void HandleRunChange(EntityUid uid, ushort subTick, bool walking)
         ///     composed into a single direction vector, <see cref="VelocityDir"/>. Enabling
         ///     opposite directions will cancel each other out, resulting in no direction.
         /// </summary>
-        public void SetVelocityDirection(EntityUid entity, InputMoverComponent component, Direction direction, ushort subTick, bool enabled)
+        public void SetVelocityDirection(Entity<InputMoverComponent> entity, Direction direction, ushort subTick, bool enabled)
         {
             // Logger.Info($"[{_gameTiming.CurTick}/{subTick}] {direction}: {enabled}");
 
@@ -417,26 +417,26 @@ public void SetVelocityDirection(EntityUid entity, InputMoverComponent component
                 _ => throw new ArgumentException(nameof(direction))
             };
 
-            SetMoveInput(entity, component, subTick, enabled, bit);
+            SetMoveInput(entity, subTick, enabled, bit);
         }
 
-        private void SetMoveInput(EntityUid entity, InputMoverComponent component, ushort subTick, bool enabled, MoveButtons bit)
+        private void SetMoveInput(Entity<InputMoverComponent> entity, ushort subTick, bool enabled, MoveButtons bit)
         {
             // Modifies held state of a movement button at a certain sub tick and updates current tick movement vectors.
-            ResetSubtick(component);
+            ResetSubtick(entity.Comp);
 
-            if (subTick >= component.LastInputSubTick)
+            if (subTick >= entity.Comp.LastInputSubTick)
             {
-                var fraction = (subTick - component.LastInputSubTick) / (float) ushort.MaxValue;
+                var fraction = (subTick - entity.Comp.LastInputSubTick) / (float) ushort.MaxValue;
 
-                ref var lastMoveAmount = ref component.Sprinting ? ref component.CurTickSprintMovement : ref component.CurTickWalkMovement;
+                ref var lastMoveAmount = ref entity.Comp.Sprinting ? ref entity.Comp.CurTickSprintMovement : ref entity.Comp.CurTickWalkMovement;
 
-                lastMoveAmount += DirVecForButtons(component.HeldMoveButtons) * fraction;
+                lastMoveAmount += DirVecForButtons(entity.Comp.HeldMoveButtons) * fraction;
 
-                component.LastInputSubTick = subTick;
+                entity.Comp.LastInputSubTick = subTick;
             }
 
-            var buttons = component.HeldMoveButtons;
+            var buttons = entity.Comp.HeldMoveButtons;
 
             if (enabled)
             {
@@ -447,7 +447,7 @@ private void SetMoveInput(EntityUid entity, InputMoverComponent component, ushor
                 buttons &= ~bit;
             }
 
-            SetMoveInput(component, buttons);
+            SetMoveInput(entity, buttons);
         }
 
         private void ResetSubtick(InputMoverComponent component)
@@ -460,11 +460,11 @@ private void ResetSubtick(InputMoverComponent component)
             component.LastInputSubTick = 0;
         }
 
-        public void SetSprinting(EntityUid entity, InputMoverComponent component, ushort subTick, bool walking)
+        public void SetSprinting(Entity<InputMoverComponent> entity, ushort subTick, bool walking)
         {
             // Logger.Info($"[{_gameTiming.CurTick}/{subTick}] Sprint: {enabled}");
 
-            SetMoveInput(entity, component, subTick, walking, MoveButtons.Walk);
+            SetMoveInput(entity, subTick, walking, MoveButtons.Walk);
         }
 
         /// <summary>
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs b/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs
index 8568290bffb..81569553772 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs
@@ -12,14 +12,14 @@ private void InitializeRelay()
         SubscribeLocalEvent<RelayInputMoverComponent, AfterAutoHandleStateEvent>(OnAfterRelayState);
     }
 
-    private void OnAfterRelayTargetState(EntityUid uid, MovementRelayTargetComponent component, ref AfterAutoHandleStateEvent args)
+    private void OnAfterRelayTargetState(Entity<MovementRelayTargetComponent> entity, ref AfterAutoHandleStateEvent args)
     {
-        Physics.UpdateIsPredicted(uid);
+        Physics.UpdateIsPredicted(entity.Owner);
     }
 
-    private void OnAfterRelayState(EntityUid uid, RelayInputMoverComponent component, ref AfterAutoHandleStateEvent args)
+    private void OnAfterRelayState(Entity<RelayInputMoverComponent> entity, ref AfterAutoHandleStateEvent args)
     {
-        Physics.UpdateIsPredicted(uid);
+        Physics.UpdateIsPredicted(entity.Owner);
     }
 
     /// <summary>
@@ -61,30 +61,30 @@ public void SetRelay(EntityUid uid, EntityUid relayEntity)
         Dirty(relayEntity, targetComp);
     }
 
-    private void OnRelayShutdown(EntityUid uid, RelayInputMoverComponent component, ComponentShutdown args)
+    private void OnRelayShutdown(Entity<RelayInputMoverComponent> entity, ref ComponentShutdown args)
     {
-        Physics.UpdateIsPredicted(uid);
-        Physics.UpdateIsPredicted(component.RelayEntity);
+        Physics.UpdateIsPredicted(entity.Owner);
+        Physics.UpdateIsPredicted(entity.Comp.RelayEntity);
 
-        if (TryComp<InputMoverComponent>(component.RelayEntity, out var inputMover))
-            SetMoveInput(inputMover, MoveButtons.None);
+        if (TryComp<InputMoverComponent>(entity.Comp.RelayEntity, out var inputMover))
+            SetMoveInput((entity.Comp.RelayEntity, inputMover), MoveButtons.None);
 
         if (Timing.ApplyingState)
             return;
 
-        if (TryComp(component.RelayEntity, out MovementRelayTargetComponent? target) && target.LifeStage <= ComponentLifeStage.Running)
-            RemComp(component.RelayEntity, target);
+        if (TryComp(entity.Comp.RelayEntity, out MovementRelayTargetComponent? target) && target.LifeStage <= ComponentLifeStage.Running)
+            RemComp(entity.Comp.RelayEntity, target);
     }
 
-    private void OnTargetRelayShutdown(EntityUid uid, MovementRelayTargetComponent component, ComponentShutdown args)
+    private void OnTargetRelayShutdown(Entity<MovementRelayTargetComponent> entity, ref ComponentShutdown args)
     {
-        Physics.UpdateIsPredicted(uid);
-        Physics.UpdateIsPredicted(component.Source);
+        Physics.UpdateIsPredicted(entity.Owner);
+        Physics.UpdateIsPredicted(entity.Comp.Source);
 
         if (Timing.ApplyingState)
             return;
 
-        if (TryComp(component.Source, out RelayInputMoverComponent? relay) && relay.LifeStage <= ComponentLifeStage.Running)
-            RemComp(component.Source, relay);
+        if (TryComp(entity.Comp.Source, out RelayInputMoverComponent? relay) && relay.LifeStage <= ComponentLifeStage.Running)
+            RemComp(entity.Comp.Source, relay);
     }
 }
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs
index 0e388ab853b..4bb1d678804 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.cs
@@ -59,6 +59,8 @@ public abstract partial class SharedMoverController : VirtualController
         protected EntityQuery<TransformComponent> XformQuery;
         protected EntityQuery<CanMoveInAirComponent> CanMoveInAirQuery;
         protected EntityQuery<NoRotateOnMoveComponent> NoRotateQuery;
+        protected EntityQuery<FootstepModifierComponent> FootstepModifierQuery;
+        protected EntityQuery<MapGridComponent> MapGridQuery;
 
         /// <summary>
         /// <see cref="CCVars.StopSpeed"/>
@@ -86,6 +88,8 @@ public override void Initialize()
             XformQuery = GetEntityQuery<TransformComponent>();
             NoRotateQuery = GetEntityQuery<NoRotateOnMoveComponent>();
             CanMoveInAirQuery = GetEntityQuery<CanMoveInAirComponent>();
+            FootstepModifierQuery = GetEntityQuery<FootstepModifierComponent>();
+            MapGridQuery = GetEntityQuery<MapGridComponent>();
 
             InitializeInput();
             InitializeRelay();
@@ -183,7 +187,7 @@ protected void HandleMobMovement(
 
             // Don't bother getting the tiledef here if we're weightless or in-air
             // since no tile-based modifiers should be applying in that situation
-            if (TryComp(xform.GridUid, out MapGridComponent? gridComp)
+            if (MapGridQuery.TryComp(xform.GridUid, out var gridComp)
                 && _mapSystem.TryGetTileRef(xform.GridUid.Value, gridComp, xform.Coordinates, out var tile)
                 && !(weightless || physicsComponent.BodyStatus == BodyStatus.InAir))
             {
@@ -212,7 +216,9 @@ protected void HandleMobMovement(
 
             if (weightless)
             {
-                if (worldTotal != Vector2.Zero && touching)
+                if (gridComp == null && !MapGridQuery.HasComp(xform.GridUid))
+                    friction = moveSpeedComponent?.OffGridFriction ?? MovementSpeedModifierComponent.DefaultOffGridFriction;
+                else if (worldTotal != Vector2.Zero && touching)
                     friction = moveSpeedComponent?.WeightlessFriction ?? MovementSpeedModifierComponent.DefaultWeightlessFriction;
                 else
                     friction = moveSpeedComponent?.WeightlessFrictionNoInput ?? MovementSpeedModifierComponent.DefaultWeightlessFrictionNoInput;
@@ -432,7 +438,7 @@ private bool TryGetSound(
 
             mobMover.StepSoundDistance -= distanceNeeded;
 
-            if (TryComp<FootstepModifierComponent>(uid, out var moverModifier))
+            if (FootstepModifierQuery.TryComp(uid, out var moverModifier))
             {
                 sound = moverModifier.FootstepSoundCollection;
                 return true;
@@ -447,7 +453,7 @@ private bool TryGetSound(
             // Delta V NoShoesSilentFootsteps till here.
 
             if (_inventory.TryGetSlotEntity(uid, "shoes", out var shoes) &&
-                TryComp<FootstepModifierComponent>(shoes, out var modifier))
+                FootstepModifierQuery.TryComp(shoes, out var modifier))
             {
                 sound = modifier.FootstepSoundCollection;
                 return true;
@@ -466,9 +472,9 @@ private bool TryGetFootstepSound(
             sound = null;
 
             // Fallback to the map?
-            if (!TryComp<MapGridComponent>(xform.GridUid, out var grid))
+            if (!MapGridQuery.TryComp(xform.GridUid, out var grid))
             {
-                if (TryComp<FootstepModifierComponent>(xform.MapUid, out var modifier))
+                if (FootstepModifierQuery.TryComp(xform.MapUid, out var modifier))
                 {
                     sound = modifier.FootstepSoundCollection;
                     return true;
@@ -494,7 +500,7 @@ private bool TryGetFootstepSound(
                     return true;
                 }
 
-                if (TryComp<FootstepModifierComponent>(maybeFootstep, out var footstep))
+                if (FootstepModifierQuery.TryComp(maybeFootstep, out var footstep))
                 {
                     sound = footstep.FootstepSoundCollection;
                     return true;
diff --git a/Content.Shared/NPC/Components/NpcFactionMemberComponent.cs b/Content.Shared/NPC/Components/NpcFactionMemberComponent.cs
index 188ece81ed7..208dfd4681a 100644
--- a/Content.Shared/NPC/Components/NpcFactionMemberComponent.cs
+++ b/Content.Shared/NPC/Components/NpcFactionMemberComponent.cs
@@ -26,11 +26,15 @@ public sealed partial class NpcFactionMemberComponent : Component
     [ViewVariables]
     public readonly HashSet<ProtoId<NpcFactionPrototype>> HostileFactions = new();
 
-    // Nyano - Summary - Begin modified code block: support for specific entities to be friendly.
     /// <summary>
-    /// Permanently friendly specific entities. Our summoner, etc.
-    /// Would like to separate. Could I do that by extending this method, maybe?
+    /// Used to add friendly factions in prototypes.
     /// </summary>
-    public HashSet<EntityUid> ExceptionalFriendlies = new();
-    // Nyano - End modified code block.
+    [DataField, ViewVariables]
+    public HashSet<ProtoId<NpcFactionPrototype>>? AddFriendlyFactions;
+
+    /// <summary>
+    /// Used to add hostile factions in prototypes.
+    /// </summary>
+    [DataField, ViewVariables]
+    public HashSet<ProtoId<NpcFactionPrototype>>? AddHostileFactions;
 }
diff --git a/Content.Shared/NPC/Systems/NpcFactionSystem.cs b/Content.Shared/NPC/Systems/NpcFactionSystem.cs
index f0bb1945eb4..ea762ec1130 100644
--- a/Content.Shared/NPC/Systems/NpcFactionSystem.cs
+++ b/Content.Shared/NPC/Systems/NpcFactionSystem.cs
@@ -60,6 +60,15 @@ private void RefreshFactions(Entity<NpcFactionMemberComponent> ent)
             ent.Comp.FriendlyFactions.UnionWith(factionData.Friendly);
             ent.Comp.HostileFactions.UnionWith(factionData.Hostile);
         }
+        // Add additional factions if it is written in prototype
+        if (ent.Comp.AddFriendlyFactions != null)
+        {
+            ent.Comp.FriendlyFactions.UnionWith(ent.Comp.AddFriendlyFactions);
+        }
+        if (ent.Comp.AddHostileFactions != null)
+        {
+            ent.Comp.HostileFactions.UnionWith(ent.Comp.AddHostileFactions);
+        }
     }
 
     /// <summary>
diff --git a/Content.Shared/Ninja/Components/BatteryDrainerComponent.cs b/Content.Shared/Ninja/Components/BatteryDrainerComponent.cs
index 55bcdd0f0a5..9c39c4724ce 100644
--- a/Content.Shared/Ninja/Components/BatteryDrainerComponent.cs
+++ b/Content.Shared/Ninja/Components/BatteryDrainerComponent.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Ninja.Systems;
 using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Ninja.Components;
 
@@ -7,32 +8,33 @@ namespace Content.Shared.Ninja.Components;
 /// Component for draining power from APCs/substations/SMESes, when ProviderUid is set to a battery cell.
 /// Does not rely on relay, simply being on the user and having BatteryUid set is enough.
 /// </summary>
-[RegisterComponent, Access(typeof(SharedBatteryDrainerSystem))]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(SharedBatteryDrainerSystem))]
 public sealed partial class BatteryDrainerComponent : Component
 {
     /// <summary>
     /// The powercell entity to drain power into.
     /// Determines whether draining is possible.
     /// </summary>
-    [DataField("batteryUid"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField, AutoNetworkedField]
     public EntityUid? BatteryUid;
 
     /// <summary>
     /// Conversion rate between joules in a device and joules added to battery.
     /// Should be very low since powercells store nothing compared to even an APC.
     /// </summary>
-    [DataField("drainEfficiency"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float DrainEfficiency = 0.001f;
 
     /// <summary>
     /// Time that the do after takes to drain charge from a battery, in seconds
     /// </summary>
-    [DataField("drainTime"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float DrainTime = 1f;
 
     /// <summary>
     /// Sound played after the doafter ends.
     /// </summary>
-    [DataField("sparkSound")]
+    [DataField]
     public SoundSpecifier SparkSound = new SoundCollectionSpecifier("sparks");
 }
diff --git a/Content.Shared/Ninja/Components/BombingTargetComponent.cs b/Content.Shared/Ninja/Components/BombingTargetComponent.cs
index bf0eaec84be..c429eb6880e 100644
--- a/Content.Shared/Ninja/Components/BombingTargetComponent.cs
+++ b/Content.Shared/Ninja/Components/BombingTargetComponent.cs
@@ -4,6 +4,4 @@ namespace Content.Shared.Ninja.Components;
 /// Makes this warp point a valid bombing target for ninja's spider charge.
 /// </summary>
 [RegisterComponent]
-public sealed partial class BombingTargetComponent : Component
-{
-}
+public sealed partial class BombingTargetComponent : Component;
diff --git a/Content.Shared/Ninja/Components/DashAbilityComponent.cs b/Content.Shared/Ninja/Components/DashAbilityComponent.cs
index ba4060c7035..464f48f187e 100644
--- a/Content.Shared/Ninja/Components/DashAbilityComponent.cs
+++ b/Content.Shared/Ninja/Components/DashAbilityComponent.cs
@@ -8,6 +8,7 @@ namespace Content.Shared.Ninja.Components;
 
 /// <summary>
 /// Adds an action to dash, teleport to clicked position, when this item is held.
+/// Cancel <see cref="CheckDashEvent"/> to prevent using it.
 /// </summary>
 [RegisterComponent, NetworkedComponent, Access(typeof(DashAbilitySystem)), AutoGenerateComponentState]
 public sealed partial class DashAbilityComponent : Component
@@ -16,19 +17,10 @@ public sealed partial class DashAbilityComponent : Component
     /// The action id for dashing.
     /// </summary>
     [DataField]
-    public EntProtoId DashAction = "ActionEnergyKatanaDash";
+    public EntProtoId<WorldTargetActionComponent> DashAction = "ActionEnergyKatanaDash";
 
     [DataField, AutoNetworkedField]
     public EntityUid? DashActionEntity;
-
-    /// <summary>
-    /// Sound played when using dash action.
-    /// </summary>
-    [DataField("blinkSound"), ViewVariables(VVAccess.ReadWrite)]
-    public SoundSpecifier BlinkSound = new SoundPathSpecifier("/Audio/Magic/blink.ogg")
-    {
-        Params = AudioParams.Default.WithVolume(5f)
-    };
 }
 
-public sealed partial class DashEvent : WorldTargetActionEvent { }
+public sealed partial class DashEvent : WorldTargetActionEvent;
diff --git a/Content.Shared/Ninja/Components/EmagProviderComponent.cs b/Content.Shared/Ninja/Components/EmagProviderComponent.cs
index db7678f61d7..ae3e85cbe42 100644
--- a/Content.Shared/Ninja/Components/EmagProviderComponent.cs
+++ b/Content.Shared/Ninja/Components/EmagProviderComponent.cs
@@ -2,7 +2,7 @@
 using Content.Shared.Tag;
 using Content.Shared.Whitelist;
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Ninja.Components;
 
@@ -10,19 +10,18 @@ namespace Content.Shared.Ninja.Components;
 /// Component for emagging things on click.
 /// No charges but checks against a whitelist.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-[Access(typeof(EmagProviderSystem))]
+[RegisterComponent, NetworkedComponent, Access(typeof(EmagProviderSystem))]
 public sealed partial class EmagProviderComponent : Component
 {
     /// <summary>
     /// The tag that marks an entity as immune to emagging.
     /// </summary>
-    [DataField("emagImmuneTag", customTypeSerializer: typeof(PrototypeIdSerializer<TagPrototype>))]
-    public string EmagImmuneTag = "EmagImmune";
+    [DataField]
+    public ProtoId<TagPrototype> EmagImmuneTag = "EmagImmune";
 
     /// <summary>
     /// Whitelist that entities must be on to work.
     /// </summary>
-    [DataField("whitelist"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
-    public EntityWhitelist? Whitelist = null;
+    [DataField]
+    public EntityWhitelist? Whitelist;
 }
diff --git a/Content.Shared/Ninja/Components/EnergyKatanaComponent.cs b/Content.Shared/Ninja/Components/EnergyKatanaComponent.cs
index 33b8fc78933..84c58bb6480 100644
--- a/Content.Shared/Ninja/Components/EnergyKatanaComponent.cs
+++ b/Content.Shared/Ninja/Components/EnergyKatanaComponent.cs
@@ -7,6 +7,4 @@ namespace Content.Shared.Ninja.Components;
 /// Requires a ninja with a suit for abilities to work.
 /// </summary>
 [RegisterComponent, NetworkedComponent]
-public sealed partial class EnergyKatanaComponent : Component
-{
-}
+public sealed partial class EnergyKatanaComponent : Component;
diff --git a/Content.Shared/Ninja/Components/ItemCreatorComponent.cs b/Content.Shared/Ninja/Components/ItemCreatorComponent.cs
new file mode 100644
index 00000000000..d9f66d21a31
--- /dev/null
+++ b/Content.Shared/Ninja/Components/ItemCreatorComponent.cs
@@ -0,0 +1,52 @@
+using Content.Shared.Actions;
+using Content.Shared.Ninja.Systems;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Ninja.Components;
+
+/// <summary>
+/// Uses battery charge to spawn an item and place it in the user's hands.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(SharedItemCreatorSystem))]
+public sealed partial class ItemCreatorComponent : Component
+{
+    /// <summary>
+    /// The battery entity to use charge from
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityUid? Battery;
+
+    /// <summary>
+    /// The action id for creating an item.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId<InstantActionComponent> Action = string.Empty;
+
+    [DataField, AutoNetworkedField]
+    public EntityUid? ActionEntity;
+
+    /// <summary>
+    /// Battery charge used to create an item.
+    /// </summary>
+    [DataField(required: true)]
+    public float Charge = 14.4f;
+
+    /// <summary>
+    /// Item to create with the action
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId SpawnedPrototype = string.Empty;
+
+    /// <summary>
+    /// Popup shown to the user when there isn't enough power to create an item.
+    /// </summary>
+    [DataField(required: true)]
+    public LocId NoPowerPopup = string.Empty;
+}
+
+/// <summary>
+/// Action event to use an <see cref="ItemCreator"/>.
+/// </summary>
+public sealed partial class CreateItemEvent : InstantActionEvent;
diff --git a/Content.Shared/Ninja/Components/NinjaGlovesComponent.cs b/Content.Shared/Ninja/Components/NinjaGlovesComponent.cs
index 7b57926330b..3b9e2a5e356 100644
--- a/Content.Shared/Ninja/Components/NinjaGlovesComponent.cs
+++ b/Content.Shared/Ninja/Components/NinjaGlovesComponent.cs
@@ -1,20 +1,17 @@
-using Content.Shared.DoAfter;
 using Content.Shared.Ninja.Systems;
-using Content.Shared.Toggleable;
-using Content.Shared.Whitelist;
+using Content.Shared.Objectives.Components;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Utility;
 
 namespace Content.Shared.Ninja.Components;
 
 /// <summary>
 /// Component for toggling glove powers.
-/// Powers being enabled is controlled by User not being null.
 /// </summary>
+/// <remarks>
+/// Requires <c>ItemToggleComponent</c>.
+/// </remarks>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 [Access(typeof(SharedNinjaGlovesSystem))]
 public sealed partial class NinjaGlovesComponent : Component
@@ -22,24 +19,33 @@ public sealed partial class NinjaGlovesComponent : Component
     /// <summary>
     /// Entity of the ninja using these gloves, usually means enabled
     /// </summary>
-    [DataField("user"), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public EntityUid? User;
 
     /// <summary>
-    /// The action id for toggling ninja gloves abilities
+    /// Abilities to give to the user when enabled.
     /// </summary>
-    [DataField("toggleAction", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string ToggleAction = "ActionToggleNinjaGloves";
+    [DataField(required: true)]
+    public List<NinjaGloveAbility> Abilities = new();
+}
 
-    [DataField, AutoNetworkedField]
-    public EntityUid? ToggleActionEntity;
+/// <summary>
+/// An ability that adds components to the user when the gloves are enabled.
+/// </summary>
+[DataRecord]
+public record struct NinjaGloveAbility()
+{
+    /// <summary>
+    /// If not null, checks if an objective with this prototype has been completed.
+    /// If it has, the ability components are skipped to prevent doing the objective twice.
+    /// The objective must have <c>CodeConditionComponent</c> to be checked.
+    /// </summary>
+    [DataField]
+    public EntProtoId<ObjectiveComponent>? Objective;
 
     /// <summary>
-    /// The whitelist used for the emag provider to emag airlocks only (not regular doors).
+    /// Components to add and remove.
     /// </summary>
-    [DataField("doorjackWhitelist")]
-    public EntityWhitelist DoorjackWhitelist = new()
-    {
-        Components = new[] {"Airlock"}
-    };
+    [DataField(required: true)]
+    public ComponentRegistry Components = new();
 }
diff --git a/Content.Shared/Ninja/Components/NinjaSuitComponent.cs b/Content.Shared/Ninja/Components/NinjaSuitComponent.cs
index 7e7b1ffcd30..8b477b2aa5f 100644
--- a/Content.Shared/Ninja/Components/NinjaSuitComponent.cs
+++ b/Content.Shared/Ninja/Components/NinjaSuitComponent.cs
@@ -3,9 +3,6 @@
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Ninja.Components;
@@ -14,68 +11,27 @@ namespace Content.Shared.Ninja.Components;
 /// Component for ninja suit abilities and power consumption.
 /// As an implementation detail, dashing with katana is a suit action which isn't ideal.
 /// </summary>
-[RegisterComponent, NetworkedComponent, Access(typeof(SharedNinjaSuitSystem)), AutoGenerateComponentState]
-[AutoGenerateComponentPause]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(SharedNinjaSuitSystem))]
 public sealed partial class NinjaSuitComponent : Component
 {
-    /// <summary>
-    /// Battery charge used passively, in watts. Will last 1000 seconds on a small-capacity power cell.
-    /// </summary>
-    [DataField("passiveWattage")]
-    public float PassiveWattage = 0.36f;
-
-    /// <summary>
-    /// Battery charge used while cloaked, stacks with passive. Will last 200 seconds while cloaked on a small-capacity power cell.
-    /// </summary>
-    [DataField("cloakWattage")]
-    public float CloakWattage = 1.44f;
-
     /// <summary>
     /// Sound played when a ninja is hit while cloaked.
     /// </summary>
-    [DataField("revealSound")]
+    [DataField]
     public SoundSpecifier RevealSound = new SoundPathSpecifier("/Audio/Effects/chime.ogg");
 
     /// <summary>
-    /// How long to disable all abilities when revealed.
-    /// Normally, ninjas are revealed when attacking or getting damaged.
-    /// </summary>
-    [DataField("disableTime")]
-    public TimeSpan DisableTime = TimeSpan.FromSeconds(5);
-
-    /// <summary>
-    /// Time at which we will be able to use our abilities again
+    /// ID of the use delay to disable all ninja abilities.
     /// </summary>
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
-    [AutoPausedField]
-    public TimeSpan DisableCooldown;
-
-    /// <summary>
-    /// The action id for creating throwing stars.
-    /// </summary>
-    [DataField("createThrowingStarAction", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string CreateThrowingStarAction = "ActionCreateThrowingStar";
-
-    [DataField, AutoNetworkedField]
-    public EntityUid? CreateThrowingStarActionEntity;
-
-    /// <summary>
-    /// Battery charge used to create a throwing star. Can do it 25 times on a small-capacity power cell.
-    /// </summary>
-    [DataField("throwingStarCharge")]
-    public float ThrowingStarCharge = 14.4f;
-
-    /// <summary>
-    /// Throwing star item to create with the action
-    /// </summary>
-    [DataField("throwingStarPrototype", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string ThrowingStarPrototype = "ThrowingStarNinja";
+    [DataField]
+    public string DisableDelayId = "suit_powers";
 
     /// <summary>
     /// The action id for recalling a bound energy katana
     /// </summary>
-    [DataField("recallKatanaAction", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string RecallKatanaAction = "ActionRecallKatana";
+    [DataField]
+    public EntProtoId RecallKatanaAction = "ActionRecallKatana";
 
     [DataField, AutoNetworkedField]
     public EntityUid? RecallKatanaActionEntity;
@@ -84,14 +40,14 @@ public sealed partial class NinjaSuitComponent : Component
     /// Battery charge used per tile the katana teleported.
     /// Uses 1% of a default battery per tile.
     /// </summary>
-    [DataField("recallCharge")]
+    [DataField]
     public float RecallCharge = 3.6f;
 
     /// <summary>
     /// The action id for creating an EMP burst
     /// </summary>
-    [DataField("empAction", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string EmpAction = "ActionNinjaEmp";
+    [DataField]
+    public EntProtoId EmpAction = "ActionNinjaEmp";
 
     [DataField, AutoNetworkedField]
     public EntityUid? EmpActionEntity;
@@ -99,36 +55,29 @@ public sealed partial class NinjaSuitComponent : Component
     /// <summary>
     /// Battery charge used to create an EMP burst. Can do it 2 times on a small-capacity power cell.
     /// </summary>
-    [DataField("empCharge")]
+    [DataField]
     public float EmpCharge = 180f;
 
+    // TODO: EmpOnTrigger bruh
     /// <summary>
     /// Range of the EMP in tiles.
     /// </summary>
-    [DataField("empRange")]
+    [DataField]
     public float EmpRange = 6f;
 
     /// <summary>
     /// Power consumed from batteries by the EMP
     /// </summary>
-    [DataField("empConsumption")]
+    [DataField]
     public float EmpConsumption = 100000f;
 
     /// <summary>
     /// How long the EMP effects last for, in seconds
     /// </summary>
-    [DataField("empDuration")]
+    [DataField]
     public float EmpDuration = 60f;
 }
 
-public sealed partial class CreateThrowingStarEvent : InstantActionEvent
-{
-}
-
-public sealed partial class RecallKatanaEvent : InstantActionEvent
-{
-}
+public sealed partial class RecallKatanaEvent : InstantActionEvent;
 
-public sealed partial class NinjaEmpEvent : InstantActionEvent
-{
-}
+public sealed partial class NinjaEmpEvent : InstantActionEvent;
diff --git a/Content.Shared/Ninja/Components/SpaceNinjaComponent.cs b/Content.Shared/Ninja/Components/SpaceNinjaComponent.cs
index 91c816df5c9..a19537be1c8 100644
--- a/Content.Shared/Ninja/Components/SpaceNinjaComponent.cs
+++ b/Content.Shared/Ninja/Components/SpaceNinjaComponent.cs
@@ -7,34 +7,28 @@ namespace Content.Shared.Ninja.Components;
 
 /// <summary>
 /// Component placed on a mob to make it a space ninja, able to use suit and glove powers.
-/// Contains ids of all ninja equipment and the game rule.
+/// Contains ids of all ninja equipment.
 /// </summary>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 [Access(typeof(SharedSpaceNinjaSystem))]
 public sealed partial class SpaceNinjaComponent : Component
 {
-    /// <summary>
-    /// The ninja game rule that spawned this ninja.
-    /// </summary>
-    [DataField("rule")]
-    public EntityUid? Rule;
-
     /// <summary>
     /// Currently worn suit
     /// </summary>
-    [DataField("suit"), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public EntityUid? Suit;
 
     /// <summary>
-    /// Currently worn gloves
+    /// Currently worn gloves, if enabled.
     /// </summary>
-    [DataField("gloves"), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public EntityUid? Gloves;
 
     /// <summary>
     /// Bound katana, set once picked up and never removed
     /// </summary>
-    [DataField("katana"), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public EntityUid? Katana;
 
     /// <summary>
@@ -55,6 +49,9 @@ public sealed partial class SpaceNinjaComponent : Component
     [DataField]
     public EntProtoId SpiderChargeObjective = "SpiderChargeObjective";
 
+    /// <summary>
+    /// Alert to show for suit power.
+    /// </summary>
     [DataField]
     public ProtoId<AlertPrototype> SuitPowerAlert = "SuitPower";
 }
diff --git a/Content.Shared/Ninja/Components/SpiderChargeComponent.cs b/Content.Shared/Ninja/Components/SpiderChargeComponent.cs
index dacf47bb235..3ba4494cca4 100644
--- a/Content.Shared/Ninja/Components/SpiderChargeComponent.cs
+++ b/Content.Shared/Ninja/Components/SpiderChargeComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Ninja.Systems;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.Ninja.Components;
@@ -6,14 +7,14 @@ namespace Content.Shared.Ninja.Components;
 /// Component for the Space Ninja's unique Spider Charge.
 /// Only this component detonating can trigger the ninja's objective.
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedSpiderChargeSystem))]
 public sealed partial class SpiderChargeComponent : Component
 {
     /// Range for planting within the target area
-    [DataField("range")]
+    [DataField]
     public float Range = 10f;
 
     /// The ninja that planted this charge
-    [DataField("planter")]
-    public EntityUid? Planter = null;
+    [DataField]
+    public EntityUid? Planter;
 }
diff --git a/Content.Shared/Ninja/Components/StunProviderComponent.cs b/Content.Shared/Ninja/Components/StunProviderComponent.cs
index 37a27074a49..2da094291d7 100644
--- a/Content.Shared/Ninja/Components/StunProviderComponent.cs
+++ b/Content.Shared/Ninja/Components/StunProviderComponent.cs
@@ -3,7 +3,6 @@
 using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Ninja.Components;
 
@@ -11,32 +10,33 @@ namespace Content.Shared.Ninja.Components;
 /// Component for stunning mobs on click outside of harm mode.
 /// Knocks them down for a bit and deals shock damage.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SharedStunProviderSystem))]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(SharedStunProviderSystem))]
 public sealed partial class StunProviderComponent : Component
 {
     /// <summary>
     /// The powercell entity to take power from.
     /// Determines whether stunning is possible.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public EntityUid? BatteryUid;
 
     /// <summary>
     /// Sound played when stunning someone.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public SoundSpecifier Sound = new SoundCollectionSpecifier("sparks");
 
     /// <summary>
     /// Joules required in the battery to stun someone. Defaults to 10 uses on a small battery.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float StunCharge = 36f;
 
     /// <summary>
     /// Damage dealt when stunning someone
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public DamageSpecifier StunDamage = new()
     {
         DamageDict = new()
@@ -48,34 +48,30 @@ public sealed partial class StunProviderComponent : Component
     /// <summary>
     /// Time that someone is stunned for, stacks if done multiple times.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public TimeSpan StunTime = TimeSpan.FromSeconds(5);
 
     /// <summary>
     /// How long stunning is disabled after stunning something.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public TimeSpan Cooldown = TimeSpan.FromSeconds(2);
 
     /// <summary>
-    /// Locale string to popup when there is no power
+    /// ID of the cooldown use delay.
     /// </summary>
-    [DataField(required: true), ViewVariables(VVAccess.ReadWrite)]
-    public string NoPowerPopup = string.Empty;
+    [DataField]
+    public string DelayId = "stun_cooldown";
 
     /// <summary>
-    /// Whitelist for what counts as a mob.
+    /// Locale string to popup when there is no power
     /// </summary>
-    [DataField]
-    public EntityWhitelist Whitelist = new()
-    {
-        Components = new[] {"Stamina"}
-    };
+    [DataField(required: true)]
+    public LocId NoPowerPopup = string.Empty;
 
     /// <summary>
-    /// When someone can next be stunned.
-    /// Essentially a UseDelay unique to this component.
+    /// Whitelist for what counts as a mob.
     /// </summary>
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
-    public TimeSpan NextStun = TimeSpan.Zero;
+    [DataField(required: true)]
+    public EntityWhitelist Whitelist = new();
 }
diff --git a/Content.Shared/Ninja/Systems/DashAbilitySystem.cs b/Content.Shared/Ninja/Systems/DashAbilitySystem.cs
index 4853968b61f..09be1085058 100644
--- a/Content.Shared/Ninja/Systems/DashAbilitySystem.cs
+++ b/Content.Shared/Ninja/Systems/DashAbilitySystem.cs
@@ -16,55 +16,47 @@ namespace Content.Shared.Ninja.Systems;
 /// </summary>
 public sealed class DashAbilitySystem : EntitySystem
 {
+    [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedChargesSystem _charges = default!;
     [Dependency] private readonly SharedHandsSystem _hands = default!;
     [Dependency] private readonly ExamineSystemShared _examine = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
-    [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<DashAbilityComponent, GetItemActionsEvent>(OnGetItemActions);
+        SubscribeLocalEvent<DashAbilityComponent, GetItemActionsEvent>(OnGetActions);
         SubscribeLocalEvent<DashAbilityComponent, DashEvent>(OnDash);
         SubscribeLocalEvent<DashAbilityComponent, MapInitEvent>(OnMapInit);
     }
 
-    private void OnMapInit(EntityUid uid, DashAbilityComponent component, MapInitEvent args)
+    private void OnMapInit(Entity<DashAbilityComponent> ent, ref MapInitEvent args)
     {
-        _actionContainer.EnsureAction(uid, ref component.DashActionEntity, component.DashAction);
-        Dirty(uid, component);
+        var (uid, comp) = ent;
+        _actionContainer.EnsureAction(uid, ref comp.DashActionEntity, comp.DashAction);
+        Dirty(uid, comp);
     }
 
-    private void OnGetItemActions(EntityUid uid, DashAbilityComponent comp, GetItemActionsEvent args)
+    private void OnGetActions(Entity<DashAbilityComponent> ent, ref GetItemActionsEvent args)
     {
-        var ev = new AddDashActionEvent(args.User);
-        RaiseLocalEvent(uid, ev);
-
-        if (ev.Cancelled)
-            return;
-
-        args.AddAction(ref comp.DashActionEntity, comp.DashAction);
+        if (CheckDash(ent, args.User))
+            args.AddAction(ent.Comp.DashActionEntity);
     }
 
     /// <summary>
     /// Handle charges and teleport to a visible location.
     /// </summary>
-    private void OnDash(EntityUid uid, DashAbilityComponent comp, DashEvent args)
+    private void OnDash(Entity<DashAbilityComponent> ent, ref DashEvent args)
     {
         if (!_timing.IsFirstTimePredicted)
             return;
 
+        var (uid, comp) = ent;
         var user = args.Performer;
-        args.Handled = true;
-
-        var ev = new DashAttemptEvent(user);
-        RaiseLocalEvent(uid, ev);
-        if (ev.Cancelled)
+        if (!CheckDash(uid, user))
             return;
 
         if (!_hands.IsHolding(user, uid, out var _))
@@ -73,15 +65,8 @@ private void OnDash(EntityUid uid, DashAbilityComponent comp, DashEvent args)
             return;
         }
 
-        TryComp<LimitedChargesComponent>(uid, out var charges);
-        if (_charges.IsEmpty(uid, charges))
-        {
-            _popup.PopupClient(Loc.GetString("dash-ability-no-charges", ("item", uid)), user, user);
-            return;
-        }
         var origin = _transform.GetMapCoordinates(user);
         var target = args.Target.ToMap(EntityManager, _transform);
-        // prevent collision with the user duh
         if (!_examine.InRangeUnOccluded(origin, target, SharedInteractionSystem.MaxRaycastRange, null))
         {
             // can only dash if the destination is visible on screen
@@ -89,36 +74,28 @@ private void OnDash(EntityUid uid, DashAbilityComponent comp, DashEvent args)
             return;
         }
 
-        _transform.SetCoordinates(user, args.Target);
-        _transform.AttachToGridOrMap(user);
-        _audio.PlayPredicted(comp.BlinkSound, user, user);
-        if (charges != null)
-            _charges.UseCharge(uid, charges);
-    }
-}
+        if (!_charges.TryUseCharge(uid))
+        {
+            _popup.PopupClient(Loc.GetString("dash-ability-no-charges", ("item", uid)), user, user);
+            return;
+        }
 
-/// <summary>
-/// Raised on the item before adding the dash action
-/// </summary>
-public sealed class AddDashActionEvent : CancellableEntityEventArgs
-{
-    public EntityUid User;
+        var xform = Transform(user);
+        _transform.SetCoordinates(user, xform, args.Target);
+        _transform.AttachToGridOrMap(user, xform);
+        args.Handled = true;
+    }
 
-    public AddDashActionEvent(EntityUid user)
+    public bool CheckDash(EntityUid uid, EntityUid user)
     {
-        User = user;
+        var ev = new CheckDashEvent(user);
+        RaiseLocalEvent(uid, ref ev);
+        return !ev.Cancelled;
     }
 }
 
 /// <summary>
-/// Raised on the item before dashing is done.
+/// Raised on the item before adding the dash action and when using the action.
 /// </summary>
-public sealed class DashAttemptEvent : CancellableEntityEventArgs
-{
-    public EntityUid User;
-
-    public DashAttemptEvent(EntityUid user)
-    {
-        User = user;
-    }
-}
+[ByRefEvent]
+public record struct CheckDashEvent(EntityUid User, bool Cancelled = false);
diff --git a/Content.Shared/Ninja/Systems/EmagProviderSystem.cs b/Content.Shared/Ninja/Systems/EmagProviderSystem.cs
index 6838e7982cb..ae0bacaf5f6 100644
--- a/Content.Shared/Ninja/Systems/EmagProviderSystem.cs
+++ b/Content.Shared/Ninja/Systems/EmagProviderSystem.cs
@@ -1,6 +1,6 @@
 using Content.Shared.Administration.Logs;
-using Content.Shared.Emag.Systems;
 using Content.Shared.Database;
+using Content.Shared.Emag.Systems;
 using Content.Shared.Interaction;
 using Content.Shared.Ninja.Components;
 using Content.Shared.Tag;
@@ -14,10 +14,10 @@ namespace Content.Shared.Ninja.Systems;
 public sealed class EmagProviderSystem : EntitySystem
 {
     [Dependency] private readonly EmagSystem _emag = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
     [Dependency] private readonly SharedNinjaGlovesSystem _gloves = default!;
-    [Dependency] private readonly TagSystem _tags = default!;
-    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+    [Dependency] private readonly TagSystem _tag = default!;
 
     public override void Initialize()
     {
@@ -29,18 +29,20 @@ public override void Initialize()
     /// <summary>
     /// Emag clicked entities that are on the whitelist.
     /// </summary>
-    private void OnBeforeInteractHand(EntityUid uid, EmagProviderComponent comp, BeforeInteractHandEvent args)
+    private void OnBeforeInteractHand(Entity<EmagProviderComponent> ent, ref BeforeInteractHandEvent args)
     {
         // TODO: change this into a generic check event thing
-        if (args.Handled || !_gloves.AbilityCheck(uid, args, out var target))
+        if (args.Handled || !_gloves.AbilityCheck(ent, args, out var target))
             return;
 
+        var (uid, comp) = ent;
+
         // only allowed to emag entities on the whitelist
-        if (_whitelistSystem.IsWhitelistFail(comp.Whitelist, target))
+        if (_whitelist.IsWhitelistFail(comp.Whitelist, target))
             return;
 
         // only allowed to emag non-immune entities
-        if (_tags.HasTag(target, comp.EmagImmuneTag))
+        if (_tag.HasTag(target, comp.EmagImmuneTag))
             return;
 
         var handled = _emag.DoEmagEffect(uid, target);
@@ -52,18 +54,6 @@ private void OnBeforeInteractHand(EntityUid uid, EmagProviderComponent comp, Bef
         RaiseLocalEvent(uid, ref ev);
         args.Handled = true;
     }
-
-    /// <summary>
-    /// Set the whitelist for emagging something outside of yaml.
-    /// </summary>
-    public void SetWhitelist(EntityUid uid, EntityWhitelist? whitelist, EmagProviderComponent? comp = null)
-    {
-        if (!Resolve(uid, ref comp))
-            return;
-
-        comp.Whitelist = whitelist;
-        Dirty(uid, comp);
-    }
 }
 
 /// <summary>
diff --git a/Content.Shared/Ninja/Systems/EnergyKatanaSystem.cs b/Content.Shared/Ninja/Systems/EnergyKatanaSystem.cs
index d427ffa39b4..281b97a648a 100644
--- a/Content.Shared/Ninja/Systems/EnergyKatanaSystem.cs
+++ b/Content.Shared/Ninja/Systems/EnergyKatanaSystem.cs
@@ -15,33 +15,20 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<EnergyKatanaComponent, GotEquippedEvent>(OnEquipped);
-        SubscribeLocalEvent<EnergyKatanaComponent, AddDashActionEvent>(OnAddDashAction);
-        SubscribeLocalEvent<EnergyKatanaComponent, DashAttemptEvent>(OnDashAttempt);
+        SubscribeLocalEvent<EnergyKatanaComponent, CheckDashEvent>(OnCheckDash);
     }
 
     /// <summary>
     /// When equipped by a ninja, try to bind it.
     /// </summary>
-    private void OnEquipped(EntityUid uid, EnergyKatanaComponent comp, GotEquippedEvent args)
+    private void OnEquipped(Entity<EnergyKatanaComponent> ent, ref GotEquippedEvent args)
     {
-        // check if user isnt a ninja or already has a katana bound
-        var user = args.Equipee;
-        if (!TryComp<SpaceNinjaComponent>(user, out var ninja) || ninja.Katana != null)
-            return;
-
-        // bind it since its unbound
-        _ninja.BindKatana(user, uid, ninja);
-    }
-
-    private void OnAddDashAction(EntityUid uid, EnergyKatanaComponent comp, AddDashActionEvent args)
-    {
-        if (!HasComp<SpaceNinjaComponent>(args.User))
-            args.Cancel();
+        _ninja.BindKatana(args.Equipee, ent);
     }
 
-    private void OnDashAttempt(EntityUid uid, EnergyKatanaComponent comp, DashAttemptEvent args)
+    private void OnCheckDash(Entity<EnergyKatanaComponent> ent, ref CheckDashEvent args)
     {
-        if (!TryComp<SpaceNinjaComponent>(args.User, out var ninja) || ninja.Katana != uid)
-            args.Cancel();
+        if (!_ninja.IsNinja(args.User))
+            args.Cancelled = true;
     }
 }
diff --git a/Content.Shared/Ninja/Systems/ItemCreatorSystem.cs b/Content.Shared/Ninja/Systems/ItemCreatorSystem.cs
new file mode 100644
index 00000000000..56112e9a697
--- /dev/null
+++ b/Content.Shared/Ninja/Systems/ItemCreatorSystem.cs
@@ -0,0 +1,56 @@
+using Content.Shared.Actions;
+using Content.Shared.Ninja.Components;
+
+namespace Content.Shared.Ninja.Systems;
+
+/// <summary>
+/// Handles predicting that the action exists, creating items is done serverside.
+/// </summary>
+public abstract class SharedItemCreatorSystem : EntitySystem
+{
+    [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ItemCreatorComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<ItemCreatorComponent, GetItemActionsEvent>(OnGetActions);
+    }
+
+    private void OnMapInit(Entity<ItemCreatorComponent> ent, ref MapInitEvent args)
+    {
+        var (uid, comp) = ent;
+        // test funny dont mind me
+        if (string.IsNullOrEmpty(comp.Action))
+            return;
+
+        _actionContainer.EnsureAction(uid, ref comp.ActionEntity, comp.Action);
+        Dirty(uid, comp);
+    }
+
+    private void OnGetActions(Entity<ItemCreatorComponent> ent, ref GetItemActionsEvent args)
+    {
+        if (CheckItemCreator(ent, args.User))
+            args.AddAction(ent.Comp.ActionEntity);
+    }
+
+    public bool CheckItemCreator(EntityUid uid, EntityUid user)
+    {
+        var ev = new CheckItemCreatorEvent(user);
+        RaiseLocalEvent(uid, ref ev);
+        return !ev.Cancelled;
+    }
+}
+
+/// <summary>
+/// Raised on the item creator before adding the action.
+/// </summary>
+[ByRefEvent]
+public record struct CheckItemCreatorEvent(EntityUid User, bool Cancelled = false);
+
+/// <summary>
+/// Raised on the item creator before creating an item.
+/// </summary>
+[ByRefEvent]
+public record struct CreateItemAttemptEvent(EntityUid User, bool Cancelled = false);
diff --git a/Content.Shared/Ninja/Systems/SharedBatteryDrainerSystem.cs b/Content.Shared/Ninja/Systems/SharedBatteryDrainerSystem.cs
index ac11063eb71..0abcca7d1bd 100644
--- a/Content.Shared/Ninja/Systems/SharedBatteryDrainerSystem.cs
+++ b/Content.Shared/Ninja/Systems/SharedBatteryDrainerSystem.cs
@@ -18,34 +18,32 @@ public override void Initialize()
     }
 
     /// <summary>
-    /// Cancel any drain doafters if the battery is removed or gets filled.
+    /// Cancel any drain doafters if the battery is removed or, on the server, gets filled.
     /// </summary>
-    protected virtual void OnDoAfterAttempt(EntityUid uid, BatteryDrainerComponent comp, DoAfterAttemptEvent<DrainDoAfterEvent> args)
+    protected virtual void OnDoAfterAttempt(Entity<BatteryDrainerComponent> ent, ref DoAfterAttemptEvent<DrainDoAfterEvent> args)
     {
-        if (comp.BatteryUid == null)
-        {
+        if (ent.Comp.BatteryUid == null)
             args.Cancel();
-        }
     }
 
     /// <summary>
     /// Drain power from a power source (on server) and repeat if it succeeded.
     /// Client will predict always succeeding since power is serverside.
     /// </summary>
-    private void OnDoAfter(EntityUid uid, BatteryDrainerComponent comp, DrainDoAfterEvent args)
+    private void OnDoAfter(Entity<BatteryDrainerComponent> ent, ref DrainDoAfterEvent args)
     {
-        if (args.Cancelled || args.Handled || args.Target == null)
+        if (args.Cancelled || args.Handled || args.Target is not {} target)
             return;
 
         // repeat if there is still power to drain
-        args.Repeat = TryDrainPower(uid, comp, args.Target.Value);
+        args.Repeat = TryDrainPower(ent, target);
     }
 
     /// <summary>
     /// Attempt to drain as much power as possible into the powercell.
     /// Client always predicts this as succeeding since power is serverside and it can only fail once, when the powercell is filled or the target is emptied.
     /// </summary>
-    protected virtual bool TryDrainPower(EntityUid uid, BatteryDrainerComponent comp, EntityUid target)
+    protected virtual bool TryDrainPower(Entity<BatteryDrainerComponent> ent, EntityUid target)
     {
         return true;
     }
@@ -53,12 +51,13 @@ protected virtual bool TryDrainPower(EntityUid uid, BatteryDrainerComponent comp
     /// <summary>
     /// Sets the battery field on the drainer.
     /// </summary>
-    public void SetBattery(EntityUid uid, EntityUid? battery, BatteryDrainerComponent? comp = null)
+    public void SetBattery(Entity<BatteryDrainerComponent?> ent, EntityUid? battery)
     {
-        if (!Resolve(uid, ref comp))
+        if (!Resolve(ent, ref ent.Comp) || ent.Comp.BatteryUid == battery)
             return;
 
-        comp.BatteryUid = battery;
+        ent.Comp.BatteryUid = battery;
+        Dirty(ent, ent.Comp);
     }
 }
 
@@ -66,4 +65,4 @@ public void SetBattery(EntityUid uid, EntityUid? battery, BatteryDrainerComponen
 /// DoAfter event for <see cref="BatteryDrainerComponent"/>.
 /// </summary>
 [Serializable, NetSerializable]
-public sealed partial class DrainDoAfterEvent : SimpleDoAfterEvent { }
+public sealed partial class DrainDoAfterEvent : SimpleDoAfterEvent;
diff --git a/Content.Shared/Ninja/Systems/SharedNinjaGlovesSystem.cs b/Content.Shared/Ninja/Systems/SharedNinjaGlovesSystem.cs
index f61d0c6a908..8b892190b7b 100644
--- a/Content.Shared/Ninja/Systems/SharedNinjaGlovesSystem.cs
+++ b/Content.Shared/Ninja/Systems/SharedNinjaGlovesSystem.cs
@@ -1,15 +1,13 @@
-using Content.Shared.Actions;
+using Content.Shared.Clothing.Components;
 using Content.Shared.CombatMode;
-using Content.Shared.Communications;
-using Content.Shared.CriminalRecords.Components;
 using Content.Shared.Examine;
 using Content.Shared.Hands.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Inventory.Events;
+using Content.Shared.Item.ItemToggle;
+using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.Ninja.Components;
 using Content.Shared.Popups;
-using Content.Shared.Research.Components;
-using Content.Shared.Toggleable;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.Ninja.Systems;
@@ -20,85 +18,105 @@ namespace Content.Shared.Ninja.Systems;
 public abstract class SharedNinjaGlovesSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
     [Dependency] private readonly SharedCombatModeSystem _combatMode = default!;
-    [Dependency] protected readonly SharedInteractionSystem Interaction = default!;
-    [Dependency] protected readonly SharedPopupSystem Popup = default!;
-    [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
+    [Dependency] private readonly SharedInteractionSystem _interaction = default!;
+    [Dependency] private readonly ItemToggleSystem _toggle = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedSpaceNinjaSystem _ninja = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<NinjaGlovesComponent, GetItemActionsEvent>(OnGetItemActions);
+        SubscribeLocalEvent<NinjaGlovesComponent, ToggleClothingCheckEvent>(OnToggleCheck);
+        SubscribeLocalEvent<NinjaGlovesComponent, ItemToggleActivateAttemptEvent>(OnActivateAttempt);
+        SubscribeLocalEvent<NinjaGlovesComponent, ItemToggledEvent>(OnToggled);
         SubscribeLocalEvent<NinjaGlovesComponent, ExaminedEvent>(OnExamined);
-        SubscribeLocalEvent<NinjaGlovesComponent, GotUnequippedEvent>(OnUnequipped);
-        SubscribeLocalEvent<NinjaGlovesComponent, MapInitEvent>(OnMapInit);
-    }
-
-    private void OnMapInit(EntityUid uid, NinjaGlovesComponent component, MapInitEvent args)
-    {
-        _actionContainer.EnsureAction(uid, ref component.ToggleActionEntity, component.ToggleAction);
-        Dirty(uid, component);
     }
 
     /// <summary>
     /// Disable glove abilities and show the popup if they were enabled previously.
     /// </summary>
-    public void DisableGloves(EntityUid uid, NinjaGlovesComponent? comp = null)
+    private void DisableGloves(Entity<NinjaGlovesComponent> ent)
     {
+        var (uid, comp) = ent;
+
         // already disabled?
-        if (!Resolve(uid, ref comp) || comp.User == null)
+        if (comp.User is not {} user)
             return;
 
-        var user = comp.User.Value;
         comp.User = null;
         Dirty(uid, comp);
 
-        Appearance.SetData(uid, ToggleVisuals.Toggled, false);
-        Popup.PopupClient(Loc.GetString("ninja-gloves-off"), user, user);
-
-        RemComp<BatteryDrainerComponent>(user);
-        RemComp<EmagProviderComponent>(user);
-        RemComp<StunProviderComponent>(user);
-        RemComp<ResearchStealerComponent>(user);
-        RemComp<CommsHackerComponent>(user);
-        RemComp<CriminalRecordsHackerComponent>(user);
+        foreach (var ability in comp.Abilities)
+        {
+            EntityManager.RemoveComponents(user, ability.Components);
+        }
     }
 
     /// <summary>
-    /// Adds the toggle action when equipped.
+    /// Adds the toggle action when equipped by a ninja only.
     /// </summary>
-    private void OnGetItemActions(EntityUid uid, NinjaGlovesComponent comp, GetItemActionsEvent args)
+    private void OnToggleCheck(Entity<NinjaGlovesComponent> ent, ref ToggleClothingCheckEvent args)
     {
-        if (HasComp<SpaceNinjaComponent>(args.User))
-            args.AddAction(ref comp.ToggleActionEntity, comp.ToggleAction);
+        if (!_ninja.IsNinja(args.User))
+            args.Cancelled = true;
     }
 
     /// <summary>
     /// Show if the gloves are enabled when examining.
     /// </summary>
-    private void OnExamined(EntityUid uid, NinjaGlovesComponent comp, ExaminedEvent args)
+    private void OnExamined(Entity<NinjaGlovesComponent> ent, ref ExaminedEvent args)
     {
         if (!args.IsInDetailsRange)
             return;
 
-        args.PushText(Loc.GetString(comp.User != null ? "ninja-gloves-examine-on" : "ninja-gloves-examine-off"));
+        var on = _toggle.IsActivated(ent.Owner) ? "on" : "off";
+        args.PushText(Loc.GetString($"ninja-gloves-examine-{on}"));
     }
 
-    /// <summary>
-    /// Disable gloves when unequipped and clean up ninja's gloves reference
-    /// </summary>
-    private void OnUnequipped(EntityUid uid, NinjaGlovesComponent comp, GotUnequippedEvent args)
+    private void OnActivateAttempt(Entity<NinjaGlovesComponent> ent, ref ItemToggleActivateAttemptEvent args)
     {
-        if (comp.User != null)
+        if (args.User is not {} user
+            || !_ninja.NinjaQuery.TryComp(user, out var ninja)
+            // need to wear suit to enable gloves
+            || !HasComp<NinjaSuitComponent>(ninja.Suit))
         {
-            var user = comp.User.Value;
-            Popup.PopupClient(Loc.GetString("ninja-gloves-off"), user, user);
-            DisableGloves(uid, comp);
+            args.Cancelled = true;
+            args.Popup = Loc.GetString("ninja-gloves-not-wearing-suit");
+            return;
         }
     }
 
+    private void OnToggled(Entity<NinjaGlovesComponent> ent, ref ItemToggledEvent args)
+    {
+        if ((args.User ?? ent.Comp.User) is not {} user)
+            return;
+
+        var message = Loc.GetString(args.Activated ? "ninja-gloves-on" : "ninja-gloves-off");
+        _popup.PopupClient(message, user, user);
+
+        if (args.Activated && _ninja.NinjaQuery.TryComp(user, out var ninja))
+            EnableGloves(ent, (user, ninja));
+        else
+            DisableGloves(ent);
+    }
+
+    protected virtual void EnableGloves(Entity<NinjaGlovesComponent> ent, Entity<SpaceNinjaComponent> user)
+    {
+        var (uid, comp) = ent;
+        comp.User = user;
+        Dirty(uid, comp);
+        _ninja.AssignGloves(user, uid);
+
+        // yeah this is just ComponentToggler but with objective checking
+        foreach (var ability in comp.Abilities)
+        {
+            // can't predict the objective related abilities
+            if (ability.Objective == null)
+                EntityManager.AddComponents(user, ability.Components);
+        }
+    }
 
     // TODO: generic event thing
     /// <summary>
@@ -112,6 +130,6 @@ public bool AbilityCheck(EntityUid uid, BeforeInteractHandEvent args, out Entity
             && !_combatMode.IsInCombatMode(uid)
             && TryComp<HandsComponent>(uid, out var hands)
             && hands.ActiveHandEntity == null
-            && Interaction.InRangeUnobstructed(uid, target);
+            && _interaction.InRangeUnobstructed(uid, target);
     }
 }
diff --git a/Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs b/Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs
index fed41eaed8a..3800d15b267 100644
--- a/Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs
+++ b/Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs
@@ -1,11 +1,14 @@
 using Content.Shared.Actions;
+using Content.Shared.Clothing;
 using Content.Shared.Clothing.Components;
 using Content.Shared.Clothing.EntitySystems;
 using Content.Shared.Inventory.Events;
+using Content.Shared.Item.ItemToggle;
+using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.Ninja.Components;
 using Content.Shared.Popups;
+using Content.Shared.Timing;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Timing;
 
 namespace Content.Shared.Ninja.Systems;
 
@@ -14,137 +17,158 @@ namespace Content.Shared.Ninja.Systems;
 /// </summary>
 public abstract class SharedNinjaSuitSystem : EntitySystem
 {
-    [Dependency] protected readonly IGameTiming GameTiming = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedNinjaGlovesSystem _gloves = default!;
-    [Dependency] private readonly SharedSpaceNinjaSystem _ninja = default!;
     [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly ItemToggleSystem _toggle = default!;
     [Dependency] protected readonly SharedPopupSystem Popup = default!;
-    [Dependency] protected readonly StealthClothingSystem StealthClothing = default!;
+    [Dependency] private readonly SharedSpaceNinjaSystem _ninja = default!;
+    [Dependency] private readonly UseDelaySystem _useDelay = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<NinjaSuitComponent, MapInitEvent>(OnMapInit);
-
-        SubscribeLocalEvent<NinjaSuitComponent, GotEquippedEvent>(OnEquipped);
+        SubscribeLocalEvent<NinjaSuitComponent, ClothingGotEquippedEvent>(OnEquipped);
         SubscribeLocalEvent<NinjaSuitComponent, GetItemActionsEvent>(OnGetItemActions);
-        SubscribeLocalEvent<NinjaSuitComponent, AddStealthActionEvent>(OnAddStealthAction);
+        SubscribeLocalEvent<NinjaSuitComponent, ToggleClothingCheckEvent>(OnCloakCheck);
+        SubscribeLocalEvent<NinjaSuitComponent, CheckItemCreatorEvent>(OnStarCheck);
+        SubscribeLocalEvent<NinjaSuitComponent, CreateItemAttemptEvent>(OnCreateStarAttempt);
+        SubscribeLocalEvent<NinjaSuitComponent, ItemToggleActivateAttemptEvent>(OnActivateAttempt);
         SubscribeLocalEvent<NinjaSuitComponent, GotUnequippedEvent>(OnUnequipped);
     }
 
-    private void OnMapInit(EntityUid uid, NinjaSuitComponent component, MapInitEvent args)
+    private void OnEquipped(Entity<NinjaSuitComponent> ent, ref ClothingGotEquippedEvent args)
     {
-        _actionContainer.EnsureAction(uid, ref component.RecallKatanaActionEntity, component.RecallKatanaAction);
-        _actionContainer.EnsureAction(uid, ref component.CreateThrowingStarActionEntity, component.CreateThrowingStarAction);
-        _actionContainer.EnsureAction(uid, ref component.EmpActionEntity, component.EmpAction);
-        Dirty(uid, component);
+        var user = args.Wearer;
+        if (_ninja.NinjaQuery.TryComp(user, out var ninja))
+            NinjaEquipped(ent, (user, ninja));
     }
 
-    /// <summary>
-    /// Call the shared and serverside code for when a ninja equips the suit.
-    /// </summary>
-    private void OnEquipped(EntityUid uid, NinjaSuitComponent comp, GotEquippedEvent args)
+    protected virtual void NinjaEquipped(Entity<NinjaSuitComponent> ent, Entity<SpaceNinjaComponent> user)
     {
-        var user = args.Equipee;
-        if (!TryComp<SpaceNinjaComponent>(user, out var ninja))
-            return;
+        // mark the user as wearing this suit, used when being attacked among other things
+        _ninja.AssignSuit(user, ent);
+    }
 
-        NinjaEquippedSuit(uid, comp, user, ninja);
+    private void OnMapInit(Entity<NinjaSuitComponent> ent, ref MapInitEvent args)
+    {
+        var (uid, comp) = ent;
+        _actionContainer.EnsureAction(uid, ref comp.RecallKatanaActionEntity, comp.RecallKatanaAction);
+        _actionContainer.EnsureAction(uid, ref comp.EmpActionEntity, comp.EmpAction);
+        Dirty(uid, comp);
     }
 
     /// <summary>
     /// Add all the actions when a suit is equipped by a ninja.
     /// </summary>
-    private void OnGetItemActions(EntityUid uid, NinjaSuitComponent comp, GetItemActionsEvent args)
+    private void OnGetItemActions(Entity<NinjaSuitComponent> ent, ref GetItemActionsEvent args)
     {
-        if (!HasComp<SpaceNinjaComponent>(args.User))
+        if (!_ninja.IsNinja(args.User))
             return;
 
+        var comp = ent.Comp;
         args.AddAction(ref comp.RecallKatanaActionEntity, comp.RecallKatanaAction);
-        args.AddAction(ref comp.CreateThrowingStarActionEntity, comp.CreateThrowingStarAction);
         args.AddAction(ref comp.EmpActionEntity, comp.EmpAction);
     }
 
     /// <summary>
-    /// Only add stealth clothing's toggle action when equipped by a ninja.
+    /// Only add toggle cloak action when equipped by a ninja.
     /// </summary>
-    private void OnAddStealthAction(EntityUid uid, NinjaSuitComponent comp, AddStealthActionEvent args)
+    private void OnCloakCheck(Entity<NinjaSuitComponent> ent, ref ToggleClothingCheckEvent args)
     {
-        if (!HasComp<SpaceNinjaComponent>(args.User))
-            args.Cancel();
+        if (!_ninja.IsNinja(args.User))
+            args.Cancelled = true;
     }
 
-    /// <summary>
-    /// Call the shared and serverside code for when anyone unequips a suit.
-    /// </summary>
-    private void OnUnequipped(EntityUid uid, NinjaSuitComponent comp, GotUnequippedEvent args)
+    private void OnStarCheck(Entity<NinjaSuitComponent> ent, ref CheckItemCreatorEvent args)
+    {
+        if (!_ninja.IsNinja(args.User))
+            args.Cancelled = true;
+    }
+
+    private void OnCreateStarAttempt(Entity<NinjaSuitComponent> ent, ref CreateItemAttemptEvent args)
     {
-        UserUnequippedSuit(uid, comp, args.Equipee);
+        if (CheckDisabled(ent, args.User))
+            args.Cancelled = true;
     }
 
     /// <summary>
-    /// Called when a suit is equipped by a space ninja.
-    /// In the future it might be changed to an explicit activation toggle/verb like gloves are.
+    /// Call the shared and serverside code for when anyone unequips a suit.
     /// </summary>
-    protected virtual void NinjaEquippedSuit(EntityUid uid, NinjaSuitComponent comp, EntityUid user, SpaceNinjaComponent ninja)
+    private void OnUnequipped(Entity<NinjaSuitComponent> ent, ref GotUnequippedEvent args)
     {
-        // mark the user as wearing this suit, used when being attacked among other things
-        _ninja.AssignSuit(user, uid, ninja);
-
-        // initialize phase cloak, but keep it off
-        StealthClothing.SetEnabled(uid, user, false);
+        var user = args.Equipee;
+        if (_ninja.NinjaQuery.TryComp(user, out var ninja))
+            UserUnequippedSuit(ent, (user, ninja));
     }
 
     /// <summary>
     /// Force uncloaks the user and disables suit abilities.
     /// </summary>
-    public void RevealNinja(EntityUid uid, EntityUid user, bool disable = true, NinjaSuitComponent? comp = null, StealthClothingComponent? stealthClothing = null)
+    public void RevealNinja(Entity<NinjaSuitComponent?> ent, EntityUid user, bool disable = true)
     {
-        if (!Resolve(uid, ref comp, ref stealthClothing))
+        if (!Resolve(ent, ref ent.Comp))
             return;
 
-        if (!StealthClothing.SetEnabled(uid, user, false, stealthClothing))
-            return;
-
-        if (!disable)
+        var uid = ent.Owner;
+        var comp = ent.Comp;
+        if (_toggle.TryDeactivate(uid, user) || !disable)
             return;
 
         // previously cloaked, disable abilities for a short time
         _audio.PlayPredicted(comp.RevealSound, uid, user);
         Popup.PopupClient(Loc.GetString("ninja-revealed"), user, user, PopupType.MediumCaution);
-        comp.DisableCooldown = GameTiming.CurTime + comp.DisableTime;
+        _useDelay.TryResetDelay(uid, id: comp.DisableDelayId);
+    }
+
+    private void OnActivateAttempt(Entity<NinjaSuitComponent> ent, ref ItemToggleActivateAttemptEvent args)
+    {
+        if (!_ninja.IsNinja(args.User))
+        {
+            args.Cancelled = true;
+            return;
+        }
+
+        if (IsDisabled((ent, ent.Comp, null)))
+        {
+            args.Cancelled = true;
+            args.Popup = Loc.GetString("ninja-suit-cooldown");
+        }
     }
 
-    // TODO: modify PowerCellDrain
     /// <summary>
-    /// Returns the power used by a suit
+    /// Returns true if the suit is currently disabled
     /// </summary>
-    public float SuitWattage(EntityUid uid, NinjaSuitComponent? suit = null)
+    public bool IsDisabled(Entity<NinjaSuitComponent?, UseDelayComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp1, ref ent.Comp2))
+            return false;
+
+        return _useDelay.IsDelayed((ent, ent.Comp2), ent.Comp1.DisableDelayId);
+    }
+
+    protected bool CheckDisabled(Entity<NinjaSuitComponent> ent, EntityUid user)
     {
-        if (!Resolve(uid, ref suit))
-            return 0f;
+        if (IsDisabled((ent, ent.Comp, null)))
+        {
+            Popup.PopupEntity(Loc.GetString("ninja-suit-cooldown"), user, user, PopupType.Medium);
+            return true;
+        }
 
-        float wattage = suit.PassiveWattage;
-        if (TryComp<StealthClothingComponent>(uid, out var stealthClothing) && stealthClothing.Enabled)
-            wattage += suit.CloakWattage;
-        return wattage;
+        return false;
     }
 
     /// <summary>
     /// Called when a suit is unequipped, not necessarily by a space ninja.
     /// In the future it might be changed to also have explicit deactivation via toggle.
     /// </summary>
-    protected virtual void UserUnequippedSuit(EntityUid uid, NinjaSuitComponent comp, EntityUid user)
+    protected virtual void UserUnequippedSuit(Entity<NinjaSuitComponent> ent, Entity<SpaceNinjaComponent> user)
     {
-        if (!TryComp<SpaceNinjaComponent>(user, out var ninja))
-            return;
-
         // mark the user as not wearing a suit
-        _ninja.AssignSuit(user, null, ninja);
+        _ninja.AssignSuit(user, null);
         // disable glove abilities
-        if (ninja.Gloves != null && TryComp<NinjaGlovesComponent>(ninja.Gloves.Value, out var gloves))
-            _gloves.DisableGloves(ninja.Gloves.Value, gloves);
+        if (user.Comp.Gloves is {} uid)
+            _toggle.TryDeactivate(uid, user: user);
     }
 }
diff --git a/Content.Shared/Ninja/Systems/SharedSpaceNinjaSystem.cs b/Content.Shared/Ninja/Systems/SharedSpaceNinjaSystem.cs
index 522f29fe420..d738f2dd8a2 100644
--- a/Content.Shared/Ninja/Systems/SharedSpaceNinjaSystem.cs
+++ b/Content.Shared/Ninja/Systems/SharedSpaceNinjaSystem.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Weapons.Melee.Events;
 using Content.Shared.Weapons.Ranged.Events;
 using Content.Shared.Popups;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Content.Shared.Ninja.Systems;
 
@@ -14,49 +15,59 @@ public abstract class SharedSpaceNinjaSystem : EntitySystem
     [Dependency] protected readonly SharedNinjaSuitSystem Suit = default!;
     [Dependency] protected readonly SharedPopupSystem Popup = default!;
 
+    public EntityQuery<SpaceNinjaComponent> NinjaQuery;
+
     public override void Initialize()
     {
         base.Initialize();
 
+        NinjaQuery = GetEntityQuery<SpaceNinjaComponent>();
+
         SubscribeLocalEvent<SpaceNinjaComponent, AttackedEvent>(OnNinjaAttacked);
         SubscribeLocalEvent<SpaceNinjaComponent, MeleeAttackEvent>(OnNinjaAttack);
         SubscribeLocalEvent<SpaceNinjaComponent, ShotAttemptedEvent>(OnShotAttempted);
     }
 
+    public bool IsNinja([NotNullWhen(true)] EntityUid? uid)
+    {
+        return NinjaQuery.HasComp(uid);
+    }
+
     /// <summary>
     /// Set the ninja's worn suit entity
     /// </summary>
-    public void AssignSuit(EntityUid uid, EntityUid? suit, SpaceNinjaComponent? comp = null)
+    public void AssignSuit(Entity<SpaceNinjaComponent> ent, EntityUid? suit)
     {
-        if (!Resolve(uid, ref comp) || comp.Suit == suit)
+        if (ent.Comp.Suit == suit)
             return;
 
-        comp.Suit = suit;
-        Dirty(uid, comp);
+        ent.Comp.Suit = suit;
+        Dirty(ent, ent.Comp);
     }
 
     /// <summary>
     /// Set the ninja's worn gloves entity
     /// </summary>
-    public void AssignGloves(EntityUid uid, EntityUid? gloves, SpaceNinjaComponent? comp = null)
+    public void AssignGloves(Entity<SpaceNinjaComponent> ent, EntityUid? gloves)
     {
-        if (!Resolve(uid, ref comp) || comp.Gloves == gloves)
+        if (ent.Comp.Gloves == gloves)
             return;
 
-        comp.Gloves = gloves;
-        Dirty(uid, comp);
+        ent.Comp.Gloves = gloves;
+        Dirty(ent, ent.Comp);
     }
 
     /// <summary>
     /// Bind a katana entity to a ninja, letting it be recalled and dash.
+    /// Does nothing if the player is not a ninja or already has a katana bound.
     /// </summary>
-    public void BindKatana(EntityUid uid, EntityUid? katana, SpaceNinjaComponent? comp = null)
+    public void BindKatana(Entity<SpaceNinjaComponent?> ent, EntityUid katana)
     {
-        if (!Resolve(uid, ref comp) || comp.Katana == katana)
+        if (!NinjaQuery.Resolve(ent, ref ent.Comp) || ent.Comp.Katana != null)
             return;
 
-        comp.Katana = katana;
-        Dirty(uid, comp);
+        ent.Comp.Katana = katana;
+        Dirty(ent, ent.Comp);
     }
 
     /// <summary>
@@ -71,32 +82,32 @@ public virtual bool TryUseCharge(EntityUid user, float charge)
     /// <summary>
     /// Handle revealing ninja if cloaked when attacked.
     /// </summary>
-    private void OnNinjaAttacked(EntityUid uid, SpaceNinjaComponent comp, AttackedEvent args)
+    private void OnNinjaAttacked(Entity<SpaceNinjaComponent> ent, ref AttackedEvent args)
     {
-        if (comp.Suit != null && TryComp<StealthClothingComponent>(comp.Suit, out var stealthClothing) && stealthClothing.Enabled)
-        {
-            Suit.RevealNinja(comp.Suit.Value, uid, true, null, stealthClothing);
-        }
+        TryRevealNinja(ent, disable: true);
     }
 
     /// <summary>
     /// Handle revealing ninja if cloaked when attacking.
     /// Only reveals, there is no cooldown.
     /// </summary>
-    private void OnNinjaAttack(EntityUid uid, SpaceNinjaComponent comp, ref MeleeAttackEvent args)
+    private void OnNinjaAttack(Entity<SpaceNinjaComponent> ent, ref MeleeAttackEvent args)
+    {
+        TryRevealNinja(ent, disable: false);
+    }
+
+    private void TryRevealNinja(Entity<SpaceNinjaComponent> ent, bool disable)
     {
-        if (comp.Suit != null && TryComp<StealthClothingComponent>(comp.Suit, out var stealthClothing) && stealthClothing.Enabled)
-        {
-            Suit.RevealNinja(comp.Suit.Value, uid, false, null, stealthClothing);
-        }
+        if (ent.Comp.Suit is {} uid && TryComp<NinjaSuitComponent>(ent.Comp.Suit, out var suit))
+            Suit.RevealNinja((uid, suit), ent, disable: disable);
     }
 
     /// <summary>
     /// Require ninja to fight with HONOR, no guns!
     /// </summary>
-    private void OnShotAttempted(EntityUid uid, SpaceNinjaComponent comp, ref ShotAttemptedEvent args)
+    private void OnShotAttempted(Entity<SpaceNinjaComponent> ent, ref ShotAttemptedEvent args)
     {
-        Popup.PopupClient(Loc.GetString("gun-disabled"), uid, uid);
+        Popup.PopupClient(Loc.GetString("gun-disabled"), ent, ent);
         args.Cancel();
     }
 }
diff --git a/Content.Shared/Ninja/Systems/SharedSpiderChargeSystem.cs b/Content.Shared/Ninja/Systems/SharedSpiderChargeSystem.cs
new file mode 100644
index 00000000000..f4b158aced4
--- /dev/null
+++ b/Content.Shared/Ninja/Systems/SharedSpiderChargeSystem.cs
@@ -0,0 +1,6 @@
+namespace Content.Shared.Ninja.Systems;
+
+/// <summary>
+/// Sticking triggering and exploding are all in server so this is just for access.
+/// </summary>
+public abstract class SharedSpiderChargeSystem : EntitySystem;
diff --git a/Content.Shared/Ninja/Systems/SharedStunProviderSystem.cs b/Content.Shared/Ninja/Systems/SharedStunProviderSystem.cs
index 61b6e4313ed..061c019c9b6 100644
--- a/Content.Shared/Ninja/Systems/SharedStunProviderSystem.cs
+++ b/Content.Shared/Ninja/Systems/SharedStunProviderSystem.cs
@@ -11,22 +11,12 @@ public abstract class SharedStunProviderSystem : EntitySystem
     /// <summary>
     /// Set the battery field on the stun provider.
     /// </summary>
-    public void SetBattery(EntityUid uid, EntityUid? battery, StunProviderComponent? comp = null)
+    public void SetBattery(Entity<StunProviderComponent?> ent, EntityUid? battery)
     {
-        if (!Resolve(uid, ref comp))
+        if (!Resolve(ent, ref ent.Comp) || ent.Comp.BatteryUid == battery)
             return;
 
-        comp.BatteryUid = battery;
-    }
-
-    /// <summary>
-    /// Set the no power popup field on the stun provider.
-    /// </summary>
-    public void SetNoPowerPopup(EntityUid uid, string popup, StunProviderComponent? comp = null)
-    {
-        if (!Resolve(uid, ref comp))
-            return;
-
-        comp.NoPowerPopup = popup;
+        ent.Comp.BatteryUid = battery;
+        Dirty(ent, ent.Comp);
     }
 }
diff --git a/Content.Shared/NukeOps/NukeOperativeComponent.cs b/Content.Shared/NukeOps/NukeOperativeComponent.cs
index d19f0ae3e9d..80416b8f710 100644
--- a/Content.Shared/NukeOps/NukeOperativeComponent.cs
+++ b/Content.Shared/NukeOps/NukeOperativeComponent.cs
@@ -17,6 +17,6 @@ public sealed partial class NukeOperativeComponent : Component
     /// <summary>
     ///
     /// </summary>
-    [DataField("syndStatusIcon", customTypeSerializer: typeof(PrototypeIdSerializer<StatusIconPrototype>))]
+    [DataField("syndStatusIcon", customTypeSerializer: typeof(PrototypeIdSerializer<FactionIconPrototype>))]
     public string SyndStatusIcon = "SyndicateFaction";
 }
diff --git a/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs b/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
index bff15f06ff9..6196669c190 100644
--- a/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
@@ -24,18 +24,18 @@ public sealed class HungerSystem : EntitySystem
     [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
     [Dependency] private readonly SharedJetpackSystem _jetpack = default!;
 
-    [ValidatePrototypeId<StatusIconPrototype>]
+    [ValidatePrototypeId<SatiationIconPrototype>]
     private const string HungerIconOverfedId = "HungerIconOverfed";
 
-    [ValidatePrototypeId<StatusIconPrototype>]
+    [ValidatePrototypeId<SatiationIconPrototype>]
     private const string HungerIconPeckishId = "HungerIconPeckish";
 
-    [ValidatePrototypeId<StatusIconPrototype>]
+    [ValidatePrototypeId<SatiationIconPrototype>]
     private const string HungerIconStarvingId = "HungerIconStarving";
 
-    private StatusIconPrototype? _hungerIconOverfed;
-    private StatusIconPrototype? _hungerIconPeckish;
-    private StatusIconPrototype? _hungerIconStarving;
+    private SatiationIconPrototype? _hungerIconOverfed;
+    private SatiationIconPrototype? _hungerIconPeckish;
+    private SatiationIconPrototype? _hungerIconStarving;
 
     public override void Initialize()
     {
@@ -216,7 +216,7 @@ private bool GetMovementThreshold(HungerThreshold threshold)
         }
     }
 
-    public bool TryGetStatusIconPrototype(HungerComponent component, [NotNullWhen(true)] out StatusIconPrototype? prototype)
+    public bool TryGetStatusIconPrototype(HungerComponent component, [NotNullWhen(true)] out SatiationIconPrototype? prototype)
     {
         switch (component.CurrentThreshold)
         {
diff --git a/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs b/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
index 205d8d6cde3..aa704354ba9 100644
--- a/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
@@ -22,18 +22,18 @@ public sealed class ThirstSystem : EntitySystem
     [Dependency] private readonly MovementSpeedModifierSystem _movement = default!;
     [Dependency] private readonly SharedJetpackSystem _jetpack = default!;
 
-    [ValidatePrototypeId<StatusIconPrototype>]
+    [ValidatePrototypeId<SatiationIconPrototype>]
     private const string ThirstIconOverhydratedId = "ThirstIconOverhydrated";
 
-    [ValidatePrototypeId<StatusIconPrototype>]
+    [ValidatePrototypeId<SatiationIconPrototype>]
     private const string ThirstIconThirstyId = "ThirstIconThirsty";
 
-    [ValidatePrototypeId<StatusIconPrototype>]
+    [ValidatePrototypeId<SatiationIconPrototype>]
     private const string ThirstIconParchedId = "ThirstIconParched";
 
-    private StatusIconPrototype? _thirstIconOverhydrated = null;
-    private StatusIconPrototype? _thirstIconThirsty = null;
-    private StatusIconPrototype? _thirstIconParched = null;
+    private SatiationIconPrototype? _thirstIconOverhydrated = null;
+    private SatiationIconPrototype? _thirstIconThirsty = null;
+    private SatiationIconPrototype? _thirstIconParched = null;
 
     public override void Initialize()
     {
@@ -128,7 +128,7 @@ private bool IsMovementThreshold(ThirstThreshold threshold)
         }
     }
 
-    public bool TryGetStatusIconPrototype(ThirstComponent component, out StatusIconPrototype? prototype)
+    public bool TryGetStatusIconPrototype(ThirstComponent component, out SatiationIconPrototype? prototype)
     {
         switch (component.CurrentThirstThreshold)
         {
diff --git a/Content.Shared/Nyanotrasen/NPC/Systems/Components/Faction/ClothingAddFactionComponent.cs b/Content.Shared/Nyanotrasen/NPC/Systems/Components/Faction/ClothingAddFactionComponent.cs
deleted file mode 100644
index 3d55cd9a8c9..00000000000
--- a/Content.Shared/Nyanotrasen/NPC/Systems/Components/Faction/ClothingAddFactionComponent.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Content.Shared.NPC.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.NPC.Components
-{
-    /// <summary>
-    /// Allows clothing to add a faction to you when you wear it.
-    /// </summary>
-    [RegisterComponent]
-    public sealed partial class ClothingAddFactionComponent : Component
-    {
-        public bool IsActive = false;
-
-        /// <summary>
-        /// Faction added
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite),
-         DataField("faction", required: true, customTypeSerializer:typeof(PrototypeIdSerializer<NpcFactionPrototype>))]
-        public string Faction = "";
-    }
-}
diff --git a/Content.Shared/Nyanotrasen/NPC/Systems/FactionSystem.Core.cs b/Content.Shared/Nyanotrasen/NPC/Systems/FactionSystem.Core.cs
deleted file mode 100644
index 385f3a1099e..00000000000
--- a/Content.Shared/Nyanotrasen/NPC/Systems/FactionSystem.Core.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using Content.Shared.NPC.Components;
-
-namespace Content.Shared.NPC.Systems;
-
-public partial class NpcFactionSystem : EntitySystem
-{
-    public void InitializeCore()
-    {
-        SubscribeLocalEvent<NpcFactionMemberComponent, GetNearbyHostilesEvent>(OnGetNearbyHostiles);
-    }
-
-    public bool ContainsFaction(EntityUid uid, string faction, NpcFactionMemberComponent? component = null)
-    {
-        if (!Resolve(uid, ref component, false))
-            return false;
-
-        return component.Factions.Contains(faction);
-    }
-
-    public void AddFriendlyEntity(EntityUid uid, EntityUid fEntity, NpcFactionMemberComponent? component = null)
-    {
-        if (!Resolve(uid, ref component, false))
-            return;
-
-        component.ExceptionalFriendlies.Add(fEntity);
-    }
-
-    private void OnGetNearbyHostiles(EntityUid uid, NpcFactionMemberComponent component, ref GetNearbyHostilesEvent args)
-    {
-        args.ExceptionalFriendlies.UnionWith(component.ExceptionalFriendlies);
-    }
-}
-
-/// <summary>
-/// Raised on an entity when it's trying to determine which nearby entities are hostile.
-/// </summary>
-/// <param name="ExceptionalHostiles">Entities that will be counted as hostile regardless of faction. Overriden by friendlies.</param>
-/// <param name="ExceptionalFriendlies">Entities that will be counted as friendly regardless of faction. Overrides hostiles. </param>
-[ByRefEvent]
-public readonly record struct GetNearbyHostilesEvent(HashSet<EntityUid> ExceptionalHostiles, HashSet<EntityUid> ExceptionalFriendlies);
diff --git a/Content.Shared/Nyanotrasen/NPC/Systems/FactionSystem.Items.cs b/Content.Shared/Nyanotrasen/NPC/Systems/FactionSystem.Items.cs
deleted file mode 100644
index 012b59c6cc8..00000000000
--- a/Content.Shared/Nyanotrasen/NPC/Systems/FactionSystem.Items.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using Content.Shared.Clothing.Components;
-using Content.Shared.Inventory.Events;
-using Content.Shared.NPC.Components;
-
-namespace Content.Shared.NPC.Systems;
-
-public partial class NpcFactionSystem : EntitySystem
-{
-    public void InitializeItems()
-    {
-        // SubscribeLocalEvent<NpcFactionMemberComponent, ItemPurchasedEvent>(OnItemPurchased);
-
-        SubscribeLocalEvent<ClothingAddFactionComponent, GotEquippedEvent>(OnClothingEquipped);
-        SubscribeLocalEvent<ClothingAddFactionComponent, GotUnequippedEvent>(OnClothingUnequipped);
-    }
-
-    /// <summary>
-    /// If we bought something we probably don't want it to start biting us after it's automatically placed in our hands.
-    /// If you do, consider finding a better solution to grenade penguin CBT.
-    /// </summary>
-    // private void OnItemPurchased(EntityUid uid, NpcFactionMemberComponent component, ref ItemPurchasedEvent args)
-    // {
-    //     component.ExceptionalFriendlies.Add(args.Purchaser);
-    // }
-
-    private void OnClothingEquipped(EntityUid uid, ClothingAddFactionComponent component, GotEquippedEvent args)
-    {
-        if (!TryComp<ClothingComponent>(uid, out var clothing))
-            return;
-
-        if (!clothing.Slots.HasFlag(args.SlotFlags))
-            return;
-
-        if (!TryComp<NpcFactionMemberComponent>(args.Equipee, out var factionComponent))
-            return;
-
-        if (factionComponent.Factions.Contains(component.Faction))
-            return;
-
-        component.IsActive = true;
-        AddFaction(args.Equipee, component.Faction);
-    }
-
-    private void OnClothingUnequipped(EntityUid uid, ClothingAddFactionComponent component, GotUnequippedEvent args)
-    {
-        if (!component.IsActive)
-            return;
-
-        component.IsActive = false;
-        RemoveFaction(args.Equipee, component.Faction);
-    }
-}
diff --git a/Content.Shared/Objectives/Components/ObjectiveComponent.cs b/Content.Shared/Objectives/Components/ObjectiveComponent.cs
index 36d3fa0bded..fb2e6ca0a68 100644
--- a/Content.Shared/Objectives/Components/ObjectiveComponent.cs
+++ b/Content.Shared/Objectives/Components/ObjectiveComponent.cs
@@ -22,8 +22,11 @@ public sealed partial class ObjectiveComponent : Component
     /// <summary>
     /// Organisation that issued this objective, used for grouping and as a header above common objectives.
     /// </summary>
-    [DataField(required: true)]
-    public string Issuer = string.Empty;
+    [DataField("issuer", required: true)]
+    private LocId Issuer { get; set; }
+
+    [ViewVariables(VVAccess.ReadOnly)]
+    public string LocIssuer => Loc.GetString(Issuer);
 
     /// <summary>
     /// Unique objectives can only have 1 per prototype id.
diff --git a/Content.Shared/Objectives/Systems/SharedObjectivesSystem.cs b/Content.Shared/Objectives/Systems/SharedObjectivesSystem.cs
index 07032a00ce9..35fa501398f 100644
--- a/Content.Shared/Objectives/Systems/SharedObjectivesSystem.cs
+++ b/Content.Shared/Objectives/Systems/SharedObjectivesSystem.cs
@@ -1,5 +1,5 @@
+using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Mind;
-using Content.Shared.Objectives;
 using Content.Shared.Objectives.Components;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
@@ -40,7 +40,7 @@ public bool CanBeAssigned(EntityUid uid, EntityUid mindId, MindComponent mind, O
         if (comp.Unique)
         {
             var proto = _metaQuery.GetComponent(uid).EntityPrototype?.ID;
-            foreach (var objective in mind.AllObjectives)
+            foreach (var objective in mind.Objectives)
             {
                 if (_metaQuery.GetComponent(objective).EntityPrototype?.ID == proto)
                     return false;
@@ -91,6 +91,17 @@ public bool CanBeAssigned(EntityUid uid, EntityUid mindId, MindComponent mind, O
         return uid;
     }
 
+    /// <summary>
+    /// Spawns and assigns an objective for a mind.
+    /// The objective is not added to the mind's objectives, mind system does that in TryAddObjective.
+    /// If the objective could not be assigned the objective is deleted and false is returned.
+    /// </summary>
+    public bool TryCreateObjective(Entity<MindComponent> mind, EntProtoId proto, [NotNullWhen(true)] out EntityUid? objective)
+    {
+        objective = TryCreateObjective(mind.Owner, mind.Comp, proto);
+        return objective != null;
+    }
+
     /// <summary>
     /// Get the title, description, icon and progress of an objective using <see cref="ObjectiveGetInfoEvent"/>.
     /// If any of them are null it is logged and null is returned.
@@ -103,20 +114,43 @@ public bool CanBeAssigned(EntityUid uid, EntityUid mindId, MindComponent mind, O
         if (!Resolve(mindId, ref mind))
             return null;
 
-        var ev = new ObjectiveGetProgressEvent(mindId, mind);
-        RaiseLocalEvent(uid, ref ev);
+        if (GetProgress(uid, (mindId, mind)) is not {} progress)
+            return null;
 
         var comp = Comp<ObjectiveComponent>(uid);
         var meta = MetaData(uid);
         var title = meta.EntityName;
         var description = meta.EntityDescription;
-        if (comp.Icon == null || ev.Progress == null)
+        if (comp.Icon == null)
         {
-            Log.Error($"An objective {ToPrettyString(uid):objective} of {_mind.MindOwnerLoggingString(mind)} is missing icon or progress ({ev.Progress})");
+            Log.Error($"An objective {ToPrettyString(uid):objective} of {_mind.MindOwnerLoggingString(mind)} is missing an icon!");
             return null;
         }
 
-        return new ObjectiveInfo(title, description, comp.Icon, ev.Progress.Value);
+        return new ObjectiveInfo(title, description, comp.Icon, progress);
+    }
+
+    /// <summary>
+    /// Gets the progress of an objective using <see cref="ObjectiveGetProgressEvent"/>.
+    /// Returning null is a programmer error.
+    /// </summary>
+    public float? GetProgress(EntityUid uid, Entity<MindComponent> mind)
+    {
+        var ev = new ObjectiveGetProgressEvent(mind, mind.Comp);
+        RaiseLocalEvent(uid, ref ev);
+        if (ev.Progress != null)
+            return ev.Progress;
+
+        Log.Error($"Objective {ToPrettyString(uid):objective} of {_mind.MindOwnerLoggingString(mind.Comp)} didn't set a progress value!");
+        return null;
+    }
+
+    /// <summary>
+    /// Returns true if an objective is completed.
+    /// </summary>
+    public bool IsCompleted(EntityUid uid, Entity<MindComponent> mind)
+    {
+        return (GetProgress(uid, mind) ?? 0f) >= 0.999f;
     }
 
     /// <summary>
diff --git a/Content.Shared/Overlays/ShowHealthBarsComponent.cs b/Content.Shared/Overlays/ShowHealthBarsComponent.cs
index 4229e27af60..4642c5936a7 100644
--- a/Content.Shared/Overlays/ShowHealthBarsComponent.cs
+++ b/Content.Shared/Overlays/ShowHealthBarsComponent.cs
@@ -19,5 +19,5 @@ public sealed partial class ShowHealthBarsComponent : Component
     public List<string> DamageContainers = new();
 
     [DataField]
-    public ProtoId<StatusIconPrototype>? HealthStatusIcon = "HealthIconFine";
+    public ProtoId<HealthIconPrototype>? HealthStatusIcon = "HealthIconFine";
 }
diff --git a/Content.Shared/PAI/PAIComponent.cs b/Content.Shared/PAI/PAIComponent.cs
index b4e4c927354..9d5be302758 100644
--- a/Content.Shared/PAI/PAIComponent.cs
+++ b/Content.Shared/PAI/PAIComponent.cs
@@ -31,7 +31,7 @@ public sealed partial class PAIComponent : Component
     public EntityUid? MidiAction;
 
     [DataField]
-    public ProtoId<EntityPrototype> MapActionId = "ActionPAIOpenMap";
+    public EntProtoId MapActionId = "ActionPAIOpenMap";
 
     [DataField, AutoNetworkedField]
     public EntityUid? MapAction;
diff --git a/Content.Server/Paper/ActivateOnPaperOpenedComponent.cs b/Content.Shared/Paper/ActivateOnPaperOpenedComponent.cs
similarity index 78%
rename from Content.Server/Paper/ActivateOnPaperOpenedComponent.cs
rename to Content.Shared/Paper/ActivateOnPaperOpenedComponent.cs
index 0d0f72b6126..82b366decd8 100644
--- a/Content.Server/Paper/ActivateOnPaperOpenedComponent.cs
+++ b/Content.Shared/Paper/ActivateOnPaperOpenedComponent.cs
@@ -1,4 +1,6 @@
-namespace Content.Server.Paper;
+using Content.Shared.Paper;
+
+namespace Content.Shared.Paper;
 
 /// <summary>
 /// Activates the item when used to write on paper, as if Z was pressed.
diff --git a/Content.Shared/Paper/EnvelopeComponent.cs b/Content.Shared/Paper/EnvelopeComponent.cs
new file mode 100644
index 00000000000..e56fbd85af2
--- /dev/null
+++ b/Content.Shared/Paper/EnvelopeComponent.cs
@@ -0,0 +1,63 @@
+using Content.Shared.DoAfter;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Paper;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
+public sealed partial class EnvelopeComponent : Component
+{
+    /// <summary>
+    /// The current open/sealed/torn state of the envelope
+    /// </summary>
+    [ViewVariables, DataField, AutoNetworkedField]
+    public EnvelopeState State = EnvelopeState.Open;
+
+    [DataField, ViewVariables]
+    public string SlotId = "letter_slot";
+
+    /// <summary>
+    /// Stores the current sealing/tearing doafter of the envelope
+    /// to prevent doafter spam/prediction issues
+    /// </summary>
+    [DataField, ViewVariables]
+    public DoAfterId? EnvelopeDoAfter;
+
+    /// <summary>
+    /// How long it takes to seal the envelope closed
+    /// </summary>
+    [DataField, ViewVariables]
+    public TimeSpan SealDelay = TimeSpan.FromSeconds(1);
+
+    /// <summary>
+    /// How long it takes to tear open the envelope
+    /// </summary>
+    [DataField, ViewVariables]
+    public TimeSpan TearDelay = TimeSpan.FromSeconds(1);
+
+    /// <summary>
+    /// The sound to play when the envelope is sealed closed
+    /// </summary>
+    [DataField, ViewVariables]
+    public SoundPathSpecifier? SealSound = new SoundPathSpecifier("/Audio/Effects/packetrip.ogg");
+
+    /// <summary>
+    /// The sound to play when the envelope is torn open
+    /// </summary>
+    [DataField, ViewVariables]
+    public SoundPathSpecifier? TearSound = new SoundPathSpecifier("/Audio/Effects/poster_broken.ogg");
+
+    [Serializable, NetSerializable]
+    public enum EnvelopeState : byte
+    {
+        Open,
+        Sealed,
+        Torn
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed partial class EnvelopeDoAfterEvent : SimpleDoAfterEvent
+{
+}
diff --git a/Content.Shared/Paper/EnvelopeSystem.cs b/Content.Shared/Paper/EnvelopeSystem.cs
new file mode 100644
index 00000000000..560c2c82f97
--- /dev/null
+++ b/Content.Shared/Paper/EnvelopeSystem.cs
@@ -0,0 +1,108 @@
+using Content.Shared.DoAfter;
+using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Verbs;
+using Robust.Shared.Audio.Systems;
+using Content.Shared.Examine;
+
+namespace Content.Shared.Paper;
+
+public sealed class EnvelopeSystem : EntitySystem
+{
+    [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
+    [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
+    [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<EnvelopeComponent, ItemSlotInsertAttemptEvent>(OnInsertAttempt);
+        SubscribeLocalEvent<EnvelopeComponent, ItemSlotEjectAttemptEvent>(OnEjectAttempt);
+        SubscribeLocalEvent<EnvelopeComponent, GetVerbsEvent<AlternativeVerb>>(OnGetAltVerbs);
+        SubscribeLocalEvent<EnvelopeComponent, EnvelopeDoAfterEvent>(OnDoAfter);
+        SubscribeLocalEvent<EnvelopeComponent, ExaminedEvent>(OnExamine);
+    }
+
+    private void OnExamine(Entity<EnvelopeComponent> ent, ref ExaminedEvent args)
+    {
+        if (ent.Comp.State == EnvelopeComponent.EnvelopeState.Sealed)
+        {
+            args.PushMarkup(Loc.GetString("envelope-sealed-examine", ("envelope", ent.Owner)));
+        }
+        else if (ent.Comp.State == EnvelopeComponent.EnvelopeState.Torn)
+        {
+            args.PushMarkup(Loc.GetString("envelope-torn-examine", ("envelope", ent.Owner)));
+        }
+    }
+
+    private void OnGetAltVerbs(Entity<EnvelopeComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!args.CanAccess || !args.CanInteract || args.Hands == null)
+            return;
+
+        if (ent.Comp.State == EnvelopeComponent.EnvelopeState.Torn)
+            return;
+
+        var user = args.User;
+        args.Verbs.Add(new AlternativeVerb()
+        {
+            Text = Loc.GetString(ent.Comp.State == EnvelopeComponent.EnvelopeState.Open ? "envelope-verb-seal" : "envelope-verb-tear"),
+            IconEntity = GetNetEntity(ent.Owner),
+            Act = () =>
+            {
+                TryStartDoAfter(ent, user, ent.Comp.State == EnvelopeComponent.EnvelopeState.Open ? ent.Comp.SealDelay : ent.Comp.TearDelay);
+            },
+        });
+    }
+
+    private void OnInsertAttempt(Entity<EnvelopeComponent> ent, ref ItemSlotInsertAttemptEvent args)
+    {
+        args.Cancelled |= ent.Comp.State != EnvelopeComponent.EnvelopeState.Open;
+    }
+
+    private void OnEjectAttempt(Entity<EnvelopeComponent> ent, ref ItemSlotEjectAttemptEvent args)
+    {
+        args.Cancelled |= ent.Comp.State == EnvelopeComponent.EnvelopeState.Sealed;
+    }
+
+    private void TryStartDoAfter(Entity<EnvelopeComponent> ent, EntityUid user, TimeSpan delay)
+    {
+        if (ent.Comp.EnvelopeDoAfter.HasValue)
+            return;
+
+        var doAfterEventArgs = new DoAfterArgs(EntityManager, user, delay, new EnvelopeDoAfterEvent(), ent.Owner, ent.Owner)
+        {
+            BreakOnDamage = true,
+            NeedHand = true,
+            BreakOnHandChange = true,
+            MovementThreshold = 0.01f,
+            DistanceThreshold = 1.0f,
+        };
+
+        if (_doAfterSystem.TryStartDoAfter(doAfterEventArgs, out var doAfterId))
+            ent.Comp.EnvelopeDoAfter = doAfterId;
+    }
+    private void OnDoAfter(Entity<EnvelopeComponent> ent, ref EnvelopeDoAfterEvent args)
+    {
+        ent.Comp.EnvelopeDoAfter = null;
+
+        if (args.Cancelled)
+            return;
+
+        if (ent.Comp.State == EnvelopeComponent.EnvelopeState.Open)
+        {
+            _audioSystem.PlayPredicted(ent.Comp.SealSound, ent.Owner, args.User);
+            ent.Comp.State = EnvelopeComponent.EnvelopeState.Sealed;
+            Dirty(ent.Owner, ent.Comp);
+        }
+        else if (ent.Comp.State == EnvelopeComponent.EnvelopeState.Sealed)
+        {
+            _audioSystem.PlayPredicted(ent.Comp.TearSound, ent.Owner, args.User);
+            ent.Comp.State = EnvelopeComponent.EnvelopeState.Torn;
+            Dirty(ent.Owner, ent.Comp);
+
+            if (_itemSlotsSystem.TryGetSlot(ent.Owner, ent.Comp.SlotId, out var slotComp))
+                _itemSlotsSystem.TryEjectToHands(ent.Owner, slotComp, args.User);
+        }
+    }
+}
diff --git a/Content.Shared/Paper/SharedPaperComponent.cs b/Content.Shared/Paper/PaperComponent.cs
similarity index 68%
rename from Content.Shared/Paper/SharedPaperComponent.cs
rename to Content.Shared/Paper/PaperComponent.cs
index f65a599e539..cd0758589db 100644
--- a/Content.Shared/Paper/SharedPaperComponent.cs
+++ b/Content.Shared/Paper/PaperComponent.cs
@@ -4,9 +4,28 @@
 
 namespace Content.Shared.Paper;
 
-[NetworkedComponent]
-public abstract partial class SharedPaperComponent : Component
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class PaperComponent : Component
 {
+    public PaperAction Mode;
+    [DataField("content"), AutoNetworkedField]
+    public string Content { get; set; } = "";
+
+    [DataField("contentSize")]
+    public int ContentSize { get; set; } = 6000;
+
+    [DataField("stampedBy"), AutoNetworkedField]
+    public List<StampDisplayInfo> StampedBy { get; set; } = new();
+
+    /// <summary>
+    ///     Stamp to be displayed on the paper, state from bureaucracy.rsi
+    /// </summary>
+    [DataField("stampState"), AutoNetworkedField]
+    public string? StampState { get; set; }
+
+    [DataField, AutoNetworkedField]
+    public bool EditingDisabled;
+
     /// <summary>
     /// Sound played after writing to the paper.
     /// </summary>
diff --git a/Content.Shared/Paper/PaperSystem.cs b/Content.Shared/Paper/PaperSystem.cs
new file mode 100644
index 00000000000..0f4bfef983d
--- /dev/null
+++ b/Content.Shared/Paper/PaperSystem.cs
@@ -0,0 +1,228 @@
+using System.Linq;
+using Content.Shared.Administration.Logs;
+using Content.Shared.UserInterface;
+using Content.Shared.Database;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.Popups;
+using Content.Shared.Tag;
+using Robust.Shared.Player;
+using Robust.Shared.Audio.Systems;
+using static Content.Shared.Paper.PaperComponent;
+
+namespace Content.Shared.Paper;
+
+public sealed class PaperSystem : EntitySystem
+{
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly SharedInteractionSystem _interaction = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+    [Dependency] private readonly TagSystem _tagSystem = default!;
+    [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!;
+    [Dependency] private readonly MetaDataSystem _metaSystem = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<PaperComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<PaperComponent, ComponentInit>(OnInit);
+        SubscribeLocalEvent<PaperComponent, BeforeActivatableUIOpenEvent>(BeforeUIOpen);
+        SubscribeLocalEvent<PaperComponent, ExaminedEvent>(OnExamined);
+        SubscribeLocalEvent<PaperComponent, InteractUsingEvent>(OnInteractUsing);
+        SubscribeLocalEvent<PaperComponent, PaperInputTextMessage>(OnInputTextMessage);
+
+        SubscribeLocalEvent<ActivateOnPaperOpenedComponent, PaperWriteEvent>(OnPaperWrite);
+    }
+
+    private void OnMapInit(Entity<PaperComponent> entity, ref MapInitEvent args)
+    {
+        if (!string.IsNullOrEmpty(entity.Comp.Content))
+        {
+            SetContent(entity, Loc.GetString(entity.Comp.Content));
+        }
+    }
+
+    private void OnInit(Entity<PaperComponent> entity, ref ComponentInit args)
+    {
+        entity.Comp.Mode = PaperAction.Read;
+        UpdateUserInterface(entity);
+
+        if (TryComp<AppearanceComponent>(entity, out var appearance))
+        {
+            if (entity.Comp.Content != "")
+                _appearance.SetData(entity, PaperVisuals.Status, PaperStatus.Written, appearance);
+
+            if (entity.Comp.StampState != null)
+                _appearance.SetData(entity, PaperVisuals.Stamp, entity.Comp.StampState, appearance);
+        }
+    }
+
+    private void BeforeUIOpen(Entity<PaperComponent> entity, ref BeforeActivatableUIOpenEvent args)
+    {
+        entity.Comp.Mode = PaperAction.Read;
+        UpdateUserInterface(entity);
+    }
+
+    private void OnExamined(Entity<PaperComponent> entity, ref ExaminedEvent args)
+    {
+        if (!args.IsInDetailsRange)
+            return;
+
+        using (args.PushGroup(nameof(PaperComponent)))
+        {
+            if (entity.Comp.Content != "")
+            {
+                args.PushMarkup(
+                    Loc.GetString(
+                        "paper-component-examine-detail-has-words",
+                        ("paper", entity)
+                    )
+                );
+            }
+
+            if (entity.Comp.StampedBy.Count > 0)
+            {
+                var commaSeparated =
+                    string.Join(", ", entity.Comp.StampedBy.Select(s => Loc.GetString(s.StampedName)));
+                args.PushMarkup(
+                    Loc.GetString(
+                        "paper-component-examine-detail-stamped-by",
+                        ("paper", entity),
+                        ("stamps", commaSeparated))
+                );
+            }
+        }
+    }
+
+    private void OnInteractUsing(Entity<PaperComponent> entity, ref InteractUsingEvent args)
+    {
+        // only allow editing if there are no stamps or when using a cyberpen
+        var editable = entity.Comp.StampedBy.Count == 0 || _tagSystem.HasTag(args.Used, "WriteIgnoreStamps");
+        if (_tagSystem.HasTag(args.Used, "Write") && editable)
+        {
+            if (entity.Comp.EditingDisabled)
+            {
+                var paperEditingDisabledMessage = Loc.GetString("paper-tamper-proof-modified-message");
+                _popupSystem.PopupEntity(paperEditingDisabledMessage, entity, args.User);
+
+                args.Handled = true;
+                return;
+            }
+            var writeEvent = new PaperWriteEvent(entity, args.User);
+            RaiseLocalEvent(args.Used, ref writeEvent);
+
+            entity.Comp.Mode = PaperAction.Write;
+            _uiSystem.OpenUi(entity.Owner, PaperUiKey.Key, args.User);
+            UpdateUserInterface(entity);
+            args.Handled = true;
+            return;
+        }
+
+        // If a stamp, attempt to stamp paper
+        if (TryComp<StampComponent>(args.Used, out var stampComp) && TryStamp(entity, GetStampInfo(stampComp), stampComp.StampState))
+        {
+            // successfully stamped, play popup
+            var stampPaperOtherMessage = Loc.GetString("paper-component-action-stamp-paper-other",
+                    ("user", args.User),
+                    ("target", args.Target),
+                    ("stamp", args.Used));
+
+            _popupSystem.PopupEntity(stampPaperOtherMessage, args.User, Filter.PvsExcept(args.User, entityManager: EntityManager), true);
+            var stampPaperSelfMessage = Loc.GetString("paper-component-action-stamp-paper-self",
+                    ("target", args.Target),
+                    ("stamp", args.Used));
+            _popupSystem.PopupClient(stampPaperSelfMessage, args.User, args.User);
+
+            _audio.PlayPredicted(stampComp.Sound, entity, args.User);
+
+            UpdateUserInterface(entity);
+        }
+    }
+
+    private static StampDisplayInfo GetStampInfo(StampComponent stamp)
+    {
+        return new StampDisplayInfo
+        {
+            StampedName = stamp.StampedName,
+            StampedColor = stamp.StampedColor
+        };
+    }
+
+    private void OnInputTextMessage(Entity<PaperComponent> entity, ref PaperInputTextMessage args)
+    {
+        if (args.Text.Length <= entity.Comp.ContentSize)
+        {
+            SetContent(entity, args.Text);
+
+            if (TryComp<AppearanceComponent>(entity, out var appearance))
+                _appearance.SetData(entity, PaperVisuals.Status, PaperStatus.Written, appearance);
+
+            if (TryComp(entity, out MetaDataComponent? meta))
+                _metaSystem.SetEntityDescription(entity, "", meta);
+
+            _adminLogger.Add(LogType.Chat,
+                LogImpact.Low,
+                $"{ToPrettyString(args.Actor):player} has written on {ToPrettyString(entity):entity} the following text: {args.Text}");
+
+            _audio.PlayPvs(entity.Comp.Sound, entity);
+        }
+
+        entity.Comp.Mode = PaperAction.Read;
+        UpdateUserInterface(entity);
+    }
+
+    private void OnPaperWrite(Entity<ActivateOnPaperOpenedComponent> entity, ref PaperWriteEvent args)
+    {
+        _interaction.UseInHandInteraction(args.User, entity);
+    }
+
+    /// <summary>
+    ///     Accepts the name and state to be stamped onto the paper, returns true if successful.
+    /// </summary>
+    public bool TryStamp(Entity<PaperComponent> entity, StampDisplayInfo stampInfo, string spriteStampState)
+    {
+        if (!entity.Comp.StampedBy.Contains(stampInfo))
+        {
+            entity.Comp.StampedBy.Add(stampInfo);
+            Dirty(entity);
+            if (entity.Comp.StampState == null && TryComp<AppearanceComponent>(entity, out var appearance))
+            {
+                entity.Comp.StampState = spriteStampState;
+                // Would be nice to be able to display multiple sprites on the paper
+                // but most of the existing images overlap
+                _appearance.SetData(entity, PaperVisuals.Stamp, entity.Comp.StampState, appearance);
+            }
+        }
+        return true;
+    }
+
+    public void SetContent(Entity<PaperComponent> entity, string content)
+    {
+        entity.Comp.Content = content + '\n';
+        Dirty(entity);
+        UpdateUserInterface(entity);
+
+        if (!TryComp<AppearanceComponent>(entity, out var appearance))
+            return;
+
+        var status = string.IsNullOrWhiteSpace(content)
+            ? PaperStatus.Blank
+            : PaperStatus.Written;
+
+        _appearance.SetData(entity, PaperVisuals.Status, status, appearance);
+    }
+
+    private void UpdateUserInterface(Entity<PaperComponent> entity)
+    {
+        _uiSystem.SetUiState(entity.Owner, PaperUiKey.Key, new PaperBoundUserInterfaceState(entity.Comp.Content, entity.Comp.StampedBy, entity.Comp.Mode));
+    }
+}
+
+/// <summary>
+/// Event fired when using a pen on paper, opening the UI.
+/// </summary>
+[ByRefEvent]
+public record struct PaperWriteEvent(EntityUid User, EntityUid Paper);
diff --git a/Content.Shared/Physics/CollisionGroup.cs b/Content.Shared/Physics/CollisionGroup.cs
index 775ccb7c446..9f8c5ad9bef 100644
--- a/Content.Shared/Physics/CollisionGroup.cs
+++ b/Content.Shared/Physics/CollisionGroup.cs
@@ -58,7 +58,7 @@ public enum CollisionGroup
     // Tabletop machines, windoors, firelocks
     TabletopMachineMask = Impassable | HighImpassable,
     // Tabletop machines
-    TabletopMachineLayer = Opaque | HighImpassable | BulletImpassable,
+    TabletopMachineLayer = Opaque | BulletImpassable,
 
     // Airlocks, windoors, firelocks
     GlassAirlockLayer = HighImpassable | MidImpassable | BulletImpassable | InteractImpassable,
diff --git a/Content.Shared/Pinpointer/SharedProximityBeeper.cs b/Content.Shared/Pinpointer/SharedProximityBeeper.cs
deleted file mode 100644
index 51631126833..00000000000
--- a/Content.Shared/Pinpointer/SharedProximityBeeper.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Pinpointer;
-
-[Serializable, NetSerializable]
-public enum ProximityBeeperVisuals : byte
-{
-    Enabled
-}
diff --git a/Content.Shared/Pinpointer/StationMapComponent.cs b/Content.Shared/Pinpointer/StationMapComponent.cs
new file mode 100644
index 00000000000..07cc99605ed
--- /dev/null
+++ b/Content.Shared/Pinpointer/StationMapComponent.cs
@@ -0,0 +1,11 @@
+namespace Content.Shared.Pinpointer;
+
+[RegisterComponent]
+public sealed partial class StationMapComponent : Component
+{
+    /// <summary>
+    /// Whether or not to show the user's location on the map.
+    /// </summary>
+    [DataField]
+    public bool ShowLocation = true;
+}
diff --git a/Content.Shared/Plants/PottedPlantHideComponent.cs b/Content.Shared/Plants/PottedPlantHideComponent.cs
deleted file mode 100644
index 2e02272494f..00000000000
--- a/Content.Shared/Plants/PottedPlantHideComponent.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Content.Shared.Storage.Components;
-using Robust.Shared.Audio;
-
-namespace Content.Shared.Plants
-{
-    /// <summary>
-    ///     Interaction wrapper for <see cref="SecretStashComponent"/>.
-    ///     Gently rustle after each interaction with plant.
-    /// </summary>
-    [RegisterComponent]
-    [Access(typeof(PottedPlantHideSystem))]
-    public sealed partial class PottedPlantHideComponent : Component
-    {
-        [DataField("rustleSound")]
-        public SoundSpecifier RustleSound = new SoundPathSpecifier("/Audio/Effects/plant_rustle.ogg");
-    }
-}
diff --git a/Content.Shared/Plants/PottedPlantHideSystem.cs b/Content.Shared/Plants/PottedPlantHideSystem.cs
deleted file mode 100644
index cbe052f8d5c..00000000000
--- a/Content.Shared/Plants/PottedPlantHideSystem.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using Content.Shared.Popups;
-using Content.Shared.Storage.Components;
-using Content.Shared.Storage.EntitySystems;
-using Content.Shared.Interaction;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-
-namespace Content.Shared.Plants
-{
-    public sealed class PottedPlantHideSystem : EntitySystem
-    {
-        [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
-        [Dependency] private readonly SecretStashSystem _stashSystem = default!;
-        [Dependency] private readonly SharedAudioSystem _audio = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<PottedPlantHideComponent, ComponentInit>(OnInit);
-            SubscribeLocalEvent<PottedPlantHideComponent, InteractUsingEvent>(OnInteractUsing);
-            SubscribeLocalEvent<PottedPlantHideComponent, InteractHandEvent>(OnInteractHand);
-        }
-
-        private void OnInit(EntityUid uid, PottedPlantHideComponent component, ComponentInit args)
-        {
-            EntityManager.EnsureComponent<SecretStashComponent>(uid);
-        }
-
-        private void OnInteractUsing(EntityUid uid, PottedPlantHideComponent component, InteractUsingEvent args)
-        {
-            if (args.Handled)
-                return;
-
-            Rustle(uid, component, args.User);
-            args.Handled = _stashSystem.TryHideItem(uid, args.User, args.Used);
-        }
-
-        private void OnInteractHand(EntityUid uid, PottedPlantHideComponent component, InteractHandEvent args)
-        {
-            if (args.Handled)
-                return;
-
-            Rustle(uid, component, args.User);
-
-            var gotItem = _stashSystem.TryGetItem(uid, args.User);
-            if (!gotItem)
-            {
-                var msg = Loc.GetString("potted-plant-hide-component-interact-hand-got-no-item-message");
-                _popupSystem.PopupClient(msg, uid, args.User);
-            }
-
-            args.Handled = gotItem;
-        }
-
-        private void Rustle(EntityUid uid, PottedPlantHideComponent? component = null, EntityUid? user = null)
-        {
-            if (!Resolve(uid, ref component))
-                return;
-
-            _audio.PlayPredicted(component.RustleSound, uid, user, AudioParams.Default.WithVariation(0.25f));
-        }
-    }
-}
diff --git a/Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs b/Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs
index be2a9dc3abc..37ac7518896 100644
--- a/Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs
+++ b/Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs
@@ -1,6 +1,15 @@
-namespace Content.Shared.Power.EntitySystems;
+using Content.Shared.Examine;
+using Content.Shared.Power.Components;
+
+namespace Content.Shared.Power.EntitySystems;
 
 public abstract class SharedPowerReceiverSystem : EntitySystem
 {
-
+    protected string GetExamineText(bool powered)
+    {
+        return Loc.GetString("power-receiver-component-on-examine-main",
+                                ("stateText", Loc.GetString(powered
+                                    ? "power-receiver-component-on-examine-powered"
+                                    : "power-receiver-component-on-examine-unpowered")));
+    }
 }
diff --git a/Content.Shared/PowerCell/PowerCellDrawComponent.cs b/Content.Shared/PowerCell/PowerCellDrawComponent.cs
index 708a86a8eaf..94de7c77878 100644
--- a/Content.Shared/PowerCell/PowerCellDrawComponent.cs
+++ b/Content.Shared/PowerCell/PowerCellDrawComponent.cs
@@ -6,6 +6,10 @@ namespace Content.Shared.PowerCell;
 /// <summary>
 /// Indicates that the entity's ActivatableUI requires power or else it closes.
 /// </summary>
+/// <remarks>
+/// With ActivatableUI it will activate and deactivate when the ui is opened and closed, drawing power inbetween.
+/// Requires <see cref="ItemToggleComponent"/> to work.
+/// </remarks>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
 public sealed partial class PowerCellDrawComponent : Component
 {
@@ -26,10 +30,12 @@ public sealed partial class PowerCellDrawComponent : Component
     #endregion
 
     /// <summary>
-    /// Is this power cell currently drawing power every tick.
+    /// Whether drawing is enabled, regardless of ItemToggle.
+    /// Having no cell will still disable it.
+    /// Only use this if you really don't want it to use power for some time.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("enabled")]
-    public bool Drawing;
+    [DataField, AutoNetworkedField]
+    public bool Enabled = true;
 
     /// <summary>
     /// How much the entity draws while the UI is open.
@@ -51,4 +57,10 @@ public sealed partial class PowerCellDrawComponent : Component
     [DataField("nextUpdate", customTypeSerializer: typeof(TimeOffsetSerializer))]
     [AutoPausedField]
     public TimeSpan NextUpdateTime;
+
+    /// <summary>
+    /// How long to wait between power drawing.
+    /// </summary>
+    [DataField]
+    public TimeSpan Delay = TimeSpan.FromSeconds(1);
 }
diff --git a/Content.Shared/PowerCell/SharedPowerCellSystem.cs b/Content.Shared/PowerCell/SharedPowerCellSystem.cs
index 508bfc85f08..2b2a836633c 100644
--- a/Content.Shared/PowerCell/SharedPowerCellSystem.cs
+++ b/Content.Shared/PowerCell/SharedPowerCellSystem.cs
@@ -1,4 +1,6 @@
 using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Item.ItemToggle;
+using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.PowerCell.Components;
 using Content.Shared.Rejuvenate;
 using Robust.Shared.Containers;
@@ -11,14 +13,19 @@ public abstract class SharedPowerCellSystem : EntitySystem
     [Dependency] protected readonly IGameTiming Timing = default!;
     [Dependency] private readonly ItemSlotsSystem _itemSlots = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] protected readonly ItemToggleSystem Toggle = default!;
 
     public override void Initialize()
     {
         base.Initialize();
+
         SubscribeLocalEvent<PowerCellSlotComponent, RejuvenateEvent>(OnRejuvenate);
         SubscribeLocalEvent<PowerCellSlotComponent, EntInsertedIntoContainerMessage>(OnCellInserted);
         SubscribeLocalEvent<PowerCellSlotComponent, EntRemovedFromContainerMessage>(OnCellRemoved);
         SubscribeLocalEvent<PowerCellSlotComponent, ContainerIsInsertingAttemptEvent>(OnCellInsertAttempt);
+
+        SubscribeLocalEvent<PowerCellDrawComponent, ItemToggleActivateAttemptEvent>(OnActivateAttempt);
+        SubscribeLocalEvent<PowerCellDrawComponent, ItemToggledEvent>(OnToggled);
     }
 
     private void OnRejuvenate(EntityUid uid, PowerCellSlotComponent component, RejuvenateEvent args)
@@ -63,13 +70,25 @@ protected virtual void OnCellRemoved(EntityUid uid, PowerCellSlotComponent compo
         RaiseLocalEvent(uid, new PowerCellChangedEvent(true), false);
     }
 
-    public void SetPowerCellDrawEnabled(EntityUid uid, bool enabled, PowerCellDrawComponent? component = null)
+    private void OnActivateAttempt(Entity<PowerCellDrawComponent> ent, ref ItemToggleActivateAttemptEvent args)
+    {
+        if (!HasDrawCharge(ent, ent.Comp, user: args.User)
+            || !HasActivatableCharge(ent, ent.Comp, user: args.User))
+            args.Cancelled = true;
+    }
+
+    private void OnToggled(Entity<PowerCellDrawComponent> ent, ref ItemToggledEvent args)
+    {
+        ent.Comp.NextUpdateTime = Timing.CurTime;
+    }
+
+    public void SetDrawEnabled(Entity<PowerCellDrawComponent?> ent, bool enabled)
     {
-        if (!Resolve(uid, ref component, false) || enabled == component.Drawing)
+        if (!Resolve(ent, ref ent.Comp, false) || ent.Comp.Enabled == enabled)
             return;
 
-        component.Drawing = enabled;
-        component.NextUpdateTime = Timing.CurTime;
+        ent.Comp.Enabled = enabled;
+        Dirty(ent, ent.Comp);
     }
 
     /// <summary>
diff --git a/Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs b/Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs
index 1799033fa64..30d88815bde 100644
--- a/Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs
+++ b/Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs
@@ -28,9 +28,11 @@ public override bool Validate(HumanoidCharacterProfile profile, RoleLoadout load
         var playtimes = manager.GetPlayTimes(session);
         var isWhitelisted = session.ContentData()?.Whitelisted ?? false; // DeltaV - Whitelist requirement
 
-        return JobRequirements.TryRequirementMet(Requirement, playtimes, out reason,
-            collection.Resolve<IEntityManager>(),
+        return Requirement.Check(collection.Resolve<IEntityManager>(),
             collection.Resolve<IPrototypeManager>(),
+            profile,
+            playtimes,
+            out reason,
             isWhitelisted); // DeltaV
     }
 }
diff --git a/Content.Shared/Preferences/Loadouts/LoadoutPrototype.cs b/Content.Shared/Preferences/Loadouts/LoadoutPrototype.cs
index 90b000d181d..a570b61d89e 100644
--- a/Content.Shared/Preferences/Loadouts/LoadoutPrototype.cs
+++ b/Content.Shared/Preferences/Loadouts/LoadoutPrototype.cs
@@ -8,13 +8,17 @@ namespace Content.Shared.Preferences.Loadouts;
 /// Individual loadout item to be applied.
 /// </summary>
 [Prototype]
-public sealed partial class LoadoutPrototype : IPrototype
+public sealed partial class LoadoutPrototype : IPrototype, IEquipmentLoadout
 {
     [IdDataField]
     public string ID { get; } = string.Empty;
 
-    [DataField(required: true)]
-    public ProtoId<StartingGearPrototype> Equipment;
+    /*
+     * You can either use an existing StartingGearPrototype or specify it inline to avoid bloating yaml.
+     */
+
+    [DataField]
+    public ProtoId<StartingGearPrototype>? StartingGear;
 
     /// <summary>
     /// Effects to be applied when the loadout is applied.
@@ -22,4 +26,16 @@ public sealed partial class LoadoutPrototype : IPrototype
     /// </summary>
     [DataField]
     public List<LoadoutEffect> Effects = new();
+
+    /// <inheritdoc />
+    [DataField]
+    public Dictionary<string, EntProtoId> Equipment { get; set; } = new();
+
+    /// <inheritdoc />
+    [DataField]
+    public List<EntProtoId> Inhand { get; set; } = new();
+
+    /// <inheritdoc />
+    [DataField]
+    public Dictionary<string, List<EntProtoId>> Storage { get; set; } = new();
 }
diff --git a/Content.Shared/Procedural/Components/EntityRemapComponent.cs b/Content.Shared/Procedural/Components/EntityRemapComponent.cs
new file mode 100644
index 00000000000..3d7199743af
--- /dev/null
+++ b/Content.Shared/Procedural/Components/EntityRemapComponent.cs
@@ -0,0 +1,13 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Procedural.Components;
+
+/// <summary>
+/// Indicates this entity prototype should be re-mapped to another
+/// </summary>
+[RegisterComponent]
+public sealed partial class EntityRemapComponent : Component
+{
+    [DataField(required: true)]
+    public Dictionary<EntProtoId, EntProtoId> Mask = new();
+}
diff --git a/Content.Shared/Procedural/Distance/DunGenEuclideanSquaredDistance.cs b/Content.Shared/Procedural/Distance/DunGenEuclideanSquaredDistance.cs
new file mode 100644
index 00000000000..617304729e2
--- /dev/null
+++ b/Content.Shared/Procedural/Distance/DunGenEuclideanSquaredDistance.cs
@@ -0,0 +1,10 @@
+namespace Content.Shared.Procedural.Distance;
+
+/// <summary>
+/// Produces a rounder shape useful for more natural areas.
+/// </summary>
+public sealed partial class DunGenEuclideanSquaredDistance : IDunGenDistance
+{
+    [DataField]
+    public float BlendWeight { get; set; } = 0.50f;
+}
diff --git a/Content.Shared/Procedural/Distance/DunGenSquareBump.cs b/Content.Shared/Procedural/Distance/DunGenSquareBump.cs
new file mode 100644
index 00000000000..48b0c4bcb7e
--- /dev/null
+++ b/Content.Shared/Procedural/Distance/DunGenSquareBump.cs
@@ -0,0 +1,10 @@
+namespace Content.Shared.Procedural.Distance;
+
+/// <summary>
+/// Produces a squarish-shape that's better for filling in most of the area.
+/// </summary>
+public sealed partial class DunGenSquareBump : IDunGenDistance
+{
+    [DataField]
+    public float BlendWeight { get; set; } = 0.50f;
+}
diff --git a/Content.Shared/Procedural/Distance/IDunGenDistance.cs b/Content.Shared/Procedural/Distance/IDunGenDistance.cs
new file mode 100644
index 00000000000..b1071a14e34
--- /dev/null
+++ b/Content.Shared/Procedural/Distance/IDunGenDistance.cs
@@ -0,0 +1,14 @@
+namespace Content.Shared.Procedural.Distance;
+
+/// <summary>
+/// Used if you want to limit the distance noise is generated by some arbitrary config
+/// </summary>
+[ImplicitDataDefinitionForInheritors]
+public partial interface IDunGenDistance
+{
+    /// <summary>
+    /// How much to blend between the original noise value and the adjusted one.
+    /// </summary>
+    float BlendWeight { get; }
+}
+
diff --git a/Content.Shared/Procedural/Dungeon.cs b/Content.Shared/Procedural/Dungeon.cs
index aecfef2c782..0d290b67905 100644
--- a/Content.Shared/Procedural/Dungeon.cs
+++ b/Content.Shared/Procedural/Dungeon.cs
@@ -1,8 +1,16 @@
 namespace Content.Shared.Procedural;
 
+/// <summary>
+/// Procedurally generated dungeon data.
+/// </summary>
 public sealed class Dungeon
 {
-    public readonly List<DungeonRoom> Rooms;
+    public static Dungeon Empty = new Dungeon();
+
+    private List<DungeonRoom> _rooms;
+    private HashSet<Vector2i> _allTiles = new();
+
+    public IReadOnlyList<DungeonRoom> Rooms => _rooms;
 
     /// <summary>
     /// Hashset of the tiles across all rooms.
@@ -17,18 +25,64 @@ public sealed class Dungeon
 
     public readonly HashSet<Vector2i> Entrances = new();
 
-    public Dungeon()
+    public IReadOnlySet<Vector2i> AllTiles => _allTiles;
+
+    public Dungeon() : this(new List<DungeonRoom>())
     {
-        Rooms = new List<DungeonRoom>();
     }
 
     public Dungeon(List<DungeonRoom> rooms)
     {
-        Rooms = rooms;
+        // This reftype is mine now.
+        _rooms = rooms;
+
+        foreach (var room in _rooms)
+        {
+            InternalAddRoom(room);
+        }
+
+        RefreshAllTiles();
+    }
+
+    public void RefreshAllTiles()
+    {
+        _allTiles.Clear();
+        _allTiles.UnionWith(RoomTiles);
+        _allTiles.UnionWith(RoomExteriorTiles);
+        _allTiles.UnionWith(CorridorTiles);
+        _allTiles.UnionWith(CorridorExteriorTiles);
+        _allTiles.UnionWith(Entrances);
+    }
+
+    public void Rebuild()
+    {
+        _allTiles.Clear();
+
+        RoomTiles.Clear();
+        RoomExteriorTiles.Clear();
+        Entrances.Clear();
 
-        foreach (var room in Rooms)
+        foreach (var room in _rooms)
         {
-            Entrances.UnionWith(room.Entrances);
+            InternalAddRoom(room, false);
         }
+
+        RefreshAllTiles();
+    }
+
+    public void AddRoom(DungeonRoom room)
+    {
+        _rooms.Add(room);
+        InternalAddRoom(room);
+    }
+
+    private void InternalAddRoom(DungeonRoom room, bool refreshAll = true)
+    {
+        Entrances.UnionWith(room.Entrances);
+        RoomTiles.UnionWith(room.Tiles);
+        RoomExteriorTiles.UnionWith(room.Exterior);
+
+        if (refreshAll)
+            RefreshAllTiles();
     }
 }
diff --git a/Content.Shared/Procedural/DungeonConfigPrototype.cs b/Content.Shared/Procedural/DungeonConfigPrototype.cs
index 07a7000d637..d0d8e0ff12d 100644
--- a/Content.Shared/Procedural/DungeonConfigPrototype.cs
+++ b/Content.Shared/Procedural/DungeonConfigPrototype.cs
@@ -1,21 +1,53 @@
-using Content.Shared.Procedural.DungeonGenerators;
 using Content.Shared.Procedural.PostGeneration;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Procedural;
 
-[Prototype("dungeonConfig")]
+[Prototype]
 public sealed partial class DungeonConfigPrototype : IPrototype
 {
     [IdDataField]
     public string ID { get; private set; } = default!;
 
-    [DataField("generator", required: true)]
-    public IDunGen Generator = default!;
+    /// <summary>
+    /// <see cref="Data"/>
+    /// </summary>
+    [DataField]
+    public DungeonData Data = DungeonData.Empty;
+
+    /// <summary>
+    /// The secret sauce, procedural generation layers that get run.
+    /// </summary>
+    [DataField(required: true)]
+    public List<IDunGenLayer> Layers = new();
+
+    /// <summary>
+    /// Should we reserve the tiles generated by this config so no other dungeons can spawn on it within the same job?
+    /// </summary>
+    [DataField]
+    public bool ReserveTiles;
+
+    /// <summary>
+    /// Minimum times to run the config.
+    /// </summary>
+    [DataField]
+    public int MinCount = 1;
+
+    /// <summary>
+    /// Maximum times to run the config.
+    /// </summary>
+    [DataField]
+    public int MaxCount = 1;
+
+    /// <summary>
+    /// Minimum amount we can offset the dungeon by.
+    /// </summary>
+    [DataField]
+    public int MinOffset;
 
     /// <summary>
-    /// Ran after the main dungeon is created.
+    /// Maximum amount we can offset the dungeon by.
     /// </summary>
-    [DataField("postGeneration")]
-    public List<IPostDunGen> PostGeneration = new();
+    [DataField]
+    public int MaxOffset;
 }
diff --git a/Content.Shared/Procedural/DungeonData.cs b/Content.Shared/Procedural/DungeonData.cs
new file mode 100644
index 00000000000..58ec9667861
--- /dev/null
+++ b/Content.Shared/Procedural/DungeonData.cs
@@ -0,0 +1,105 @@
+using System.Linq;
+using Content.Shared.Maps;
+using Content.Shared.Storage;
+using Content.Shared.Whitelist;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Procedural;
+
+/// <summary>
+/// Used to set dungeon values for all layers.
+/// </summary>
+/// <remarks>
+/// This lets us share data between different dungeon configs without having to repeat entire configs.
+/// </remarks>
+[DataRecord]
+public sealed class DungeonData
+{
+    // I hate this but it also significantly reduces yaml bloat if we add like 10 variations on the same set of layers
+    // e.g. science rooms, engi rooms, cargo rooms all under PlanetBase for example.
+    // without having to do weird nesting. It also means we don't need to copy-paste the same prototype across several layers
+    // The alternative is doing like,
+    // 2 layer prototype, 1 layer with the specified data, 3 layer prototype, 2 layers with specified data, etc.
+    // As long as we just keep the code clean over time it won't be bad to maintain.
+
+    public static DungeonData Empty = new();
+
+    public Dictionary<DungeonDataKey, Color> Colors = new();
+    public Dictionary<DungeonDataKey, EntProtoId> Entities = new();
+    public Dictionary<DungeonDataKey, ProtoId<EntitySpawnEntryPrototype>> SpawnGroups = new();
+    public Dictionary<DungeonDataKey, ProtoId<ContentTileDefinition>> Tiles = new();
+    public Dictionary<DungeonDataKey, EntityWhitelist> Whitelists = new();
+
+    /// <summary>
+    /// Applies the specified data to this data.
+    /// </summary>
+    public void Apply(DungeonData data)
+    {
+        // Copy-paste moment.
+        foreach (var color in data.Colors)
+        {
+            Colors[color.Key] = color.Value;
+        }
+
+        foreach (var color in data.Entities)
+        {
+            Entities[color.Key] = color.Value;
+        }
+
+        foreach (var color in data.SpawnGroups)
+        {
+            SpawnGroups[color.Key] = color.Value;
+        }
+
+        foreach (var color in data.Tiles)
+        {
+            Tiles[color.Key] = color.Value;
+        }
+
+        foreach (var color in data.Whitelists)
+        {
+            Whitelists[color.Key] = color.Value;
+        }
+    }
+
+    public DungeonData Clone()
+    {
+        return new DungeonData
+        {
+            // Only shallow clones but won't matter for DungeonJob purposes.
+            Colors = Colors.ShallowClone(),
+            Entities = Entities.ShallowClone(),
+            SpawnGroups = SpawnGroups.ShallowClone(),
+            Tiles = Tiles.ShallowClone(),
+            Whitelists = Whitelists.ShallowClone(),
+        };
+    }
+}
+
+public enum DungeonDataKey : byte
+{
+    // Colors
+    Decals,
+
+    // Entities
+    Cabling,
+    CornerWalls,
+    Fill,
+    Junction,
+    Walls,
+
+    // SpawnGroups
+    CornerClutter,
+    Entrance,
+    EntranceFlank,
+    WallMounts,
+    Window,
+
+    // Tiles
+    FallbackTile,
+    WidenTile,
+
+    // Whitelists
+    Rooms,
+}
diff --git a/Content.Shared/Procedural/DungeonGenerators/ExteriorDunGen.cs b/Content.Shared/Procedural/DungeonGenerators/ExteriorDunGen.cs
new file mode 100644
index 00000000000..e9a5181f8d0
--- /dev/null
+++ b/Content.Shared/Procedural/DungeonGenerators/ExteriorDunGen.cs
@@ -0,0 +1,13 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Procedural.DungeonGenerators;
+
+/// <summary>
+/// Generates the specified config on an exterior tile of the attached dungeon.
+/// Useful if you're using <see cref="GroupDunGen"/> or otherwise want a dungeon on the outside of a grid.
+/// </summary>
+public sealed partial class ExteriorDunGen : IDunGenLayer
+{
+    [DataField(required: true)]
+    public ProtoId<DungeonConfigPrototype> Proto;
+}
diff --git a/Content.Shared/Procedural/DungeonGenerators/FillGridDunGen.cs b/Content.Shared/Procedural/DungeonGenerators/FillGridDunGen.cs
new file mode 100644
index 00000000000..368ec5cc3e4
--- /dev/null
+++ b/Content.Shared/Procedural/DungeonGenerators/FillGridDunGen.cs
@@ -0,0 +1,10 @@
+namespace Content.Shared.Procedural.DungeonGenerators;
+
+/// <summary>
+/// Fills unreserved tiles with the specified entity prototype.
+/// </summary>
+/// <remarks>
+/// DungeonData keys are:
+/// - Fill
+/// </remarks>
+public sealed partial class FillGridDunGen : IDunGenLayer;
diff --git a/Content.Shared/Procedural/DungeonGenerators/IDunGen.cs b/Content.Shared/Procedural/DungeonGenerators/IDunGen.cs
deleted file mode 100644
index 5aa82f1596f..00000000000
--- a/Content.Shared/Procedural/DungeonGenerators/IDunGen.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Shared.Procedural.DungeonGenerators;
-
-[ImplicitDataDefinitionForInheritors]
-public partial interface IDunGen
-{
-
-}
diff --git a/Content.Shared/Procedural/DungeonGenerators/NoiseDistanceDunGen.cs b/Content.Shared/Procedural/DungeonGenerators/NoiseDistanceDunGen.cs
new file mode 100644
index 00000000000..0dfb3daef84
--- /dev/null
+++ b/Content.Shared/Procedural/DungeonGenerators/NoiseDistanceDunGen.cs
@@ -0,0 +1,18 @@
+using Content.Shared.Procedural.Distance;
+
+namespace Content.Shared.Procedural.DungeonGenerators;
+
+/// <summary>
+/// Like <see cref="Content.Shared.Procedural.DungeonGenerators.NoiseDunGenLayer"/> except with maximum dimensions
+/// </summary>
+public sealed partial class NoiseDistanceDunGen : IDunGenLayer
+{
+    [DataField]
+    public IDunGenDistance? DistanceConfig;
+
+    [DataField]
+    public Vector2i Size;
+
+    [DataField(required: true)]
+    public List<NoiseDunGenLayer> Layers = new();
+}
diff --git a/Content.Shared/Procedural/DungeonGenerators/NoiseDunGen.cs b/Content.Shared/Procedural/DungeonGenerators/NoiseDunGen.cs
index 3ea0d989a2a..56d63bec8f5 100644
--- a/Content.Shared/Procedural/DungeonGenerators/NoiseDunGen.cs
+++ b/Content.Shared/Procedural/DungeonGenerators/NoiseDunGen.cs
@@ -1,15 +1,12 @@
-using Content.Shared.Maps;
+using Content.Shared.Procedural.Distance;
 using Robust.Shared.Noise;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Procedural.DungeonGenerators;
 
 /// <summary>
 /// Generates dungeon flooring based on the specified noise.
 /// </summary>
-public sealed partial class NoiseDunGen : IDunGen
+public sealed partial class NoiseDunGen : IDunGenLayer
 {
     /*
      * Floodfills out from 0 until it finds a valid tile.
diff --git a/Content.Shared/Procedural/DungeonGenerators/PrefabDunGen.cs b/Content.Shared/Procedural/DungeonGenerators/PrefabDunGen.cs
index ef61fff4b04..aeb24d01448 100644
--- a/Content.Shared/Procedural/DungeonGenerators/PrefabDunGen.cs
+++ b/Content.Shared/Procedural/DungeonGenerators/PrefabDunGen.cs
@@ -1,30 +1,20 @@
-using Content.Shared.Maps;
-using Content.Shared.Tag;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Procedural.DungeonGenerators;
 
 /// <summary>
 /// Places rooms in pre-selected pack layouts. Chooses rooms from the specified whitelist.
 /// </summary>
-public sealed partial class PrefabDunGen : IDunGen
+/// <remarks>
+/// DungeonData keys are:
+/// - FallbackTile
+/// - Rooms
+/// </remarks>
+public sealed partial class PrefabDunGen : IDunGenLayer
 {
-    /// <summary>
-    /// Rooms need to match any of these tags
-    /// </summary>
-    [DataField("roomWhitelist", customTypeSerializer:typeof(PrototypeIdListSerializer<TagPrototype>))]
-    public List<string> RoomWhitelist = new();
-
     /// <summary>
     /// Room pack presets we can use for this prefab.
     /// </summary>
-    [DataField("presets", required: true, customTypeSerializer:typeof(PrototypeIdListSerializer<DungeonPresetPrototype>))]
-    public List<string> Presets = new();
-
-    /// <summary>
-    /// Fallback tile.
-    /// </summary>
-    [DataField("tile", customTypeSerializer:typeof(PrototypeIdSerializer<ContentTileDefinition>))]
-    public string Tile = "FloorSteel";
+    [DataField(required: true)]
+    public List<ProtoId<DungeonPresetPrototype>> Presets = new();
 }
diff --git a/Content.Shared/Procedural/DungeonGenerators/PrototypeDunGen.cs b/Content.Shared/Procedural/DungeonGenerators/PrototypeDunGen.cs
new file mode 100644
index 00000000000..346c60a6cb5
--- /dev/null
+++ b/Content.Shared/Procedural/DungeonGenerators/PrototypeDunGen.cs
@@ -0,0 +1,13 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Procedural.DungeonGenerators;
+
+/// <summary>
+/// Runs another <see cref="DungeonConfigPrototype"/>.
+/// Used for storing data on 1 system.
+/// </summary>
+public sealed partial class PrototypeDunGen : IDunGenLayer
+{
+    [DataField(required: true)]
+    public ProtoId<DungeonConfigPrototype> Proto;
+}
diff --git a/Content.Shared/Procedural/DungeonGenerators/ReplaceTileDunGen.cs b/Content.Shared/Procedural/DungeonGenerators/ReplaceTileDunGen.cs
new file mode 100644
index 00000000000..64b76b4cccc
--- /dev/null
+++ b/Content.Shared/Procedural/DungeonGenerators/ReplaceTileDunGen.cs
@@ -0,0 +1,30 @@
+using Content.Shared.Maps;
+using Robust.Shared.Noise;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Procedural.DungeonGenerators;
+
+/// <summary>
+/// Replaces existing tiles if they're not empty.
+/// </summary>
+public sealed partial class ReplaceTileDunGen : IDunGenLayer
+{
+    /// <summary>
+    /// Chance for a non-variant tile to be used, in case they're too noisy.
+    /// </summary>
+    [DataField]
+    public float VariantWeight = 0.1f;
+
+    [DataField(required: true)]
+    public List<ReplaceTileLayer> Layers = new();
+}
+
+[DataRecord]
+public record struct ReplaceTileLayer
+{
+    public ProtoId<ContentTileDefinition> Tile;
+
+    public float Threshold;
+
+    public FastNoiseLite Noise;
+}
diff --git a/Content.Shared/Procedural/DungeonLayers/MobsDunGen.cs b/Content.Shared/Procedural/DungeonLayers/MobsDunGen.cs
new file mode 100644
index 00000000000..30b502efe07
--- /dev/null
+++ b/Content.Shared/Procedural/DungeonLayers/MobsDunGen.cs
@@ -0,0 +1,21 @@
+using Content.Shared.Storage;
+
+namespace Content.Shared.Procedural.DungeonLayers;
+
+
+/// <summary>
+/// Spawns mobs inside of the dungeon randomly.
+/// </summary>
+public sealed partial class MobsDunGen : IDunGenLayer
+{
+    // Counts separate to config to avoid some duplication.
+
+    [DataField]
+    public int MinCount = 1;
+
+    [DataField]
+    public int MaxCount = 1;
+
+    [DataField(required: true)]
+    public List<EntitySpawnEntry> Groups = new();
+}
diff --git a/Content.Shared/Procedural/DungeonLayers/OreDunGen.cs b/Content.Shared/Procedural/DungeonLayers/OreDunGen.cs
new file mode 100644
index 00000000000..31bf367d0e4
--- /dev/null
+++ b/Content.Shared/Procedural/DungeonLayers/OreDunGen.cs
@@ -0,0 +1,42 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Procedural.DungeonLayers;
+
+/// <summary>
+/// Generates veins inside of the specified dungeon.
+/// </summary>
+/// <remarks>
+/// Generates on top of existing entities for sanity reasons moreso than performance.
+/// </remarks>
+public sealed partial class OreDunGen : IDunGenLayer
+{
+    /// <summary>
+    /// If the vein generation should occur on top of existing entities what are we replacing.
+    /// </summary>
+    [DataField]
+    public EntProtoId? Replacement;
+
+    /// <summary>
+    /// Entity to spawn.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId Entity;
+
+    /// <summary>
+    /// Maximum amount of group spawns
+    /// </summary>
+    [DataField]
+    public int Count = 10;
+
+    /// <summary>
+    /// Minimum entities to spawn in one group.
+    /// </summary>
+    [DataField]
+    public int MinGroupSize = 1;
+
+    /// <summary>
+    /// Maximum entities to spawn in one group.
+    /// </summary>
+    [DataField]
+    public int MaxGroupSize = 1;
+}
diff --git a/Content.Shared/Procedural/DungeonRoom.cs b/Content.Shared/Procedural/DungeonRoom.cs
index 4802949d2f3..0c6af8f23db 100644
--- a/Content.Shared/Procedural/DungeonRoom.cs
+++ b/Content.Shared/Procedural/DungeonRoom.cs
@@ -2,6 +2,7 @@
 
 namespace Content.Shared.Procedural;
 
+// TODO: Cache center and bounds and shit and don't make the caller deal with it.
 public sealed record DungeonRoom(HashSet<Vector2i> Tiles, Vector2 Center, Box2i Bounds, HashSet<Vector2i> Exterior)
 {
     public readonly List<Vector2i> Entrances = new();
diff --git a/Content.Shared/Procedural/IDunGenLayer.cs b/Content.Shared/Procedural/IDunGenLayer.cs
new file mode 100644
index 00000000000..a4e8045af1c
--- /dev/null
+++ b/Content.Shared/Procedural/IDunGenLayer.cs
@@ -0,0 +1,7 @@
+namespace Content.Shared.Procedural;
+
+[ImplicitDataDefinitionForInheritors]
+public partial interface IDunGenLayer
+{
+
+}
diff --git a/Content.Shared/Procedural/PostGeneration/AutoCablingDunGen.cs b/Content.Shared/Procedural/PostGeneration/AutoCablingDunGen.cs
new file mode 100644
index 00000000000..5afad7edb18
--- /dev/null
+++ b/Content.Shared/Procedural/PostGeneration/AutoCablingDunGen.cs
@@ -0,0 +1,10 @@
+namespace Content.Shared.Procedural.PostGeneration;
+
+/// <summary>
+/// Runs cables throughout the dungeon.
+/// </summary>
+/// <remarks>
+/// DungeonData keys are:
+/// - Cabling
+/// </remarks>
+public sealed partial class AutoCablingDunGen : IDunGenLayer;
diff --git a/Content.Shared/Procedural/PostGeneration/AutoCablingPostGen.cs b/Content.Shared/Procedural/PostGeneration/AutoCablingPostGen.cs
deleted file mode 100644
index 8278352b036..00000000000
--- a/Content.Shared/Procedural/PostGeneration/AutoCablingPostGen.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Procedural.PostGeneration;
-
-/// <summary>
-/// Runs cables throughout the dungeon.
-/// </summary>
-public sealed partial class AutoCablingPostGen : IPostDunGen
-{
-    [DataField]
-    public EntProtoId Entity = "CableApcExtension";
-}
diff --git a/Content.Shared/Procedural/PostGeneration/BiomePostGen.cs b/Content.Shared/Procedural/PostGeneration/BiomeDunGen.cs
similarity index 78%
rename from Content.Shared/Procedural/PostGeneration/BiomePostGen.cs
rename to Content.Shared/Procedural/PostGeneration/BiomeDunGen.cs
index d02de241355..833cf2dec76 100644
--- a/Content.Shared/Procedural/PostGeneration/BiomePostGen.cs
+++ b/Content.Shared/Procedural/PostGeneration/BiomeDunGen.cs
@@ -1,5 +1,4 @@
 using Content.Shared.Parallax.Biomes;
-using Content.Shared.Procedural.PostGeneration;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Procedural.PostGeneration;
@@ -8,7 +7,7 @@ namespace Content.Shared.Procedural.PostGeneration;
 /// Generates a biome on top of valid tiles, then removes the biome when done.
 /// Only works if no existing biome is present.
 /// </summary>
-public sealed partial class BiomePostGen : IPostDunGen
+public sealed partial class BiomeDunGen : IDunGenLayer
 {
     [DataField(required: true)]
     public ProtoId<BiomeTemplatePrototype> BiomeTemplate;
diff --git a/Content.Shared/Procedural/PostGeneration/BiomeMarkerLayerPostGen.cs b/Content.Shared/Procedural/PostGeneration/BiomeMarkerLayerDunGen.cs
similarity index 73%
rename from Content.Shared/Procedural/PostGeneration/BiomeMarkerLayerPostGen.cs
rename to Content.Shared/Procedural/PostGeneration/BiomeMarkerLayerDunGen.cs
index dc64febe7b0..af5d7c5d8f9 100644
--- a/Content.Shared/Procedural/PostGeneration/BiomeMarkerLayerPostGen.cs
+++ b/Content.Shared/Procedural/PostGeneration/BiomeMarkerLayerDunGen.cs
@@ -1,5 +1,3 @@
-using Content.Shared.Parallax.Biomes.Markers;
-using Content.Shared.Procedural.PostGeneration;
 using Content.Shared.Random;
 using Robust.Shared.Prototypes;
 
@@ -8,7 +6,7 @@ namespace Content.Shared.Procedural.PostGeneration;
 /// <summary>
 /// Spawns the specified marker layer on top of the dungeon rooms.
 /// </summary>
-public sealed partial class BiomeMarkerLayerPostGen : IPostDunGen
+public sealed partial class BiomeMarkerLayerDunGen : IDunGenLayer
 {
     /// <summary>
     /// How many times to spawn marker layers; can duplicate.
diff --git a/Content.Shared/Procedural/PostGeneration/BoundaryWallDunGen.cs b/Content.Shared/Procedural/PostGeneration/BoundaryWallDunGen.cs
new file mode 100644
index 00000000000..4151527f8a0
--- /dev/null
+++ b/Content.Shared/Procedural/PostGeneration/BoundaryWallDunGen.cs
@@ -0,0 +1,23 @@
+namespace Content.Shared.Procedural.PostGeneration;
+
+/// <summary>
+/// Iterates room edges and places the relevant tiles and walls on any free indices.
+/// </summary>
+/// <remarks>
+/// Dungeon data keys are:
+/// - CornerWalls (Optional)
+/// - FallbackTile
+/// - Walls
+/// </remarks>
+public sealed partial class BoundaryWallDunGen : IDunGenLayer
+{
+    [DataField]
+    public BoundaryWallFlags Flags = BoundaryWallFlags.Corridors | BoundaryWallFlags.Rooms;
+}
+
+[Flags]
+public enum BoundaryWallFlags : byte
+{
+    Rooms = 1 << 0,
+    Corridors = 1 << 1,
+}
diff --git a/Content.Shared/Procedural/PostGeneration/BoundaryWallPostGen.cs b/Content.Shared/Procedural/PostGeneration/BoundaryWallPostGen.cs
deleted file mode 100644
index 390ff42feea..00000000000
--- a/Content.Shared/Procedural/PostGeneration/BoundaryWallPostGen.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Content.Shared.Maps;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.Procedural.PostGeneration;
-
-/// <summary>
-/// Iterates room edges and places the relevant tiles and walls on any free indices.
-/// </summary>
-public sealed partial class BoundaryWallPostGen : IPostDunGen
-{
-    [DataField]
-    public ProtoId<ContentTileDefinition> Tile = "FloorSteel";
-
-    [DataField]
-    public EntProtoId Wall = "WallSolid";
-
-    /// <summary>
-    /// Walls to use in corners if applicable.
-    /// </summary>
-    [DataField]
-    public string? CornerWall;
-
-    [DataField]
-    public BoundaryWallFlags Flags = BoundaryWallFlags.Corridors | BoundaryWallFlags.Rooms;
-}
-
-[Flags]
-public enum BoundaryWallFlags : byte
-{
-    Rooms = 1 << 0,
-    Corridors = 1 << 1,
-}
diff --git a/Content.Shared/Procedural/PostGeneration/CornerClutterDunGen.cs b/Content.Shared/Procedural/PostGeneration/CornerClutterDunGen.cs
new file mode 100644
index 00000000000..2a904281c80
--- /dev/null
+++ b/Content.Shared/Procedural/PostGeneration/CornerClutterDunGen.cs
@@ -0,0 +1,14 @@
+namespace Content.Shared.Procedural.PostGeneration;
+
+/// <summary>
+/// Spawns entities inside corners.
+/// </summary>
+/// <remarks>
+/// Dungeon data keys are:
+/// - CornerClutter
+/// </remarks>
+public sealed partial class CornerClutterDunGen : IDunGenLayer
+{
+    [DataField]
+    public float Chance = 0.50f;
+}
diff --git a/Content.Shared/Procedural/PostGeneration/CornerClutterPostGen.cs b/Content.Shared/Procedural/PostGeneration/CornerClutterPostGen.cs
deleted file mode 100644
index a16c7f9ab3f..00000000000
--- a/Content.Shared/Procedural/PostGeneration/CornerClutterPostGen.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Content.Shared.Storage;
-
-namespace Content.Shared.Procedural.PostGeneration;
-
-/// <summary>
-/// Spawns entities inside corners.
-/// </summary>
-public sealed partial class CornerClutterPostGen : IPostDunGen
-{
-    [DataField]
-    public float Chance = 0.50f;
-
-    /// <summary>
-    /// The default starting bulbs
-    /// </summary>
-    [DataField(required: true)]
-    public List<EntitySpawnEntry> Contents = new();
-}
diff --git a/Content.Shared/Procedural/PostGeneration/CorridorClutterPostGen.cs b/Content.Shared/Procedural/PostGeneration/CorridorClutterDunGen.cs
similarity index 85%
rename from Content.Shared/Procedural/PostGeneration/CorridorClutterPostGen.cs
rename to Content.Shared/Procedural/PostGeneration/CorridorClutterDunGen.cs
index a8a74ba6ccb..5b397b40dfc 100644
--- a/Content.Shared/Procedural/PostGeneration/CorridorClutterPostGen.cs
+++ b/Content.Shared/Procedural/PostGeneration/CorridorClutterDunGen.cs
@@ -5,7 +5,7 @@ namespace Content.Shared.Procedural.PostGeneration;
 /// <summary>
 /// Adds entities randomly to the corridors.
 /// </summary>
-public sealed partial class CorridorClutterPostGen : IPostDunGen
+public sealed partial class CorridorClutterDunGen : IDunGenLayer
 {
     [DataField]
     public float Chance = 0.05f;
diff --git a/Content.Shared/Procedural/PostGeneration/CorridorDecalSkirtingPostGen.cs b/Content.Shared/Procedural/PostGeneration/CorridorDecalSkirtingDunGen.cs
similarity index 72%
rename from Content.Shared/Procedural/PostGeneration/CorridorDecalSkirtingPostGen.cs
rename to Content.Shared/Procedural/PostGeneration/CorridorDecalSkirtingDunGen.cs
index 4b139a8be65..e6090436555 100644
--- a/Content.Shared/Procedural/PostGeneration/CorridorDecalSkirtingPostGen.cs
+++ b/Content.Shared/Procedural/PostGeneration/CorridorDecalSkirtingDunGen.cs
@@ -7,29 +7,23 @@ namespace Content.Shared.Procedural.PostGeneration;
 /// <summary>
 /// Applies decal skirting to corridors.
 /// </summary>
-public sealed partial class CorridorDecalSkirtingPostGen : IPostDunGen
+public sealed partial class CorridorDecalSkirtingDunGen : IDunGenLayer
 {
-    /// <summary>
-    /// Color to apply to decals.
-    /// </summary>
-    [DataField("color")]
-    public Color? Color;
-
     /// <summary>
     /// Decal where 1 edge is found.
     /// </summary>
-    [DataField("cardinalDecals")]
+    [DataField]
     public Dictionary<DirectionFlag, string> CardinalDecals = new();
 
     /// <summary>
     /// Decal where 1 corner edge is found.
     /// </summary>
-    [DataField("pocketDecals")]
+    [DataField]
     public Dictionary<Direction, string> PocketDecals = new();
 
     /// <summary>
     /// Decal where 2 or 3 edges are found.
     /// </summary>
-    [DataField("cornerDecals")]
+    [DataField]
     public Dictionary<DirectionFlag, string> CornerDecals = new();
 }
diff --git a/Content.Shared/Procedural/PostGeneration/CorridorPostGen.cs b/Content.Shared/Procedural/PostGeneration/CorridorDunGen.cs
similarity index 73%
rename from Content.Shared/Procedural/PostGeneration/CorridorPostGen.cs
rename to Content.Shared/Procedural/PostGeneration/CorridorDunGen.cs
index 705ae99dcef..6d75cd9cb2b 100644
--- a/Content.Shared/Procedural/PostGeneration/CorridorPostGen.cs
+++ b/Content.Shared/Procedural/PostGeneration/CorridorDunGen.cs
@@ -1,12 +1,13 @@
-using Content.Shared.Maps;
-using Robust.Shared.Prototypes;
-
 namespace Content.Shared.Procedural.PostGeneration;
 
 /// <summary>
 /// Connects room entrances via corridor segments.
 /// </summary>
-public sealed partial class CorridorPostGen : IPostDunGen
+/// <remarks>
+/// Dungeon data keys are:
+/// - FallbackTile
+/// </remarks>
+public sealed partial class CorridorDunGen : IDunGenLayer
 {
     /// <summary>
     /// How far we're allowed to generate a corridor before calling it.
@@ -17,9 +18,6 @@ public sealed partial class CorridorPostGen : IPostDunGen
     [DataField]
     public int PathLimit = 2048;
 
-    [DataField]
-    public ProtoId<ContentTileDefinition> Tile = "FloorSteel";
-
     /// <summary>
     /// How wide to make the corridor.
     /// </summary>
diff --git a/Content.Shared/Procedural/PostGeneration/DungeonEntranceDunGen.cs b/Content.Shared/Procedural/PostGeneration/DungeonEntranceDunGen.cs
new file mode 100644
index 00000000000..40cc95f5fc9
--- /dev/null
+++ b/Content.Shared/Procedural/PostGeneration/DungeonEntranceDunGen.cs
@@ -0,0 +1,18 @@
+namespace Content.Shared.Procedural.PostGeneration;
+
+/// <summary>
+/// Selects [count] rooms and places external doors to them.
+/// </summary>
+/// <remarks>
+/// Dungeon data keys are:
+/// - Entrance
+/// - FallbackTile
+/// </remarks>
+public sealed partial class DungeonEntranceDunGen : IDunGenLayer
+{
+    /// <summary>
+    /// How many rooms we place doors on.
+    /// </summary>
+    [DataField]
+    public int Count = 1;
+}
diff --git a/Content.Shared/Procedural/PostGeneration/DungeonEntrancePostGen.cs b/Content.Shared/Procedural/PostGeneration/DungeonEntrancePostGen.cs
deleted file mode 100644
index 3398b513179..00000000000
--- a/Content.Shared/Procedural/PostGeneration/DungeonEntrancePostGen.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Content.Shared.Maps;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
-
-namespace Content.Shared.Procedural.PostGeneration;
-
-/// <summary>
-/// Selects [count] rooms and places external doors to them.
-/// </summary>
-public sealed partial class DungeonEntrancePostGen : IPostDunGen
-{
-    /// <summary>
-    /// How many rooms we place doors on.
-    /// </summary>
-    [DataField("count")]
-    public int Count = 1;
-
-    [DataField("entities", customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>))]
-    public List<string?> Entities = new()
-    {
-        "CableApcExtension",
-        "AirlockGlass",
-    };
-
-    [DataField("tile", customTypeSerializer:typeof(PrototypeIdSerializer<ContentTileDefinition>))]
-    public string Tile = "FloorSteel";
-}
diff --git a/Content.Shared/Procedural/PostGeneration/EntranceFlankDunGen.cs b/Content.Shared/Procedural/PostGeneration/EntranceFlankDunGen.cs
new file mode 100644
index 00000000000..27baa48ec62
--- /dev/null
+++ b/Content.Shared/Procedural/PostGeneration/EntranceFlankDunGen.cs
@@ -0,0 +1,11 @@
+namespace Content.Shared.Procedural.PostGeneration;
+
+/// <summary>
+/// Spawns entities on either side of an entrance.
+/// </summary>
+/// <remarks>
+/// Dungeon data keys are:
+/// - FallbackTile
+/// -
+/// </remarks>
+public sealed partial class EntranceFlankDunGen : IDunGenLayer;
diff --git a/Content.Shared/Procedural/PostGeneration/EntranceFlankPostGen.cs b/Content.Shared/Procedural/PostGeneration/EntranceFlankPostGen.cs
deleted file mode 100644
index 96e9bd5d6d1..00000000000
--- a/Content.Shared/Procedural/PostGeneration/EntranceFlankPostGen.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Content.Shared.Maps;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.Procedural.PostGeneration;
-
-/// <summary>
-/// Spawns entities on either side of an entrance.
-/// </summary>
-public sealed partial class EntranceFlankPostGen : IPostDunGen
-{
-    [DataField("tile", customTypeSerializer:typeof(PrototypeIdSerializer<ContentTileDefinition>))]
-    public string Tile = "FloorSteel";
-
-    [DataField("entities")]
-    public List<string?> Entities = new();
-}
diff --git a/Content.Shared/Procedural/PostGeneration/ExternalWindowDunGen.cs b/Content.Shared/Procedural/PostGeneration/ExternalWindowDunGen.cs
new file mode 100644
index 00000000000..0b29344b90b
--- /dev/null
+++ b/Content.Shared/Procedural/PostGeneration/ExternalWindowDunGen.cs
@@ -0,0 +1,11 @@
+namespace Content.Shared.Procedural.PostGeneration;
+
+/// <summary>
+/// If external areas are found will try to generate windows.
+/// </summary>
+/// <remarks>
+/// Dungeon data keys are:
+/// - EntranceFlank
+/// - FallbackTile
+/// </remarks>
+public sealed partial class ExternalWindowDunGen : IDunGenLayer;
diff --git a/Content.Shared/Procedural/PostGeneration/ExternalWindowPostGen.cs b/Content.Shared/Procedural/PostGeneration/ExternalWindowPostGen.cs
deleted file mode 100644
index d5580baeaaa..00000000000
--- a/Content.Shared/Procedural/PostGeneration/ExternalWindowPostGen.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Content.Shared.Maps;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
-
-namespace Content.Shared.Procedural.PostGeneration;
-
-/// <summary>
-/// If external areas are found will try to generate windows.
-/// </summary>
-public sealed partial class ExternalWindowPostGen : IPostDunGen
-{
-    [DataField("entities", customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>))]
-    public List<string?> Entities = new()
-    {
-        "Grille",
-        "Window",
-    };
-
-    [DataField("tile", customTypeSerializer:typeof(PrototypeIdSerializer<ContentTileDefinition>))]
-    public string Tile = "FloorSteel";
-}
diff --git a/Content.Shared/Procedural/PostGeneration/IPostDunGen.cs b/Content.Shared/Procedural/PostGeneration/IPostDunGen.cs
deleted file mode 100644
index b55cab8e63e..00000000000
--- a/Content.Shared/Procedural/PostGeneration/IPostDunGen.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Content.Shared.Procedural.PostGeneration;
-
-/// <summary>
-/// Ran after generating dungeon rooms. Can be used for additional loot, contents, etc.
-/// </summary>
-[ImplicitDataDefinitionForInheritors]
-public partial interface IPostDunGen
-{
-
-}
diff --git a/Content.Shared/Procedural/PostGeneration/InternalWindowDunGen.cs b/Content.Shared/Procedural/PostGeneration/InternalWindowDunGen.cs
new file mode 100644
index 00000000000..11b1c6a785a
--- /dev/null
+++ b/Content.Shared/Procedural/PostGeneration/InternalWindowDunGen.cs
@@ -0,0 +1,11 @@
+namespace Content.Shared.Procedural.PostGeneration;
+
+/// <summary>
+/// If internal areas are found will try to generate windows.
+/// </summary>
+/// <remarks>
+/// Dungeon data keys are:
+/// - FallbackTile
+/// - Window
+/// </remarks>
+public sealed partial class InternalWindowDunGen : IDunGenLayer;
diff --git a/Content.Shared/Procedural/PostGeneration/InternalWindowPostGen.cs b/Content.Shared/Procedural/PostGeneration/InternalWindowPostGen.cs
deleted file mode 100644
index 4c6223eb92a..00000000000
--- a/Content.Shared/Procedural/PostGeneration/InternalWindowPostGen.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Content.Shared.Maps;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
-
-namespace Content.Shared.Procedural.PostGeneration;
-
-/// <summary>
-/// If internal areas are found will try to generate windows.
-/// </summary>
-public sealed partial class InternalWindowPostGen : IPostDunGen
-{
-    [DataField("entities", customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>))]
-    public List<string?> Entities = new()
-    {
-        "Grille",
-        "Window",
-    };
-
-    [DataField("tile", customTypeSerializer:typeof(PrototypeIdSerializer<ContentTileDefinition>))]
-    public string Tile = "FloorSteel";
-}
diff --git a/Content.Shared/Procedural/PostGeneration/JunctionDunGen.cs b/Content.Shared/Procedural/PostGeneration/JunctionDunGen.cs
new file mode 100644
index 00000000000..899f2716216
--- /dev/null
+++ b/Content.Shared/Procedural/PostGeneration/JunctionDunGen.cs
@@ -0,0 +1,18 @@
+namespace Content.Shared.Procedural.PostGeneration;
+
+/// <summary>
+/// Places the specified entities at junction areas.
+/// </summary>
+/// <remarks>
+/// Dungeon data keys are:
+/// - Entrance
+/// - FallbackTile
+/// </remarks>
+public sealed partial class JunctionDunGen : IDunGenLayer
+{
+    /// <summary>
+    /// Width to check for junctions.
+    /// </summary>
+    [DataField]
+    public int Width = 3;
+}
diff --git a/Content.Shared/Procedural/PostGeneration/JunctionPostGen.cs b/Content.Shared/Procedural/PostGeneration/JunctionPostGen.cs
deleted file mode 100644
index 5c4cf43b7f0..00000000000
--- a/Content.Shared/Procedural/PostGeneration/JunctionPostGen.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Content.Shared.Maps;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
-
-namespace Content.Shared.Procedural.PostGeneration;
-
-/// <summary>
-/// Places the specified entities at junction areas.
-/// </summary>
-public sealed partial class JunctionPostGen : IPostDunGen
-{
-    /// <summary>
-    /// Width to check for junctions.
-    /// </summary>
-    [DataField("width")]
-    public int Width = 3;
-
-    [DataField("tile", customTypeSerializer:typeof(PrototypeIdSerializer<ContentTileDefinition>))]
-    public string Tile = "FloorSteel";
-
-    [DataField("entities", customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>))]
-    public List<string?> Entities = new()
-    {
-        "CableApcExtension",
-        "AirlockGlass"
-    };
-}
diff --git a/Content.Shared/Procedural/PostGeneration/MiddleConnectionDunGen.cs b/Content.Shared/Procedural/PostGeneration/MiddleConnectionDunGen.cs
new file mode 100644
index 00000000000..a5758c14989
--- /dev/null
+++ b/Content.Shared/Procedural/PostGeneration/MiddleConnectionDunGen.cs
@@ -0,0 +1,19 @@
+namespace Content.Shared.Procedural.PostGeneration;
+
+/// <summary>
+/// Places the specified entities on the middle connections between rooms
+/// </summary>
+public sealed partial class MiddleConnectionDunGen : IDunGenLayer
+{
+    /// <summary>
+    /// How much overlap there needs to be between 2 rooms exactly.
+    /// </summary>
+    [DataField]
+    public int OverlapCount = -1;
+
+    /// <summary>
+    /// How many connections to spawn between rooms.
+    /// </summary>
+    [DataField]
+    public int Count = 1;
+}
diff --git a/Content.Shared/Procedural/PostGeneration/MiddleConnectionPostGen.cs b/Content.Shared/Procedural/PostGeneration/MiddleConnectionPostGen.cs
deleted file mode 100644
index d29a65434c7..00000000000
--- a/Content.Shared/Procedural/PostGeneration/MiddleConnectionPostGen.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Content.Shared.Maps;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
-
-namespace Content.Shared.Procedural.PostGeneration;
-
-/// <summary>
-/// Places the specified entities on the middle connections between rooms
-/// </summary>
-public sealed partial class MiddleConnectionPostGen : IPostDunGen
-{
-    /// <summary>
-    /// How much overlap there needs to be between 2 rooms exactly.
-    /// </summary>
-    [DataField("overlapCount")]
-    public int OverlapCount = -1;
-
-    /// <summary>
-    /// How many connections to spawn between rooms.
-    /// </summary>
-    [DataField("count")]
-    public int Count = 1;
-
-    [DataField("tile", customTypeSerializer:typeof(PrototypeIdSerializer<ContentTileDefinition>))]
-    public string Tile = "FloorSteel";
-
-    [DataField("entities", customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>))]
-    public List<string?> Entities = new()
-    {
-        "CableApcExtension",
-        "AirlockGlass"
-    };
-
-    /// <summary>
-    /// If overlap > 1 then what should spawn on the edges.
-    /// </summary>
-    [DataField("edgeEntities")] public List<string?> EdgeEntities = new();
-}
diff --git a/Content.Shared/Procedural/PostGeneration/RoomEntranceDunGen.cs b/Content.Shared/Procedural/PostGeneration/RoomEntranceDunGen.cs
new file mode 100644
index 00000000000..d3b5672dcb0
--- /dev/null
+++ b/Content.Shared/Procedural/PostGeneration/RoomEntranceDunGen.cs
@@ -0,0 +1,11 @@
+namespace Content.Shared.Procedural.PostGeneration;
+
+/// <summary>
+/// Places tiles / entities onto room entrances.
+/// </summary>
+/// <remarks>
+/// DungeonData keys are:
+/// - Entrance
+/// - FallbackTile
+/// </remarks>
+public sealed partial class RoomEntranceDunGen : IDunGenLayer;
diff --git a/Content.Shared/Procedural/PostGeneration/RoomEntrancePostGen.cs b/Content.Shared/Procedural/PostGeneration/RoomEntrancePostGen.cs
deleted file mode 100644
index 5fd78b0540a..00000000000
--- a/Content.Shared/Procedural/PostGeneration/RoomEntrancePostGen.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Content.Shared.Maps;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
-
-namespace Content.Shared.Procedural.PostGeneration;
-
-/// <summary>
-/// Places tiles / entities onto room entrances.
-/// </summary>
-public sealed partial class RoomEntrancePostGen : IPostDunGen
-{
-    [DataField("entities", customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>))]
-    public List<string?> Entities = new()
-    {
-        "CableApcExtension",
-        "AirlockGlass",
-    };
-
-    [DataField("tile", customTypeSerializer:typeof(PrototypeIdSerializer<ContentTileDefinition>))]
-    public string Tile = "FloorSteel";
-}
diff --git a/Content.Shared/Procedural/PostGeneration/SplineDungeonConnectorDunGen.cs b/Content.Shared/Procedural/PostGeneration/SplineDungeonConnectorDunGen.cs
new file mode 100644
index 00000000000..ec8349c671b
--- /dev/null
+++ b/Content.Shared/Procedural/PostGeneration/SplineDungeonConnectorDunGen.cs
@@ -0,0 +1,19 @@
+namespace Content.Shared.Procedural.PostGeneration;
+
+/// <summary>
+/// Connects dungeons via points that get subdivided.
+/// </summary>
+public sealed partial class SplineDungeonConnectorDunGen : IDunGenLayer
+{
+    /// <summary>
+    /// Will divide the distance between the start and end points so that no subdivision is more than these metres away.
+    /// </summary>
+    [DataField]
+    public int DivisionDistance = 10;
+
+    /// <summary>
+    /// How much each subdivision can vary from the middle.
+    /// </summary>
+    [DataField]
+    public float VarianceMax = 0.35f;
+}
diff --git a/Content.Shared/Procedural/PostGeneration/WallMountDunGen.cs b/Content.Shared/Procedural/PostGeneration/WallMountDunGen.cs
new file mode 100644
index 00000000000..a5c790cb22f
--- /dev/null
+++ b/Content.Shared/Procedural/PostGeneration/WallMountDunGen.cs
@@ -0,0 +1,13 @@
+namespace Content.Shared.Procedural.PostGeneration;
+
+/// <summary>
+/// Spawns on the boundary tiles of rooms.
+/// </summary>
+public sealed partial class WallMountDunGen : IDunGenLayer
+{
+    /// <summary>
+    /// Chance per free tile to spawn a wallmount.
+    /// </summary>
+    [DataField]
+    public double Prob = 0.1;
+}
diff --git a/Content.Shared/Procedural/PostGeneration/WallMountPostGen.cs b/Content.Shared/Procedural/PostGeneration/WallMountPostGen.cs
deleted file mode 100644
index 1fbdedf5610..00000000000
--- a/Content.Shared/Procedural/PostGeneration/WallMountPostGen.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Content.Shared.Maps;
-using Content.Shared.Storage;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.Procedural.PostGeneration;
-
-/// <summary>
-/// Spawns on the boundary tiles of rooms.
-/// </summary>
-public sealed partial class WallMountPostGen : IPostDunGen
-{
-    [DataField("tile", customTypeSerializer:typeof(PrototypeIdSerializer<ContentTileDefinition>))]
-    public string Tile = "FloorSteel";
-
-    [DataField("spawns")]
-    public List<EntitySpawnEntry> Spawns = new();
-
-    /// <summary>
-    /// Chance per free tile to spawn a wallmount.
-    /// </summary>
-    [DataField("prob")]
-    public double Prob = 0.1;
-}
diff --git a/Content.Shared/Procedural/PostGeneration/WormCorridorPostGen.cs b/Content.Shared/Procedural/PostGeneration/WormCorridorDunGen.cs
similarity index 73%
rename from Content.Shared/Procedural/PostGeneration/WormCorridorPostGen.cs
rename to Content.Shared/Procedural/PostGeneration/WormCorridorDunGen.cs
index c57d92ef956..b71e845a733 100644
--- a/Content.Shared/Procedural/PostGeneration/WormCorridorPostGen.cs
+++ b/Content.Shared/Procedural/PostGeneration/WormCorridorDunGen.cs
@@ -1,14 +1,10 @@
-using Content.Shared.Maps;
-using Content.Shared.Procedural.DungeonGenerators;
-using Robust.Shared.Prototypes;
-
 namespace Content.Shared.Procedural.PostGeneration;
 
 // Ime a worm
 /// <summary>
 /// Generates worm corridors.
 /// </summary>
-public sealed partial class WormCorridorPostGen : IPostDunGen
+public sealed partial class WormCorridorDunGen : IDunGenLayer
 {
     [DataField]
     public int PathLimit = 2048;
@@ -31,9 +27,6 @@ public sealed partial class WormCorridorPostGen : IPostDunGen
     [DataField]
     public Angle MaxAngleChange = Angle.FromDegrees(45);
 
-    [DataField]
-    public ProtoId<ContentTileDefinition> Tile = "FloorSteel";
-
     /// <summary>
     /// How wide to make the corridor.
     /// </summary>
diff --git a/Content.Shared/Projectiles/ProjectileSpreadComponent.cs b/Content.Shared/Projectiles/ProjectileSpreadComponent.cs
new file mode 100644
index 00000000000..1edffe3ba56
--- /dev/null
+++ b/Content.Shared/Projectiles/ProjectileSpreadComponent.cs
@@ -0,0 +1,32 @@
+using Content.Shared.Weapons.Ranged.Systems;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Projectiles;
+
+/// <summary>
+/// Spawns a spread of the projectiles when fired
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedGunSystem))]
+public sealed partial class ProjectileSpreadComponent : Component
+{
+    /// <summary>
+    /// The entity prototype that will be fired by the rest of the spread.
+    /// Will generally be the same entity prototype as the first projectile being fired.
+    /// Needed for ammo components that do not specify a fired prototype, unlike cartridges.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId Proto;
+
+    /// <summary>
+    /// How much the ammo spreads when shot, in degrees. Does nothing if count is 0.
+    /// </summary>
+    [DataField]
+    public Angle Spread = Angle.FromDegrees(5);
+
+    /// <summary>
+    /// How many prototypes are spawned when shot.
+    /// </summary>
+    [DataField]
+    public int Count = 1;
+}
diff --git a/Content.Shared/Projectiles/SharedProjectileSystem.cs b/Content.Shared/Projectiles/SharedProjectileSystem.cs
index b718c3a6900..1f6f2b6918f 100644
--- a/Content.Shared/Projectiles/SharedProjectileSystem.cs
+++ b/Content.Shared/Projectiles/SharedProjectileSystem.cs
@@ -120,7 +120,10 @@ private void Embed(EntityUid uid, EntityUid target, EntityUid? user, EmbeddableP
 
         if (component.Offset != Vector2.Zero)
         {
-            _transform.SetLocalPosition(uid, xform.LocalPosition + xform.LocalRotation.RotateVec(component.Offset),
+            var rotation = xform.LocalRotation;
+            if (TryComp<ThrowingAngleComponent>(uid, out var throwingAngleComp))
+                rotation += throwingAngleComp.Angle;
+            _transform.SetLocalPosition(uid, xform.LocalPosition + rotation.RotateVec(component.Offset),
                 xform);
         }
 
diff --git a/Content.Shared/ProximityDetection/Components/ProximityDetectorComponent.cs b/Content.Shared/ProximityDetection/Components/ProximityDetectorComponent.cs
index 09cb7f06d5d..7e2bb4dfe62 100644
--- a/Content.Shared/ProximityDetection/Components/ProximityDetectorComponent.cs
+++ b/Content.Shared/ProximityDetection/Components/ProximityDetectorComponent.cs
@@ -10,12 +10,6 @@ namespace Content.Shared.ProximityDetection.Components;
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState ,Access(typeof(ProximityDetectionSystem))]
 public sealed partial class ProximityDetectorComponent : Component
 {
-    /// <summary>
-    /// Whether or not it's on.
-    /// </summary>
-    [DataField, AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)]
-    public bool Enabled = true;
-
     /// <summary>
     /// The criteria used to filter entities
     /// Note: RequireAll is only supported for tags, all components are required to count as a match!
@@ -35,13 +29,13 @@ public sealed partial class ProximityDetectorComponent : Component
     [ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
     public FixedPoint2 Distance = -1;
 
-
     /// <summary>
     /// The farthest distance to search for targets
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
     public FixedPoint2 Range = 10f;
 
+    // TODO: use timespans not this
     public float AccumulatedFrameTime;
 
     [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
diff --git a/Content.Shared/ProximityDetection/Systems/ProximityDetectionSystem.cs b/Content.Shared/ProximityDetection/Systems/ProximityDetectionSystem.cs
index db25e8bc511..df302f94771 100644
--- a/Content.Shared/ProximityDetection/Systems/ProximityDetectionSystem.cs
+++ b/Content.Shared/ProximityDetection/Systems/ProximityDetectionSystem.cs
@@ -1,4 +1,6 @@
-using Content.Shared.ProximityDetection.Components;
+using Content.Shared.Item.ItemToggle;
+using Content.Shared.Item.ItemToggle.Components;
+using Content.Shared.ProximityDetection.Components;
 using Content.Shared.Tag;
 using Robust.Shared.Network;
 
@@ -9,6 +11,7 @@ namespace Content.Shared.ProximityDetection.Systems;
 public sealed class ProximityDetectionSystem : EntitySystem
 {
     [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
+    [Dependency] private readonly ItemToggleSystem _toggle = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly TagSystem _tagSystem = default!;
     [Dependency] private readonly INetManager _net = default!;
@@ -17,10 +20,10 @@ public sealed class ProximityDetectionSystem : EntitySystem
 
     public override void Initialize()
     {
-        SubscribeLocalEvent<ProximityDetectorComponent, EntityPausedEvent>(OnPaused);
-        SubscribeLocalEvent<ProximityDetectorComponent, EntityUnpausedEvent>(OnUnpaused);
-        SubscribeLocalEvent<ProximityDetectorComponent, ComponentInit>(OnCompInit);
+        base.Initialize();
 
+        SubscribeLocalEvent<ProximityDetectorComponent, ComponentInit>(OnCompInit);
+        SubscribeLocalEvent<ProximityDetectorComponent, ItemToggledEvent>(OnToggled);
     }
 
     private void OnCompInit(EntityUid uid, ProximityDetectorComponent component, ComponentInit args)
@@ -30,57 +33,39 @@ private void OnCompInit(EntityUid uid, ProximityDetectorComponent component, Com
         Log.Debug("DetectorComponent only supports requireAll = false for tags. All components are required for a match!");
     }
 
-    private void OnPaused(EntityUid owner, ProximityDetectorComponent component, EntityPausedEvent args)
-    {
-        SetEnable_Internal(owner,component,false);
-    }
-
-    private void OnUnpaused(EntityUid owner, ProximityDetectorComponent detector, ref EntityUnpausedEvent args)
-    {
-        SetEnable_Internal(owner, detector,true);
-    }
-    public void SetEnable(EntityUid owner, bool enabled, ProximityDetectorComponent? detector = null)
-    {
-        if (!Resolve(owner, ref detector) || detector.Enabled == enabled)
-            return;
-        SetEnable_Internal(owner ,detector, enabled);
-    }
-
     public override void Update(float frameTime)
     {
         if (_net.IsClient)
             return;
+
         var query = EntityQueryEnumerator<ProximityDetectorComponent>();
         while (query.MoveNext(out var owner, out var detector))
         {
-            if (!detector.Enabled)
+            if (!_toggle.IsActivated(owner))
                 continue;
+
             detector.AccumulatedFrameTime += frameTime;
             if (detector.AccumulatedFrameTime < detector.UpdateRate)
                 continue;
+
             detector.AccumulatedFrameTime -= detector.UpdateRate;
             RunUpdate_Internal(owner, detector);
         }
     }
 
-    public bool GetEnable(EntityUid owner, ProximityDetectorComponent? detector = null)
+    private void OnToggled(Entity<ProximityDetectorComponent> ent, ref ItemToggledEvent args)
     {
-        return Resolve(owner, ref detector, false) && detector.Enabled;
-    }
-
-    private void SetEnable_Internal(EntityUid owner,ProximityDetectorComponent detector, bool enabled)
-    {
-        detector.Enabled = enabled;
-        var noDetectEvent = new ProximityTargetUpdatedEvent(detector, detector.TargetEnt, detector.Distance);
-        RaiseLocalEvent(owner, ref noDetectEvent);
-        if (!enabled)
+        if (args.Activated)
         {
-            detector.AccumulatedFrameTime = 0;
-            RunUpdate_Internal(owner, detector);
-            Dirty(owner, detector);
+            RunUpdate_Internal(ent, ent.Comp);
             return;
         }
-        RunUpdate_Internal(owner, detector);
+
+        var noDetectEvent = new ProximityTargetUpdatedEvent(ent.Comp, Target: null, ent.Comp.Distance);
+        RaiseLocalEvent(ent, ref noDetectEvent);
+
+        ent.Comp.AccumulatedFrameTime = 0;
+        Dirty(ent, ent.Comp);
     }
 
     public void ForceUpdate(EntityUid owner, ProximityDetectorComponent? detector = null)
@@ -90,11 +75,31 @@ public void ForceUpdate(EntityUid owner, ProximityDetectorComponent? detector =
         RunUpdate_Internal(owner, detector);
     }
 
+    private void ClearTarget(Entity<ProximityDetectorComponent> ent)
+    {
+        var (uid, comp) = ent;
+        if (comp.TargetEnt == null)
+            return;
+
+        comp.Distance = -1;
+        comp.TargetEnt = null;
+        var noDetectEvent = new ProximityTargetUpdatedEvent(comp, null, -1);
+        RaiseLocalEvent(uid, ref noDetectEvent);
+        var newTargetEvent = new NewProximityTargetEvent(comp, null);
+        RaiseLocalEvent(uid, ref newTargetEvent);
+        Dirty(uid, comp);
+    }
 
     private void RunUpdate_Internal(EntityUid owner,ProximityDetectorComponent detector)
     {
         if (!_net.IsServer) //only run detection checks on the server!
             return;
+
+        if (Deleted(detector.TargetEnt))
+        {
+            ClearTarget((owner, detector));
+        }
+
         var xformQuery = GetEntityQuery<TransformComponent>();
         var xform = xformQuery.GetComponent(owner);
         List<(EntityUid TargetEnt, float Distance)> detections = new();
@@ -173,15 +178,7 @@ private void UpdateTargetFromClosest(EntityUid owner, ProximityDetectorComponent
     {
         if (detections.Count == 0)
         {
-            if (detector.TargetEnt == null)
-                return;
-            detector.Distance = -1;
-            detector.TargetEnt = null;
-            var noDetectEvent = new ProximityTargetUpdatedEvent(detector, null, -1);
-            RaiseLocalEvent(owner, ref noDetectEvent);
-            var newTargetEvent = new NewProximityTargetEvent(detector, null);
-            RaiseLocalEvent(owner, ref newTargetEvent);
-            Dirty(owner, detector);
+            ClearTarget((owner, detector));
             return;
         }
         var closestDistance = detections[0].Distance;
@@ -198,6 +195,7 @@ private void UpdateTargetFromClosest(EntityUid owner, ProximityDetectorComponent
         var newData = newTarget || detector.Distance != closestDistance;
         detector.TargetEnt = closestEnt;
         detector.Distance = closestDistance;
+        Dirty(owner, detector);
         if (newTarget)
         {
             var newTargetEvent = new NewProximityTargetEvent(detector, closestEnt);
diff --git a/Content.Shared/RCD/Systems/RCDSystem.cs b/Content.Shared/RCD/Systems/RCDSystem.cs
index 974755f0004..62ad2f3be0d 100644
--- a/Content.Shared/RCD/Systems/RCDSystem.cs
+++ b/Content.Shared/RCD/Systems/RCDSystem.cs
@@ -572,8 +572,6 @@ public bool TryGetMapGridData(EntityCoordinates location, [NotNullWhen(true)] ou
                 return false;
         }
 
-        gridUid = mapGrid.Owner;
-
         var tile = _mapSystem.GetTileRef(gridUid.Value, mapGrid, location);
         var position = _mapSystem.TileIndicesFor(gridUid.Value, mapGrid, location);
         mapGridData = new MapGridData(gridUid.Value, mapGrid, location, tile, position);
diff --git a/Content.Shared/Radio/Components/IntercomComponent.cs b/Content.Shared/Radio/Components/IntercomComponent.cs
index be2734ff168..8d7b87597b1 100644
--- a/Content.Shared/Radio/Components/IntercomComponent.cs
+++ b/Content.Shared/Radio/Components/IntercomComponent.cs
@@ -1,23 +1,32 @@
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Radio.Components;
 
 /// <summary>
 /// Handles intercom ui and is authoritative on the channels an intercom can access.
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
 public sealed partial class IntercomComponent : Component
 {
     /// <summary>
-    /// Does this intercom require popwer to function
+    /// Does this intercom require power to function
     /// </summary>
-    [DataField("requiresPower"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public bool RequiresPower = true;
 
+    [DataField, AutoNetworkedField]
+    public bool SpeakerEnabled;
+
+    [DataField, AutoNetworkedField]
+    public bool MicrophoneEnabled;
+
+    [DataField, AutoNetworkedField]
+    public ProtoId<RadioChannelPrototype>? CurrentChannel;
+
     /// <summary>
     /// The list of radio channel prototypes this intercom can choose between.
     /// </summary>
-    [DataField("supportedChannels", customTypeSerializer: typeof(PrototypeIdListSerializer<RadioChannelPrototype>))]
-    public List<string> SupportedChannels = new();
+    [DataField, AutoNetworkedField]
+    public List<ProtoId<RadioChannelPrototype>> SupportedChannels = new();
 }
diff --git a/Content.Shared/Radio/Components/TelecomExemptComponent.cs b/Content.Shared/Radio/Components/TelecomExemptComponent.cs
new file mode 100644
index 00000000000..7af5c1c78ca
--- /dev/null
+++ b/Content.Shared/Radio/Components/TelecomExemptComponent.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Radio.Components;
+
+/// <summary>
+/// This is used for a radio that doesn't need a telecom server in order to broadcast.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class TelecomExemptComponent : Component;
diff --git a/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs b/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs
index ea07b5f8a5c..7b050273db6 100644
--- a/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs
+++ b/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs
@@ -31,6 +31,7 @@ public sealed partial class EncryptionKeySystem : EntitySystem
     [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedHandsSystem _hands = default!;
+    [Dependency] private readonly SharedWiresSystem _wires = default!;
 
     public override void Initialize()
     {
@@ -150,7 +151,7 @@ private void TryRemoveKey(EntityUid uid, EncryptionKeyHolderComponent component,
             return;
         }
 
-        if (TryComp<WiresPanelComponent>(uid, out var panel) && !panel.Open)
+        if (!_wires.IsPanelOpen(uid))
         {
             _popup.PopupClient(Loc.GetString("encryption-keys-panel-locked"), uid, args.User);
             return;
@@ -184,8 +185,15 @@ private void OnHolderExamined(EntityUid uid, EncryptionKeyHolderComponent compon
 
         if (component.Channels.Count > 0)
         {
-            args.PushMarkup(Loc.GetString("examine-encryption-channels-prefix"));
-            AddChannelsExamine(component.Channels, component.DefaultChannel, args, _protoManager, "examine-encryption-channel");
+            using (args.PushGroup(nameof(EncryptionKeyComponent)))
+            {
+                args.PushMarkup(Loc.GetString("examine-encryption-channels-prefix"));
+                AddChannelsExamine(component.Channels,
+                    component.DefaultChannel,
+                    args,
+                    _protoManager,
+                    "examine-encryption-channel");
+            }
         }
     }
 
@@ -231,14 +239,14 @@ public void AddChannelsExamine(HashSet<string> channels, string? defaultChannel,
             {
                 var msg = Loc.GetString("examine-headset-default-channel",
                 ("prefix", SharedChatSystem.DefaultChannelPrefix),
-                ("channel", defaultChannel),
+                ("channel", proto.LocalizedName),
                 ("color", proto.Color));
                 examineEvent.PushMarkup(msg);
             }
             if (HasComp<EncryptionKeyComponent>(examineEvent.Examined))
             {
                 var msg = Loc.GetString("examine-encryption-default-channel",
-                ("channel", defaultChannel),
+                ("channel", proto.LocalizedName),
                 ("color", proto.Color));
                 examineEvent.PushMarkup(msg);
             }
diff --git a/Content.Shared/Radio/RadioChannelPrototype.cs b/Content.Shared/Radio/RadioChannelPrototype.cs
index cc65f885375..166db0577ea 100644
--- a/Content.Shared/Radio/RadioChannelPrototype.cs
+++ b/Content.Shared/Radio/RadioChannelPrototype.cs
@@ -9,7 +9,7 @@ public sealed partial class RadioChannelPrototype : IPrototype
     /// Human-readable name for the channel.
     /// </summary>
     [DataField("name")]
-    public string Name { get; private set; } = string.Empty;
+    public LocId Name { get; private set; } = string.Empty;
 
     [ViewVariables(VVAccess.ReadOnly)]
     public string LocalizedName => Loc.GetString(Name);
diff --git a/Content.Shared/Radio/SharedIntercom.cs b/Content.Shared/Radio/SharedIntercom.cs
index 410843312fd..f697add8b90 100644
--- a/Content.Shared/Radio/SharedIntercom.cs
+++ b/Content.Shared/Radio/SharedIntercom.cs
@@ -1,4 +1,5 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Radio;
 
@@ -8,23 +9,6 @@ public enum IntercomUiKey
     Key,
 }
 
-[Serializable, NetSerializable]
-public sealed class IntercomBoundUIState : BoundUserInterfaceState
-{
-    public bool MicEnabled;
-    public bool SpeakerEnabled;
-    public List<string> AvailableChannels;
-    public string SelectedChannel;
-
-    public IntercomBoundUIState(bool micEnabled, bool speakerEnabled, List<string> availableChannels, string selectedChannel)
-    {
-        MicEnabled = micEnabled;
-        SpeakerEnabled = speakerEnabled;
-        AvailableChannels = availableChannels;
-        SelectedChannel = selectedChannel;
-    }
-}
-
 [Serializable, NetSerializable]
 public sealed class ToggleIntercomMicMessage : BoundUserInterfaceMessage
 {
diff --git a/Content.Shared/Random/Helpers/SharedRandomExtensions.cs b/Content.Shared/Random/Helpers/SharedRandomExtensions.cs
index 0b618a262db..376e91743d0 100644
--- a/Content.Shared/Random/Helpers/SharedRandomExtensions.cs
+++ b/Content.Shared/Random/Helpers/SharedRandomExtensions.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Shared.Dataset;
 using Content.Shared.FixedPoint;
@@ -87,6 +88,26 @@ public static T Pick<T>(this IRobustRandom random, Dictionary<T, float> weights)
             throw new InvalidOperationException("Invalid weighted pick");
         }
 
+        public static T PickAndTake<T>(this IRobustRandom random, Dictionary<T, float> weights)
+            where T : notnull
+        {
+            var pick = Pick(random, weights);
+            weights.Remove(pick);
+            return pick;
+        }
+
+        public static bool TryPickAndTake<T>(this IRobustRandom random, Dictionary<T, float> weights, [NotNullWhen(true)] out T? pick)
+            where T : notnull
+        {
+            if (weights.Count == 0)
+            {
+                pick = default;
+                return false;
+            }
+            pick = PickAndTake(random, weights);
+            return true;
+        }
+
         public static (string reagent, FixedPoint2 quantity) Pick(this WeightedRandomFillSolutionPrototype prototype, IRobustRandom? random = null)
         {
             var randomFill = prototype.PickRandomFill(random);
diff --git a/Content.Shared/Random/Rules/AlwaysTrue.cs b/Content.Shared/Random/Rules/AlwaysTrue.cs
new file mode 100644
index 00000000000..98b81fae793
--- /dev/null
+++ b/Content.Shared/Random/Rules/AlwaysTrue.cs
@@ -0,0 +1,12 @@
+namespace Content.Shared.Random.Rules;
+
+/// <summary>
+/// Always returns true. Used for fallbacks.
+/// </summary>
+public sealed partial class AlwaysTrueRule : RulesRule
+{
+    public override bool Check(EntityManager entManager, EntityUid uid)
+    {
+        return !Inverted;
+    }
+}
diff --git a/Content.Shared/Random/Rules/GridInRange.cs b/Content.Shared/Random/Rules/GridInRange.cs
new file mode 100644
index 00000000000..8cbbef1cdc2
--- /dev/null
+++ b/Content.Shared/Random/Rules/GridInRange.cs
@@ -0,0 +1,39 @@
+using System.Numerics;
+using Robust.Shared.Map;
+
+namespace Content.Shared.Random.Rules;
+
+/// <summary>
+/// Returns true if on a grid or in range of one.
+/// </summary>
+public sealed partial class GridInRangeRule : RulesRule
+{
+    [DataField]
+    public float Range = 10f;
+
+    public override bool Check(EntityManager entManager, EntityUid uid)
+    {
+        if (!entManager.TryGetComponent(uid, out TransformComponent? xform))
+        {
+            return false;
+        }
+
+        if (xform.GridUid != null)
+        {
+            return !Inverted;
+        }
+
+        var transform = entManager.System<SharedTransformSystem>();
+        var mapManager = IoCManager.Resolve<IMapManager>();
+
+        var worldPos = transform.GetWorldPosition(xform);
+        var gridRange = new Vector2(Range, Range);
+
+        foreach (var _ in mapManager.FindGridsIntersecting(xform.MapID, new Box2(worldPos - gridRange, worldPos + gridRange)))
+        {
+            return !Inverted;
+        }
+
+        return false;
+    }
+}
diff --git a/Content.Shared/Random/Rules/InSpace.cs b/Content.Shared/Random/Rules/InSpace.cs
new file mode 100644
index 00000000000..8163e1f6be9
--- /dev/null
+++ b/Content.Shared/Random/Rules/InSpace.cs
@@ -0,0 +1,18 @@
+namespace Content.Shared.Random.Rules;
+
+/// <summary>
+/// Returns true if the attached entity is in space.
+/// </summary>
+public sealed partial class InSpaceRule : RulesRule
+{
+    public override bool Check(EntityManager entManager, EntityUid uid)
+    {
+        if (!entManager.TryGetComponent(uid, out TransformComponent? xform) ||
+            xform.GridUid != null)
+        {
+            return Inverted;
+        }
+
+        return !Inverted;
+    }
+}
diff --git a/Content.Shared/Random/Rules/NearbyAccess.cs b/Content.Shared/Random/Rules/NearbyAccess.cs
new file mode 100644
index 00000000000..2a8ad077c6e
--- /dev/null
+++ b/Content.Shared/Random/Rules/NearbyAccess.cs
@@ -0,0 +1,77 @@
+using Content.Shared.Access;
+using Content.Shared.Access.Components;
+using Content.Shared.Access.Systems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Random.Rules;
+
+/// <summary>
+/// Checks for an entity nearby with the specified access.
+/// </summary>
+public sealed partial class NearbyAccessRule : RulesRule
+{
+    // This exists because of door electronics contained inside doors.
+    /// <summary>
+    /// Does the access entity need to be anchored.
+    /// </summary>
+    [DataField]
+    public bool Anchored = true;
+
+    /// <summary>
+    /// Count of entities that need to be nearby.
+    /// </summary>
+    [DataField]
+    public int Count = 1;
+
+    [DataField(required: true)]
+    public List<ProtoId<AccessLevelPrototype>> Access = new();
+
+    [DataField]
+    public float Range = 10f;
+
+    public override bool Check(EntityManager entManager, EntityUid uid)
+    {
+        var xformQuery = entManager.GetEntityQuery<TransformComponent>();
+
+        if (!xformQuery.TryGetComponent(uid, out var xform) ||
+            xform.MapUid == null)
+        {
+            return false;
+        }
+
+        var transform = entManager.System<SharedTransformSystem>();
+        var lookup = entManager.System<EntityLookupSystem>();
+        var reader = entManager.System<AccessReaderSystem>();
+
+        var found = false;
+        var worldPos = transform.GetWorldPosition(xform, xformQuery);
+        var count = 0;
+
+        // TODO: Update this when we get the callback version
+        var entities = new HashSet<Entity<AccessReaderComponent>>();
+        lookup.GetEntitiesInRange(xform.MapID, worldPos, Range, entities);
+        foreach (var comp in entities)
+        {
+            if (!reader.AreAccessTagsAllowed(Access, comp) ||
+                Anchored &&
+                (!xformQuery.TryGetComponent(comp, out var compXform) ||
+                 !compXform.Anchored))
+            {
+                continue;
+            }
+
+            count++;
+
+            if (count < Count)
+                continue;
+
+            found = true;
+            break;
+        }
+
+        if (!found)
+            return Inverted;
+
+        return !Inverted;
+    }
+}
diff --git a/Content.Shared/Random/Rules/NearbyComponents.cs b/Content.Shared/Random/Rules/NearbyComponents.cs
new file mode 100644
index 00000000000..13108e88d6c
--- /dev/null
+++ b/Content.Shared/Random/Rules/NearbyComponents.cs
@@ -0,0 +1,71 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Random.Rules;
+
+public sealed partial class NearbyComponentsRule : RulesRule
+{
+    /// <summary>
+    /// Does the entity need to be anchored.
+    /// </summary>
+    [DataField]
+    public bool Anchored;
+
+    [DataField]
+    public int Count;
+
+    [DataField(required: true)]
+    public ComponentRegistry Components = default!;
+
+    [DataField]
+    public float Range = 10f;
+
+    public override bool Check(EntityManager entManager, EntityUid uid)
+    {
+        var inRange = new HashSet<Entity<IComponent>>();
+        var xformQuery = entManager.GetEntityQuery<TransformComponent>();
+
+        if (!xformQuery.TryGetComponent(uid, out var xform) ||
+            xform.MapUid == null)
+        {
+            return false;
+        }
+
+        var transform = entManager.System<SharedTransformSystem>();
+        var lookup = entManager.System<EntityLookupSystem>();
+
+        var found = false;
+        var worldPos = transform.GetWorldPosition(xform);
+        var count = 0;
+
+        foreach (var compType in Components.Values)
+        {
+            inRange.Clear();
+            lookup.GetEntitiesInRange(compType.Component.GetType(), xform.MapID, worldPos, Range, inRange);
+            foreach (var comp in inRange)
+            {
+                if (Anchored &&
+                    (!xformQuery.TryGetComponent(comp, out var compXform) ||
+                     !compXform.Anchored))
+                {
+                    continue;
+                }
+
+                count++;
+
+                if (count < Count)
+                    continue;
+
+                found = true;
+                break;
+            }
+
+            if (found)
+                break;
+        }
+
+        if (!found)
+            return Inverted;
+
+        return !Inverted;
+    }
+}
diff --git a/Content.Shared/Random/Rules/NearbyEntities.cs b/Content.Shared/Random/Rules/NearbyEntities.cs
new file mode 100644
index 00000000000..0754750bc47
--- /dev/null
+++ b/Content.Shared/Random/Rules/NearbyEntities.cs
@@ -0,0 +1,58 @@
+using Content.Shared.Whitelist;
+
+namespace Content.Shared.Random.Rules;
+
+/// <summary>
+/// Checks for entities matching the whitelist in range.
+/// This is more expensive than <see cref="NearbyComponentsRule"/> so prefer that!
+/// </summary>
+public sealed partial class NearbyEntitiesRule : RulesRule
+{
+    /// <summary>
+    /// How many of the entity need to be nearby.
+    /// </summary>
+    [DataField]
+    public int Count = 1;
+
+    [DataField(required: true)]
+    public EntityWhitelist Whitelist = new();
+
+    [DataField]
+    public float Range = 10f;
+
+    public override bool Check(EntityManager entManager, EntityUid uid)
+    {
+        if (!entManager.TryGetComponent(uid, out TransformComponent? xform) ||
+            xform.MapUid == null)
+        {
+            return false;
+        }
+
+        var transform = entManager.System<SharedTransformSystem>();
+        var lookup = entManager.System<EntityLookupSystem>();
+        var whitelistSystem = entManager.System<EntityWhitelistSystem>();
+
+        var found = false;
+        var worldPos = transform.GetWorldPosition(xform);
+        var count = 0;
+
+        foreach (var ent in lookup.GetEntitiesInRange(xform.MapID, worldPos, Range))
+        {
+            if (whitelistSystem.IsWhitelistFail(Whitelist, ent))
+                continue;
+
+            count++;
+
+            if (count < Count)
+                continue;
+
+            found = true;
+            break;
+        }
+
+        if (!found)
+            return Inverted;
+
+        return !Inverted;
+    }
+}
diff --git a/Content.Shared/Random/Rules/NearbyTilesPercent.cs b/Content.Shared/Random/Rules/NearbyTilesPercent.cs
new file mode 100644
index 00000000000..465ac8dc5c6
--- /dev/null
+++ b/Content.Shared/Random/Rules/NearbyTilesPercent.cs
@@ -0,0 +1,79 @@
+using Content.Shared.Maps;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Random.Rules;
+
+public sealed partial class NearbyTilesPercentRule : RulesRule
+{
+    /// <summary>
+    /// If there are anchored entities on the tile do we ignore the tile.
+    /// </summary>
+    [DataField]
+    public bool IgnoreAnchored;
+
+    [DataField(required: true)]
+    public float Percent;
+
+    [DataField(required: true)]
+    public List<ProtoId<ContentTileDefinition>> Tiles = new();
+
+    [DataField]
+    public float Range = 10f;
+
+    public override bool Check(EntityManager entManager, EntityUid uid)
+    {
+        if (!entManager.TryGetComponent(uid, out TransformComponent? xform) ||
+            !entManager.TryGetComponent<MapGridComponent>(xform.GridUid, out var grid))
+        {
+            return false;
+        }
+
+        var transform = entManager.System<SharedTransformSystem>();
+        var tileDef = IoCManager.Resolve<ITileDefinitionManager>();
+
+        var physicsQuery = entManager.GetEntityQuery<PhysicsComponent>();
+        var tileCount = 0;
+        var matchingTileCount = 0;
+
+        foreach (var tile in grid.GetTilesIntersecting(new Circle(transform.GetWorldPosition(xform),
+                     Range)))
+        {
+            // Only consider collidable anchored (for reasons some subfloor stuff has physics but non-collidable)
+            if (IgnoreAnchored)
+            {
+                var gridEnum = grid.GetAnchoredEntitiesEnumerator(tile.GridIndices);
+                var found = false;
+
+                while (gridEnum.MoveNext(out var ancUid))
+                {
+                    if (!physicsQuery.TryGetComponent(ancUid, out var physics) ||
+                        !physics.CanCollide)
+                    {
+                        continue;
+                    }
+
+                    found = true;
+                    break;
+                }
+
+                if (found)
+                    continue;
+            }
+
+            tileCount++;
+
+            if (!Tiles.Contains(tileDef[tile.Tile.TypeId].ID))
+                continue;
+
+            matchingTileCount++;
+        }
+
+        if (tileCount == 0 || matchingTileCount / (float) tileCount < Percent)
+            return Inverted;
+
+        return !Inverted;
+    }
+}
diff --git a/Content.Shared/Random/Rules/OnMapGrid.cs b/Content.Shared/Random/Rules/OnMapGrid.cs
new file mode 100644
index 00000000000..bea841872eb
--- /dev/null
+++ b/Content.Shared/Random/Rules/OnMapGrid.cs
@@ -0,0 +1,19 @@
+namespace Content.Shared.Random.Rules;
+
+/// <summary>
+/// Returns true if griduid and mapuid match (AKA on 'planet').
+/// </summary>
+public sealed partial class OnMapGridRule : RulesRule
+{
+    public override bool Check(EntityManager entManager, EntityUid uid)
+    {
+        if (!entManager.TryGetComponent(uid, out TransformComponent? xform) ||
+            xform.GridUid != xform.MapUid ||
+            xform.MapUid == null)
+        {
+            return Inverted;
+        }
+
+        return !Inverted;
+    }
+}
diff --git a/Content.Shared/Random/Rules/RulesSystem.cs b/Content.Shared/Random/Rules/RulesSystem.cs
new file mode 100644
index 00000000000..1957beab510
--- /dev/null
+++ b/Content.Shared/Random/Rules/RulesSystem.cs
@@ -0,0 +1,39 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Random.Rules;
+
+/// <summary>
+/// Rules-based item selection. Can be used for any sort of conditional selection
+/// Every single condition needs to be true for this to be selected.
+/// e.g. "choose maintenance audio if 90% of tiles nearby are maintenance tiles"
+/// </summary>
+[Prototype("rules")]
+public sealed partial class RulesPrototype : IPrototype
+{
+    [IdDataField] public string ID { get; } = string.Empty;
+
+    [DataField("rules", required: true)]
+    public List<RulesRule> Rules = new();
+}
+
+[ImplicitDataDefinitionForInheritors]
+public abstract partial class RulesRule
+{
+    [DataField]
+    public bool Inverted;
+    public abstract bool Check(EntityManager entManager, EntityUid uid);
+}
+
+public sealed class RulesSystem : EntitySystem
+{
+    public bool IsTrue(EntityUid uid, RulesPrototype rules)
+    {
+        foreach (var rule in rules.Rules)
+        {
+            if (!rule.Check(EntityManager, uid))
+                return false;
+        }
+
+        return true;
+    }
+}
diff --git a/Content.Shared/Random/RulesPrototype.cs b/Content.Shared/Random/RulesPrototype.cs
deleted file mode 100644
index 20961af8e72..00000000000
--- a/Content.Shared/Random/RulesPrototype.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-using Content.Shared.Access;
-using Content.Shared.Maps;
-using Content.Shared.Whitelist;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
-
-namespace Content.Shared.Random;
-
-/// <summary>
-/// Rules-based item selection. Can be used for any sort of conditional selection
-/// Every single condition needs to be true for this to be selected.
-/// e.g. "choose maintenance audio if 90% of tiles nearby are maintenance tiles"
-/// </summary>
-[Prototype("rules")]
-public sealed partial class RulesPrototype : IPrototype
-{
-    [IdDataField] public string ID { get; } = string.Empty;
-
-    [DataField("rules", required: true)]
-    public List<RulesRule> Rules = new();
-}
-
-[ImplicitDataDefinitionForInheritors]
-public abstract partial class RulesRule
-{
-
-}
-
-/// <summary>
-/// Returns true if the attached entity is in space.
-/// </summary>
-public sealed partial class InSpaceRule : RulesRule
-{
-
-}
-
-/// <summary>
-/// Checks for entities matching the whitelist in range.
-/// This is more expensive than <see cref="NearbyComponentsRule"/> so prefer that!
-/// </summary>
-public sealed partial class NearbyEntitiesRule : RulesRule
-{
-    /// <summary>
-    /// How many of the entity need to be nearby.
-    /// </summary>
-    [DataField("count")]
-    public int Count = 1;
-
-    [DataField("whitelist", required: true)]
-    public EntityWhitelist Whitelist = new();
-
-    [DataField("range")]
-    public float Range = 10f;
-}
-
-public sealed partial class NearbyTilesPercentRule : RulesRule
-{
-    /// <summary>
-    /// If there are anchored entities on the tile do we ignore the tile.
-    /// </summary>
-    [DataField("ignoreAnchored")] public bool IgnoreAnchored;
-
-    [DataField("percent", required: true)]
-    public float Percent;
-
-    [DataField("tiles", required: true, customTypeSerializer:typeof(PrototypeIdListSerializer<ContentTileDefinition>))]
-    public List<string> Tiles = new();
-
-    [DataField("range")]
-    public float Range = 10f;
-}
-
-/// <summary>
-/// Always returns true. Used for fallbacks.
-/// </summary>
-public sealed partial class AlwaysTrueRule : RulesRule
-{
-
-}
-
-/// <summary>
-/// Returns true if on a grid or in range of one.
-/// </summary>
-public sealed partial class GridInRangeRule : RulesRule
-{
-    [DataField("range")]
-    public float Range = 10f;
-
-    [DataField("inverted")]
-    public bool Inverted = false;
-}
-
-/// <summary>
-/// Returns true if griduid and mapuid match (AKA on 'planet').
-/// </summary>
-public sealed partial class OnMapGridRule : RulesRule
-{
-
-}
-
-/// <summary>
-/// Checks for an entity nearby with the specified access.
-/// </summary>
-public sealed partial class NearbyAccessRule : RulesRule
-{
-    // This exists because of doorelectronics contained inside doors.
-    /// <summary>
-    /// Does the access entity need to be anchored.
-    /// </summary>
-    [DataField("anchored")]
-    public bool Anchored = true;
-
-    /// <summary>
-    /// Count of entities that need to be nearby.
-    /// </summary>
-    [DataField("count")]
-    public int Count = 1;
-
-    [DataField("access", required: true)]
-    public List<ProtoId<AccessLevelPrototype>> Access = new();
-
-    [DataField("range")]
-    public float Range = 10f;
-}
-
-public sealed partial class NearbyComponentsRule : RulesRule
-{
-    /// <summary>
-    /// Does the entity need to be anchored.
-    /// </summary>
-    [DataField("anchored")]
-    public bool Anchored;
-
-    [DataField("count")] public int Count;
-
-    [DataField("components", required: true)]
-    public ComponentRegistry Components = default!;
-
-    [DataField("range")]
-    public float Range = 10f;
-}
diff --git a/Content.Shared/Random/RulesSystem.cs b/Content.Shared/Random/RulesSystem.cs
deleted file mode 100644
index 58d67c268e3..00000000000
--- a/Content.Shared/Random/RulesSystem.cs
+++ /dev/null
@@ -1,247 +0,0 @@
-using System.Numerics;
-using Content.Shared.Access.Components;
-using Content.Shared.Access.Systems;
-using Content.Shared.Whitelist;
-using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
-using Robust.Shared.Physics.Components;
-
-namespace Content.Shared.Random;
-
-public sealed class RulesSystem : EntitySystem
-{
-    [Dependency] private readonly IMapManager _mapManager = default!;
-    [Dependency] private readonly ITileDefinitionManager _tileDef = default!;
-    [Dependency] private readonly AccessReaderSystem _reader = default!;
-    [Dependency] private readonly EntityLookupSystem _lookup = default!;
-    [Dependency] private readonly SharedTransformSystem _transform = default!;
-    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
-    public bool IsTrue(EntityUid uid, RulesPrototype rules)
-    {
-        var inRange = new HashSet<Entity<IComponent>>();
-        foreach (var rule in rules.Rules)
-        {
-            switch (rule)
-            {
-                case AlwaysTrueRule:
-                    break;
-                case GridInRangeRule griddy:
-                {
-                    if (!TryComp(uid, out TransformComponent? xform))
-                    {
-                        return false;
-                    }
-
-                    if (xform.GridUid != null)
-                    {
-                        return !griddy.Inverted;
-                    }
-
-                    var worldPos = _transform.GetWorldPosition(xform);
-                    var gridRange = new Vector2(griddy.Range, griddy.Range);
-
-                    foreach (var _ in _mapManager.FindGridsIntersecting(
-                                 xform.MapID,
-                                 new Box2(worldPos - gridRange, worldPos + gridRange)))
-                    {
-                        return !griddy.Inverted;
-                    }
-
-                    break;
-                }
-                case InSpaceRule:
-                {
-                    if (!TryComp(uid, out TransformComponent? xform) ||
-                        xform.GridUid != null)
-                    {
-                        return false;
-                    }
-
-                    break;
-                }
-                case NearbyAccessRule access:
-                {
-                    var xformQuery = GetEntityQuery<TransformComponent>();
-
-                    if (!xformQuery.TryGetComponent(uid, out var xform) ||
-                        xform.MapUid == null)
-                    {
-                        return false;
-                    }
-
-                    var found = false;
-                    var worldPos = _transform.GetWorldPosition(xform, xformQuery);
-                    var count = 0;
-
-                    // TODO: Update this when we get the callback version
-                    var entities = new HashSet<Entity<AccessReaderComponent>>();
-                    _lookup.GetEntitiesInRange(xform.MapID, worldPos, access.Range, entities);
-                    foreach (var comp in entities)
-                    {
-                        if (!_reader.AreAccessTagsAllowed(access.Access, comp) ||
-                            access.Anchored &&
-                            (!xformQuery.TryGetComponent(comp, out var compXform) ||
-                             !compXform.Anchored))
-                        {
-                            continue;
-                        }
-
-                        count++;
-
-                        if (count < access.Count)
-                            continue;
-
-                        found = true;
-                        break;
-                    }
-
-                    if (!found)
-                        return false;
-
-                    break;
-                }
-                case NearbyComponentsRule nearbyComps:
-                {
-                    var xformQuery = GetEntityQuery<TransformComponent>();
-
-                    if (!xformQuery.TryGetComponent(uid, out var xform) ||
-                        xform.MapUid == null)
-                    {
-                        return false;
-                    }
-
-                    var found = false;
-                    var worldPos = _transform.GetWorldPosition(xform);
-                    var count = 0;
-
-                    foreach (var compType in nearbyComps.Components.Values)
-                    {
-                        inRange.Clear();
-                        _lookup.GetEntitiesInRange(compType.Component.GetType(), xform.MapID, worldPos, nearbyComps.Range, inRange);
-                        foreach (var comp in inRange)
-                        {
-                            if (nearbyComps.Anchored &&
-                                (!xformQuery.TryGetComponent(comp, out var compXform) ||
-                                 !compXform.Anchored))
-                            {
-                                continue;
-                            }
-
-                            count++;
-
-                            if (count < nearbyComps.Count)
-                                continue;
-
-                            found = true;
-                            break;
-                        }
-
-                        if (found)
-                            break;
-                    }
-
-                    if (!found)
-                        return false;
-
-                    break;
-                }
-                case NearbyEntitiesRule entity:
-                {
-                    if (!TryComp(uid, out TransformComponent? xform) ||
-                        xform.MapUid == null)
-                    {
-                        return false;
-                    }
-
-                    var found = false;
-                    var worldPos = _transform.GetWorldPosition(xform);
-                    var count = 0;
-
-                    foreach (var ent in _lookup.GetEntitiesInRange(xform.MapID, worldPos, entity.Range))
-                    {
-                        if (_whitelistSystem.IsWhitelistFail(entity.Whitelist, ent))
-                            continue;
-
-                        count++;
-
-                        if (count < entity.Count)
-                            continue;
-
-                        found = true;
-                        break;
-                    }
-
-                    if (!found)
-                        return false;
-
-                    break;
-                }
-                case NearbyTilesPercentRule tiles:
-                {
-                    if (!TryComp(uid, out TransformComponent? xform) ||
-                        !TryComp<MapGridComponent>(xform.GridUid, out var grid))
-                    {
-                        return false;
-                    }
-
-                    var physicsQuery = GetEntityQuery<PhysicsComponent>();
-                    var tileCount = 0;
-                    var matchingTileCount = 0;
-
-                    foreach (var tile in grid.GetTilesIntersecting(new Circle(_transform.GetWorldPosition(xform),
-                                 tiles.Range)))
-                    {
-                        // Only consider collidable anchored (for reasons some subfloor stuff has physics but non-collidable)
-                        if (tiles.IgnoreAnchored)
-                        {
-                            var gridEnum = grid.GetAnchoredEntitiesEnumerator(tile.GridIndices);
-                            var found = false;
-
-                            while (gridEnum.MoveNext(out var ancUid))
-                            {
-                                if (!physicsQuery.TryGetComponent(ancUid, out var physics) ||
-                                    !physics.CanCollide)
-                                {
-                                    continue;
-                                }
-
-                                found = true;
-                                break;
-                            }
-
-                            if (found)
-                                continue;
-                        }
-
-                        tileCount++;
-
-                        if (!tiles.Tiles.Contains(_tileDef[tile.Tile.TypeId].ID))
-                            continue;
-
-                        matchingTileCount++;
-                    }
-
-                    if (tileCount == 0 || matchingTileCount / (float) tileCount < tiles.Percent)
-                        return false;
-
-                    break;
-                }
-                case OnMapGridRule:
-                {
-                    if (!TryComp(uid, out TransformComponent? xform) ||
-                        xform.GridUid != xform.MapUid ||
-                        xform.MapUid == null)
-                    {
-                        return false;
-                    }
-
-                    break;
-                }
-                default:
-                    throw new NotImplementedException();
-            }
-        }
-
-        return true;
-    }
-}
diff --git a/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs b/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs
index 8b0c866cbe3..40c20df3437 100644
--- a/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs
+++ b/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs
@@ -1,101 +1,58 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.FixedPoint;
 using Content.Shared.Lathe.Prototypes;
 using Content.Shared.Materials;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Research.Prototypes
 {
-    [NetSerializable, Serializable, Prototype("latheRecipe")]
+    [NetSerializable, Serializable, Prototype]
     public sealed partial class LatheRecipePrototype : IPrototype
     {
         [ViewVariables]
         [IdDataField]
         public string ID { get; private set; } = default!;
 
-        [DataField("name")]
-        private string _name = string.Empty;
+        /// <summary>
+        ///     Name displayed in the lathe GUI.
+        /// </summary>
+        [DataField]
+        public LocId? Name;
 
-        [DataField("description")]
-        private string _description = string.Empty;
+        /// <summary>
+        ///     Short description displayed in the lathe GUI.
+        /// </summary>
+        [DataField]
+        public LocId? Description;
 
         /// <summary>
         ///     The prototype name of the resulting entity when the recipe is printed.
         /// </summary>
-        [DataField("result", required: true, customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
-        public string Result = string.Empty;
+        [DataField]
+        public EntProtoId? Result;
+
+        [DataField]
+        public Dictionary<ProtoId<ReagentPrototype>, FixedPoint2>? ResultReagents;
 
         /// <summary>
         ///     An entity whose sprite is displayed in the ui in place of the actual recipe result.
         /// </summary>
-        [DataField("icon")]
+        [DataField]
         public SpriteSpecifier? Icon;
 
         [DataField("completetime")]
-        private TimeSpan _completeTime = TimeSpan.FromSeconds(5);
-
-        [DataField("materials", customTypeSerializer: typeof(PrototypeIdDictionarySerializer<int, MaterialPrototype>))]
-        private Dictionary<string, int> _requiredMaterials = new();
-
-        //todo make these function calls because we're eating tons of resolves here.
-        /// <summary>
-        ///     Name displayed in the lathe GUI.
-        /// </summary>
-        [ViewVariables]
-        public string Name
-        {
-            get
-            {
-                if (_name.Trim().Length != 0)
-                    return _name;
-                var protoMan = IoCManager.Resolve<IPrototypeManager>();
-                protoMan.TryIndex(Result, out EntityPrototype? prototype);
-                if (prototype?.Name != null)
-                    _name = prototype.Name;
-                return _name;
-            }
-        }
-
-        /// <summary>
-        ///     Short description displayed in the lathe GUI.
-        /// </summary>
-        [ViewVariables]
-        public string Description
-        {
-            get
-            {
-                if (_description.Trim().Length != 0)
-                    return _description;
-                var protoMan = IoCManager.Resolve<IPrototypeManager>();
-                protoMan.TryIndex(Result, out EntityPrototype? prototype);
-                if (prototype?.Description != null)
-                    _description = prototype.Description;
-                return _description;
-            }
-        }
+        public TimeSpan CompleteTime = TimeSpan.FromSeconds(5);
 
         /// <summary>
         ///     The materials required to produce this recipe.
         ///     Takes a material ID as string.
         /// </summary>
-        [ViewVariables]
-        public Dictionary<string, int> RequiredMaterials
-        {
-            get => _requiredMaterials;
-            private set => _requiredMaterials = value;
-        }
-
-
-        /// <summary>
-        ///     How many milliseconds it'll take for the lathe to finish this recipe.
-        ///     Might lower depending on the lathe's upgrade level.
-        /// </summary>
-        [ViewVariables]
-        public TimeSpan CompleteTime => _completeTime;
+        [DataField]
+        public Dictionary<ProtoId<MaterialPrototype>, int> Materials = new();
 
-        [DataField("applyMaterialDiscount")]
+        [DataField]
         public bool ApplyMaterialDiscount = true;
 
         /// <summary>
diff --git a/Content.Shared/Research/Systems/SharedResearchSystem.cs b/Content.Shared/Research/Systems/SharedResearchSystem.cs
index 81c6950f283..d8ce0634d3e 100644
--- a/Content.Shared/Research/Systems/SharedResearchSystem.cs
+++ b/Content.Shared/Research/Systems/SharedResearchSystem.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using Content.Shared.Lathe;
 using Content.Shared.Research.Components;
 using Content.Shared.Research.Prototypes;
 using JetBrains.Annotations;
@@ -12,6 +13,7 @@ public abstract class SharedResearchSystem : EntitySystem
 {
     [Dependency] protected readonly IPrototypeManager PrototypeManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedLatheSystem _lathe = default!;
 
     public override void Initialize()
     {
@@ -185,7 +187,7 @@ public FormattedMessage GetTechnologyDescription(
             var recipeProto = PrototypeManager.Index(recipe);
             description.PushNewline();
             description.AddMarkup(Loc.GetString("research-console-unlocks-list-entry",
-                ("name",recipeProto.Name)));
+                ("name", _lathe.GetRecipeName(recipeProto))));
         }
         foreach (var generic in technology.GenericUnlocks)
         {
diff --git a/Content.Shared/Research/TechnologyDisk/Systems/TechnologyDiskSystem.cs b/Content.Shared/Research/TechnologyDisk/Systems/TechnologyDiskSystem.cs
index b0d615fcb3b..93c7c22471c 100644
--- a/Content.Shared/Research/TechnologyDisk/Systems/TechnologyDiskSystem.cs
+++ b/Content.Shared/Research/TechnologyDisk/Systems/TechnologyDiskSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
+using Content.Shared.Lathe;
 using Content.Shared.Popups;
 using Content.Shared.Random.Helpers;
 using Content.Shared.Research.Components;
@@ -19,6 +20,7 @@ public sealed class TechnologyDiskSystem : EntitySystem
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedResearchSystem _research = default!;
+    [Dependency] private readonly SharedLatheSystem _lathe = default!;
 
     public override void Initialize()
     {
@@ -83,8 +85,7 @@ private void OnExamine(Entity<TechnologyDiskComponent> ent, ref ExaminedEvent ar
         if (ent.Comp.Recipes != null && ent.Comp.Recipes.Count > 0)
         {
             var prototype = _protoMan.Index(ent.Comp.Recipes[0]);
-            var resultPrototype = _protoMan.Index<EntityPrototype>(prototype.Result);
-            message = Loc.GetString("tech-disk-examine", ("result", resultPrototype.Name));
+            message = Loc.GetString("tech-disk-examine", ("result", _lathe.GetRecipeName(prototype)));
 
             if (ent.Comp.Recipes.Count > 1) //idk how to do this well. sue me.
                 message += " " + Loc.GetString("tech-disk-examine-more");
diff --git a/Content.Shared/Revolutionary/Components/HeadRevolutionaryComponent.cs b/Content.Shared/Revolutionary/Components/HeadRevolutionaryComponent.cs
index ef2bad65e0d..12589850e66 100644
--- a/Content.Shared/Revolutionary/Components/HeadRevolutionaryComponent.cs
+++ b/Content.Shared/Revolutionary/Components/HeadRevolutionaryComponent.cs
@@ -15,7 +15,7 @@ public sealed partial class HeadRevolutionaryComponent : Component
     /// The status icon corresponding to the head revolutionary.
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public ProtoId<StatusIconPrototype> StatusIcon { get; set; } = "HeadRevolutionaryFaction";
+    public ProtoId<FactionIconPrototype> StatusIcon { get; set; } = "HeadRevolutionaryFaction";
 
     /// <summary>
     /// How long the stun will last after the user is converted.
diff --git a/Content.Shared/Revolutionary/Components/RevolutionaryComponent.cs b/Content.Shared/Revolutionary/Components/RevolutionaryComponent.cs
index 1f6b45ddea1..513e8897bdc 100644
--- a/Content.Shared/Revolutionary/Components/RevolutionaryComponent.cs
+++ b/Content.Shared/Revolutionary/Components/RevolutionaryComponent.cs
@@ -16,7 +16,7 @@ public sealed partial class RevolutionaryComponent : Component
     /// The status icon prototype displayed for revolutionaries
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public ProtoId<StatusIconPrototype> StatusIcon { get; set; } = "RevolutionaryFaction";
+    public ProtoId<FactionIconPrototype> StatusIcon { get; set; } = "RevolutionaryFaction";
 
     /// <summary>
     /// Sound that plays when you are chosen as Rev. (Placeholder until I find something cool I guess)
diff --git a/Content.Shared/Roles/DepartmentPrototype.cs b/Content.Shared/Roles/DepartmentPrototype.cs
index d6288bec909..5c94c90f8b3 100644
--- a/Content.Shared/Roles/DepartmentPrototype.cs
+++ b/Content.Shared/Roles/DepartmentPrototype.cs
@@ -9,10 +9,16 @@ public sealed partial class DepartmentPrototype : IPrototype
     public string ID { get; } = string.Empty;
 
     /// <summary>
-    /// A description string to display in the character menu as an explanation of the department's function.
+    /// The name LocId of the department that will be displayed in the various menus.
     /// </summary>
     [DataField(required: true)]
-    public string Description = string.Empty;
+    public LocId Name = string.Empty;
+
+    /// <summary>
+    /// A description LocId to display in the character menu as an explanation of the department's function.
+    /// </summary>
+    [DataField(required: true)]
+    public LocId Description = string.Empty;
 
     /// <summary>
     /// A color representing this department to use for text.
diff --git a/Content.Shared/Roles/JobPrototype.cs b/Content.Shared/Roles/JobPrototype.cs
index 78d51099c22..aaee796a78b 100644
--- a/Content.Shared/Roles/JobPrototype.cs
+++ b/Content.Shared/Roles/JobPrototype.cs
@@ -93,8 +93,8 @@ public sealed partial class JobPrototype : IPrototype
         [DataField("antagAdvantage")]
         public int AntagAdvantage = 0;
 
-        [DataField("startingGear", customTypeSerializer: typeof(PrototypeIdSerializer<StartingGearPrototype>))]
-        public string? StartingGear { get; private set; }
+        [DataField]
+        public ProtoId<StartingGearPrototype>? StartingGear { get; private set; }
 
         /// <summary>
         /// Use this to spawn in as a non-humanoid (borg, test subject, etc.)
@@ -105,7 +105,7 @@ public sealed partial class JobPrototype : IPrototype
         public string? JobEntity = null;
 
         [DataField]
-        public ProtoId<StatusIconPrototype> Icon { get; private set; } = "JobIconUnknown";
+        public ProtoId<JobIconPrototype> Icon { get; private set; } = "JobIconUnknown";
 
         [DataField("special", serverOnly: true)]
         public JobSpecial[] Special { get; private set; } = Array.Empty<JobSpecial>();
diff --git a/Content.Shared/Roles/JobRequirement/AgeRequirement.cs b/Content.Shared/Roles/JobRequirement/AgeRequirement.cs
new file mode 100644
index 00000000000..e343cf7011e
--- /dev/null
+++ b/Content.Shared/Roles/JobRequirement/AgeRequirement.cs
@@ -0,0 +1,51 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Preferences;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Roles;
+
+/// <summary>
+/// Requires the character to be older or younger than a certain age (inclusive)
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class AgeRequirement : JobRequirement
+{
+    [DataField(required: true)]
+    public int RequiredAge;
+
+    public override bool Check(IEntityManager entManager,
+        IPrototypeManager protoManager,
+        HumanoidCharacterProfile? profile,
+        IReadOnlyDictionary<string, TimeSpan> playTimes,
+        [NotNullWhen(false)] out FormattedMessage? reason,
+        bool isWhitelisted) // DeltaV
+    {
+        reason = new FormattedMessage();
+
+        if (profile is null) //the profile could be null if the player is a ghost. In this case we don't need to block the role selection for ghostrole
+            return true;
+
+        if (!Inverted)
+        {
+            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString("role-timer-age-to-young",
+                ("age", RequiredAge)));
+
+            if (profile.Age <= RequiredAge)
+                return false;
+        }
+        else
+        {
+            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString("role-timer-age-to-old",
+                ("age", RequiredAge)));
+
+            if (profile.Age >= RequiredAge)
+                return false;
+        }
+
+        return true;
+    }
+}
diff --git a/Content.Shared/Roles/JobRequirement/DepartmentTimeRequirement.cs b/Content.Shared/Roles/JobRequirement/DepartmentTimeRequirement.cs
new file mode 100644
index 00000000000..6d045d80344
--- /dev/null
+++ b/Content.Shared/Roles/JobRequirement/DepartmentTimeRequirement.cs
@@ -0,0 +1,84 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Preferences;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Roles;
+
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class DepartmentTimeRequirement : JobRequirement
+{
+    /// <summary>
+    /// Which department needs the required amount of time.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<DepartmentPrototype> Department = default!;
+
+    /// <summary>
+    /// How long (in seconds) this requirement is.
+    /// </summary>
+    [DataField(required: true)]
+    public TimeSpan Time;
+
+    public override bool Check(IEntityManager entManager,
+        IPrototypeManager protoManager,
+        HumanoidCharacterProfile? profile,
+        IReadOnlyDictionary<string, TimeSpan> playTimes,
+        [NotNullWhen(false)] out FormattedMessage? reason,
+        bool isWhitelisted) // DeltaV
+    {
+        reason = new FormattedMessage();
+        var playtime = TimeSpan.Zero;
+
+        // Check all jobs' departments
+        var department = protoManager.Index(Department);
+        var jobs = department.Roles;
+        string proto;
+
+        // Check all jobs' playtime
+        foreach (var other in jobs)
+        {
+            // The schema is stored on the Job role but we want to explode if the timer isn't found anyway.
+            proto = protoManager.Index(other).PlayTimeTracker;
+
+            playTimes.TryGetValue(proto, out var otherTime);
+            playtime += otherTime;
+        }
+
+        var deptDiff = Time.TotalMinutes - playtime.TotalMinutes;
+        var nameDepartment = "role-timer-department-unknown";
+
+        if (protoManager.TryIndex(Department, out var departmentIndexed))
+        {
+            nameDepartment = departmentIndexed.Name;
+        }
+
+        if (!Inverted)
+        {
+            if (deptDiff <= 0)
+                return true;
+
+            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
+                "role-timer-department-insufficient",
+                ("time", Math.Ceiling(deptDiff)),
+                ("department", Loc.GetString(nameDepartment)),
+                ("departmentColor", department.Color.ToHex())));
+            return false;
+        }
+
+        if (deptDiff <= 0)
+        {
+            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
+                "role-timer-department-too-high",
+                ("time", -deptDiff),
+                ("department", Loc.GetString(nameDepartment)),
+                ("departmentColor", department.Color.ToHex())));
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/Content.Shared/Roles/JobRequirement/OverallPlaytimeRequirement.cs b/Content.Shared/Roles/JobRequirement/OverallPlaytimeRequirement.cs
new file mode 100644
index 00000000000..62b3ecd1244
--- /dev/null
+++ b/Content.Shared/Roles/JobRequirement/OverallPlaytimeRequirement.cs
@@ -0,0 +1,51 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Players.PlayTimeTracking;
+using Content.Shared.Preferences;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Roles;
+
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class OverallPlaytimeRequirement : JobRequirement
+{
+    /// <inheritdoc cref="DepartmentTimeRequirement.Time"/>
+    [DataField(required: true)]
+    public TimeSpan Time;
+
+    public override bool Check(IEntityManager entManager,
+        IPrototypeManager protoManager,
+        HumanoidCharacterProfile? profile,
+        IReadOnlyDictionary<string, TimeSpan> playTimes,
+        [NotNullWhen(false)] out FormattedMessage? reason,
+        bool isWhitelisted) // DeltaV
+    {
+        reason = new FormattedMessage();
+
+        var overallTime = playTimes.GetValueOrDefault(PlayTimeTrackingShared.TrackerOverall);
+        var overallDiff = Time.TotalMinutes - overallTime.TotalMinutes;
+
+        if (!Inverted)
+        {
+            if (overallDiff <= 0 || overallTime >= Time)
+                return true;
+
+            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
+                "role-timer-overall-insufficient",
+                ("time", Math.Ceiling(overallDiff))));
+            return false;
+        }
+
+        if (overallDiff <= 0 || overallTime >= Time)
+        {
+            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString("role-timer-overall-too-high",
+                ("time", -overallDiff)));
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs b/Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs
new file mode 100644
index 00000000000..4529f93bee8
--- /dev/null
+++ b/Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs
@@ -0,0 +1,74 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Players.PlayTimeTracking;
+using Content.Shared.Preferences;
+using Content.Shared.Roles.Jobs;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Roles;
+
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class RoleTimeRequirement : JobRequirement
+{
+    /// <summary>
+    /// What particular role they need the time requirement with.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<PlayTimeTrackerPrototype> Role = default!;
+
+    /// <inheritdoc cref="DepartmentTimeRequirement.Time"/>
+    [DataField(required: true)]
+    public TimeSpan Time;
+
+    public override bool Check(IEntityManager entManager,
+        IPrototypeManager protoManager,
+        HumanoidCharacterProfile? profile,
+        IReadOnlyDictionary<string, TimeSpan> playTimes,
+        [NotNullWhen(false)] out FormattedMessage? reason,
+        bool isWhitelisted) // DeltaV
+    {
+        reason = new FormattedMessage();
+
+        string proto = Role;
+
+        playTimes.TryGetValue(proto, out var roleTime);
+        var roleDiff = Time.TotalMinutes - roleTime.TotalMinutes;
+        var departmentColor = Color.Yellow;
+
+        if (entManager.EntitySysManager.TryGetEntitySystem(out SharedJobSystem? jobSystem))
+        {
+            var jobProto = jobSystem.GetJobPrototype(proto);
+
+            if (jobSystem.TryGetDepartment(jobProto, out var departmentProto))
+                departmentColor = departmentProto.Color;
+        }
+
+        if (!Inverted)
+        {
+            if (roleDiff <= 0)
+                return true;
+
+            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
+                "role-timer-role-insufficient",
+                ("time", Math.Ceiling(roleDiff)),
+                ("job", Loc.GetString(proto)),
+                ("departmentColor", departmentColor.ToHex())));
+            return false;
+        }
+
+        if (roleDiff <= 0)
+        {
+            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
+                "role-timer-role-too-high",
+                ("time", -roleDiff),
+                ("job", Loc.GetString(proto)),
+                ("departmentColor", departmentColor.ToHex())));
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/Content.Shared/Roles/JobRequirement/SpeciesRequirement.cs b/Content.Shared/Roles/JobRequirement/SpeciesRequirement.cs
new file mode 100644
index 00000000000..a8c9ab43f59
--- /dev/null
+++ b/Content.Shared/Roles/JobRequirement/SpeciesRequirement.cs
@@ -0,0 +1,60 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Text;
+using Content.Shared.Humanoid.Prototypes;
+using Content.Shared.Preferences;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Roles;
+
+/// <summary>
+/// Requires the character to be or not be on the list of specified species
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class SpeciesRequirement : JobRequirement
+{
+    [DataField(required: true)]
+    public HashSet<ProtoId<SpeciesPrototype>> Species = new();
+
+    public override bool Check(IEntityManager entManager,
+        IPrototypeManager protoManager,
+        HumanoidCharacterProfile? profile,
+        IReadOnlyDictionary<string, TimeSpan> playTimes,
+        [NotNullWhen(false)] out FormattedMessage? reason,
+        bool isWhitelisted) // DeltaV
+    {
+        reason = new FormattedMessage();
+
+        if (profile is null) //the profile could be null if the player is a ghost. In this case we don't need to block the role selection for ghostrole
+            return true;
+
+        var sb = new StringBuilder();
+        sb.Append("[color=yellow]");
+        foreach (var s in Species)
+        {
+            sb.Append(Loc.GetString(protoManager.Index(s).Name) + " ");
+        }
+
+        sb.Append("[/color]");
+
+        if (!Inverted)
+        {
+            reason = FormattedMessage.FromMarkupPermissive($"{Loc.GetString("role-timer-whitelisted-species")}\n{sb}");
+
+            if (!Species.Contains(profile.Species))
+                return false;
+        }
+        else
+        {
+            reason = FormattedMessage.FromMarkupPermissive($"{Loc.GetString("role-timer-blacklisted-species")}\n{sb}");
+
+            if (Species.Contains(profile.Species))
+                return false;
+        }
+
+        return true;
+    }
+}
diff --git a/Content.Shared/Roles/JobRequirements.cs b/Content.Shared/Roles/JobRequirements.cs
index 93fbe658b59..e2991c1f330 100644
--- a/Content.Shared/Roles/JobRequirements.cs
+++ b/Content.Shared/Roles/JobRequirements.cs
@@ -1,239 +1,53 @@
 using System.Diagnostics.CodeAnalysis;
-using Content.Shared.Players.PlayTimeTracking;
-using Content.Shared.Roles.Jobs;
-using JetBrains.Annotations;
+using Content.Shared.Preferences;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.Utility;
 
-namespace Content.Shared.Roles
-{
-    /// <summary>
-    /// Abstract class for playtime and other requirements for role gates.
-    /// </summary>
-    [ImplicitDataDefinitionForInheritors]
-    [Serializable, NetSerializable]
-    public abstract partial class JobRequirement{}
-
-    [UsedImplicitly]
-    [Serializable, NetSerializable]
-    public sealed partial class DepartmentTimeRequirement : JobRequirement
-    {
-        /// <summary>
-        /// Which department needs the required amount of time.
-        /// </summary>
-        [DataField("department", customTypeSerializer: typeof(PrototypeIdSerializer<DepartmentPrototype>))]
-        public string Department = default!;
-
-        /// <summary>
-        /// How long (in seconds) this requirement is.
-        /// </summary>
-        [DataField("time")] public TimeSpan Time;
-
-        /// <summary>
-        /// If true, requirement will return false if playtime above the specified time.
-        /// </summary>
-        /// <value>
-        /// <c>False</c> by default.<br />
-        /// <c>True</c> for invert general requirement
-        /// </value>
-        [DataField("inverted")] public bool Inverted;
-    }
+namespace Content.Shared.Roles;
 
-    [UsedImplicitly]
-    [Serializable, NetSerializable]
-    public sealed partial class RoleTimeRequirement : JobRequirement
-    {
-        /// <summary>
-        /// What particular role they need the time requirement with.
-        /// </summary>
-        [DataField("role", customTypeSerializer: typeof(PrototypeIdSerializer<PlayTimeTrackerPrototype>))]
-        public string Role = default!;
-
-        /// <inheritdoc cref="DepartmentTimeRequirement.Time"/>
-        [DataField("time")] public TimeSpan Time;
-
-        /// <inheritdoc cref="DepartmentTimeRequirement.Inverted"/>
-        [DataField("inverted")] public bool Inverted;
-    }
-
-    [UsedImplicitly]
-    [Serializable, NetSerializable]
-    public sealed partial class OverallPlaytimeRequirement : JobRequirement
-    {
-        /// <inheritdoc cref="DepartmentTimeRequirement.Time"/>
-        [DataField("time")] public TimeSpan Time;
-
-        /// <inheritdoc cref="DepartmentTimeRequirement.Inverted"/>
-        [DataField("inverted")] public bool Inverted;
-    }
-
-    public static class JobRequirements
+public static class JobRequirements
+{
+    public static bool TryRequirementsMet(
+        JobPrototype job,
+        IReadOnlyDictionary<string, TimeSpan> playTimes,
+        [NotNullWhen(false)] out FormattedMessage? reason,
+        IEntityManager entManager,
+        IPrototypeManager protoManager,
+        HumanoidCharacterProfile? profile,
+        bool isWhitelisted) // DeltaV
     {
-        public static bool TryRequirementsMet(
-            JobPrototype job,
-            IReadOnlyDictionary<string, TimeSpan> playTimes,
-            [NotNullWhen(false)] out FormattedMessage? reason,
-            IEntityManager entManager,
-            IPrototypeManager prototypes,
-            bool isWhitelisted)
-        {
-            var sys = entManager.System<SharedRoleSystem>();
-            var requirements = sys.GetJobRequirement(job);
-            reason = null;
-            if (requirements == null)
-                return true;
-
-            foreach (var requirement in requirements)
-            {
-                if (!TryRequirementMet(requirement, playTimes, out reason, entManager, prototypes, isWhitelisted))
-                    return false;
-            }
-
+        var sys = entManager.System<SharedRoleSystem>();
+        var requirements = sys.GetJobRequirement(job);
+        reason = null;
+        if (requirements == null)
             return true;
-        }
 
-        /// <summary>
-        /// Returns a string with the reason why a particular requirement may not be met.
-        /// </summary>
-        public static bool TryRequirementMet(
-            JobRequirement requirement,
-            IReadOnlyDictionary<string, TimeSpan> playTimes,
-            [NotNullWhen(false)] out FormattedMessage? reason,
-            IEntityManager entManager,
-            IPrototypeManager prototypes,
-            bool isWhitelisted)
+        foreach (var requirement in requirements)
         {
-            reason = null;
-
-            switch (requirement)
-            {
-                case DepartmentTimeRequirement deptRequirement:
-                    var playtime = TimeSpan.Zero;
-
-                    // Check all jobs' departments
-                    var department = prototypes.Index<DepartmentPrototype>(deptRequirement.Department);
-                    var jobs = department.Roles;
-                    string proto;
-
-                    // Check all jobs' playtime
-                    foreach (var other in jobs)
-                    {
-                        // The schema is stored on the Job role but we want to explode if the timer isn't found anyway.
-                        proto = prototypes.Index<JobPrototype>(other).PlayTimeTracker;
-
-                        playTimes.TryGetValue(proto, out var otherTime);
-                        playtime += otherTime;
-                    }
-
-                    var deptDiff = deptRequirement.Time.TotalMinutes - playtime.TotalMinutes;
-
-                    if (!deptRequirement.Inverted)
-                    {
-                        if (deptDiff <= 0)
-                            return true;
-
-                        reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
-                            "role-timer-department-insufficient",
-                            ("time", Math.Ceiling(deptDiff)),
-                            ("department", Loc.GetString(deptRequirement.Department)),
-                            ("departmentColor", department.Color.ToHex())));
-                        return false;
-                    }
-                    else
-                    {
-                        if (deptDiff <= 0)
-                        {
-                            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
-                                "role-timer-department-too-high",
-                                ("time", -deptDiff),
-                                ("department", Loc.GetString(deptRequirement.Department)),
-                                ("departmentColor", department.Color.ToHex())));
-                            return false;
-                        }
-
-                        return true;
-                    }
-
-                case OverallPlaytimeRequirement overallRequirement:
-                    var overallTime = playTimes.GetValueOrDefault(PlayTimeTrackingShared.TrackerOverall);
-                    var overallDiff = overallRequirement.Time.TotalMinutes - overallTime.TotalMinutes;
-
-                    if (!overallRequirement.Inverted)
-                    {
-                        if (overallDiff <= 0 || overallTime >= overallRequirement.Time)
-                            return true;
-
-                        reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
-                              "role-timer-overall-insufficient",
-                              ("time", Math.Ceiling(overallDiff))));
-                        return false;
-                    }
-                    else
-                    {
-                        if (overallDiff <= 0 || overallTime >= overallRequirement.Time)
-                        {
-                            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString("role-timer-overall-too-high", ("time", -overallDiff)));
-                            return false;
-                        }
-
-                        return true;
-                    }
-
-                case RoleTimeRequirement roleRequirement:
-                    proto = roleRequirement.Role;
-
-                    playTimes.TryGetValue(proto, out var roleTime);
-                    var roleDiff = roleRequirement.Time.TotalMinutes - roleTime.TotalMinutes;
-                    var departmentColor = Color.Yellow;
-
-                    if (entManager.EntitySysManager.TryGetEntitySystem(out SharedJobSystem? jobSystem))
-                    {
-                        var jobProto = jobSystem.GetJobPrototype(proto);
-
-                        if (jobSystem.TryGetDepartment(jobProto, out var departmentProto))
-                            departmentColor = departmentProto.Color;
-                    }
-
-                    if (!roleRequirement.Inverted)
-                    {
-                        if (roleDiff <= 0)
-                            return true;
-
-                        reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
-                            "role-timer-role-insufficient",
-                            ("time", Math.Ceiling(roleDiff)),
-                            ("job", Loc.GetString(proto)),
-                            ("departmentColor", departmentColor.ToHex())));
-                        return false;
-                    }
-                    else
-                    {
-                        if (roleDiff <= 0)
-                        {
-                            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
-                                "role-timer-role-too-high",
-                                ("time", -roleDiff),
-                                ("job", Loc.GetString(proto)),
-                                ("departmentColor", departmentColor.ToHex())));
-                            return false;
-                        }
-
-                        return true;
-                    }
-                case WhitelistRequirement _: // DeltaV - Whitelist requirement
-                    if (isWhitelisted == null)
-                        throw new ArgumentNullException(nameof(isWhitelisted), "isWhitelisted cannot be null.");
-
-                    if (isWhitelisted)
-                        return true;
-
-                    reason = FormattedMessage.FromMarkup(Loc.GetString("playtime-deny-reason-not-whitelisted"));
-                    return false;
-                default:
-                    throw new NotImplementedException();
-            }
+            if (!requirement.Check(entManager, protoManager, profile, playTimes, out reason, isWhitelisted))
+                return false;
         }
+
+        return true;
     }
 }
+
+/// <summary>
+/// Abstract class for playtime and other requirements for role gates.
+/// </summary>
+[ImplicitDataDefinitionForInheritors]
+[Serializable, NetSerializable]
+public abstract partial class JobRequirement
+{
+    [DataField]
+    public bool Inverted;
+
+    public abstract bool Check(
+        IEntityManager entManager,
+        IPrototypeManager protoManager,
+        HumanoidCharacterProfile? profile,
+        IReadOnlyDictionary<string, TimeSpan> playTimes,
+        [NotNullWhen(false)] out FormattedMessage? reason,
+        bool isWhitelisted); // DeltaV
+}
diff --git a/Content.Shared/Roles/Jobs/JobComponent.cs b/Content.Shared/Roles/Jobs/JobComponent.cs
index 11caf31c20d..b7df34cb9f5 100644
--- a/Content.Shared/Roles/Jobs/JobComponent.cs
+++ b/Content.Shared/Roles/Jobs/JobComponent.cs
@@ -12,15 +12,4 @@ public sealed partial class JobComponent : Component
 {
     [DataField(required: true), AutoNetworkedField]
     public ProtoId<JobPrototype>? Prototype;
-
-    // DeltaV #1425 - Pass VirtualJobLocalizedName/Icon with the JobComponent to override job information
-    [DataField]
-    public string? VirtualJobName;
-    
-    [ViewVariables(VVAccess.ReadOnly)]
-    public string? VirtualJobLocalizedName => (VirtualJobName != null) ? Loc.GetString(VirtualJobName) : null;
-
-    [DataField]
-    public string? VirtualJobIcon;
-    // End of DeltaV code
 }
diff --git a/Content.Shared/Roles/Jobs/SharedJobSystem.cs b/Content.Shared/Roles/Jobs/SharedJobSystem.cs
index f5d60bd97e7..ce4428d9fea 100644
--- a/Content.Shared/Roles/Jobs/SharedJobSystem.cs
+++ b/Content.Shared/Roles/Jobs/SharedJobSystem.cs
@@ -136,9 +136,9 @@ public bool MindTryGetJobId([NotNullWhen(true)] EntityUid? mindId, out ProtoId<J
     /// </summary>
     public bool MindTryGetJobName([NotNullWhen(true)] EntityUid? mindId, out string name)
     {
-        if (MindTryGetJob(mindId, out var comp, out var prototype)) // DeltaV #1425 - Override with the VirtualJobLocalizedName if possible
+        if (MindTryGetJob(mindId, out _, out var prototype))
         {
-            name = comp.VirtualJobLocalizedName ?? prototype.LocalizedName; // DeltaV #1425 - Override with the VirtualJobLocalizedName if possible
+            name = prototype.LocalizedName;
             return true;
         }
 
diff --git a/Content.Shared/Roles/StartingGearPrototype.cs b/Content.Shared/Roles/StartingGearPrototype.cs
index bb3d025a3a7..b0a4b94e550 100644
--- a/Content.Shared/Roles/StartingGearPrototype.cs
+++ b/Content.Shared/Roles/StartingGearPrototype.cs
@@ -1,31 +1,65 @@
-using Content.Shared.DeltaV.Harpy;
-using Content.Shared.Preferences;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array;
 
-namespace Content.Shared.Roles
+namespace Content.Shared.Roles;
+
+[Prototype]
+public sealed partial class StartingGearPrototype : IPrototype, IInheritingPrototype, IEquipmentLoadout
+{
+    /// <inheritdoc/>
+    [ViewVariables]
+    [IdDataField]
+    public string ID { get; private set; } = string.Empty;
+
+    /// <inheritdoc/>
+    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<StartingGearPrototype>))]
+    public string[]? Parents { get; private set; }
+
+    /// <inheritdoc/>
+    [AbstractDataField]
+    public bool Abstract { get; }
+
+    /// <inheritdoc />
+    [DataField]
+    [AlwaysPushInheritance]
+    public Dictionary<string, EntProtoId> Equipment { get; set; } = new();
+
+    /// <inheritdoc />
+    [DataField]
+    [AlwaysPushInheritance]
+    public List<EntProtoId> Inhand { get; set; } = new();
+
+    /// <inheritdoc />
+    [DataField]
+    [AlwaysPushInheritance]
+    public Dictionary<string, List<EntProtoId>> Storage { get; set; } = new();
+}
+
+/// <summary>
+/// Specifies the starting entity prototypes and where to equip them for the specified class.
+/// </summary>
+public interface IEquipmentLoadout
 {
-    [Prototype("startingGear")]
-    public sealed partial class StartingGearPrototype : IPrototype
+    /// <summary>
+    /// The slot and entity prototype ID of the equipment that is to be spawned and equipped onto the entity.
+    /// </summary>
+    public Dictionary<string, EntProtoId> Equipment { get; set; }
+
+    /// <summary>
+    /// The inhand items that are equipped when this starting gear is equipped onto an entity.
+    /// </summary>
+    public List<EntProtoId> Inhand { get; set; }
+
+    /// <summary>
+    /// Inserts entities into the specified slot's storage (if it does have storage).
+    /// </summary>
+    public Dictionary<string, List<EntProtoId>> Storage { get; set; }
+
+    /// <summary>
+    /// Gets the entity prototype ID of a slot in this starting gear.
+    /// </summary>
+    public string GetGear(string slot)
     {
-        [DataField]
-        public Dictionary<string, EntProtoId> Equipment = new();
-
-        [DataField]
-        public List<EntProtoId> Inhand = new(0);
-
-        /// <summary>
-        /// Inserts entities into the specified slot's storage (if it does have storage).
-        /// </summary>
-        [DataField]
-        public Dictionary<string, List<EntProtoId>> Storage = new();
-
-        [ViewVariables]
-        [IdDataField]
-        public string ID { get; private set; } = string.Empty;
-
-        public string GetGear(string slot)
-        {
-            return Equipment.TryGetValue(slot, out var equipment) ? equipment : string.Empty;
-        }
+        return Equipment.TryGetValue(slot, out var equipment) ? equipment : string.Empty;
     }
 }
diff --git a/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs b/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs
index ee67e3296f6..634dfc397b3 100644
--- a/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs
+++ b/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs
@@ -18,5 +18,5 @@ public sealed partial class SSDIndicatorComponent : Component
 
     [ViewVariables(VVAccess.ReadWrite)]
     [DataField]
-    public ProtoId<StatusIconPrototype> Icon = "SSDIcon";
+    public ProtoId<SsdIconPrototype> Icon = "SSDIcon";
 }
diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/ISalvageMod.cs b/Content.Shared/Salvage/Expeditions/Modifiers/ISalvageMod.cs
index aa27f83f03f..6233b179b3d 100644
--- a/Content.Shared/Salvage/Expeditions/Modifiers/ISalvageMod.cs
+++ b/Content.Shared/Salvage/Expeditions/Modifiers/ISalvageMod.cs
@@ -5,7 +5,7 @@ public interface ISalvageMod
     /// <summary>
     /// Player-friendly version describing this modifier.
     /// </summary>
-    string Description { get; }
+    LocId Description { get; }
 
     /// <summary>
     /// Cost for difficulty modifiers.
diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageAirMod.cs b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageAirMod.cs
index c9f038e38f2..fda08281b06 100644
--- a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageAirMod.cs
+++ b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageAirMod.cs
@@ -17,7 +17,7 @@ public sealed partial class SalvageAirMod : IPrototype, IBiomeSpecificMod
 
     /// <inheritdoc/>
     [DataField("desc")]
-    public string Description { get; private set; } = string.Empty;
+    public LocId Description { get; private set; } = string.Empty;
 
     /// <inheritdoc/>
     [DataField("cost")]
diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageBiomeModPrototype.cs b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageBiomeModPrototype.cs
index 1d4efbd18d3..3235741f117 100644
--- a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageBiomeModPrototype.cs
+++ b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageBiomeModPrototype.cs
@@ -12,7 +12,7 @@ public sealed partial class SalvageBiomeModPrototype : IPrototype, ISalvageMod
 {
     [IdDataField] public string ID { get; } = default!;
 
-    [DataField("desc")] public string Description { get; private set; } = string.Empty;
+    [DataField("desc")] public LocId Description { get; private set; } = string.Empty;
 
     /// <summary>
     /// Cost for difficulty modifiers.
diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageDungeonModPrototype.cs b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageDungeonModPrototype.cs
index ee3233c5512..713bdf08b31 100644
--- a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageDungeonModPrototype.cs
+++ b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageDungeonModPrototype.cs
@@ -10,7 +10,7 @@ public sealed partial class SalvageDungeonModPrototype : IPrototype, IBiomeSpeci
 {
     [IdDataField] public string ID { get; } = default!;
 
-    [DataField("desc")] public string Description { get; private set; } = string.Empty;
+    [DataField("desc")] public LocId Description { get; private set; } = string.Empty;
 
     /// <inheridoc/>
     [DataField("cost")]
diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageLightMod.cs b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageLightMod.cs
index a7c38b258dd..d744d5c308c 100644
--- a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageLightMod.cs
+++ b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageLightMod.cs
@@ -8,7 +8,7 @@ public sealed partial class SalvageLightMod : IPrototype, IBiomeSpecificMod
 {
     [IdDataField] public string ID { get; } = default!;
 
-    [DataField("desc")] public string Description { get; private set; } = string.Empty;
+    [DataField("desc")] public LocId Description { get; private set; } = string.Empty;
 
     /// <inheritdoc/>
     [DataField("cost")]
diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageMod.cs b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageMod.cs
index 3cc4488684e..5226824ed52 100644
--- a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageMod.cs
+++ b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageMod.cs
@@ -10,7 +10,7 @@ public sealed partial class SalvageMod : IPrototype, ISalvageMod
 {
     [IdDataField] public string ID { get; } = default!;
 
-    [DataField("desc")] public string Description { get; private set; } = string.Empty;
+    [DataField("desc")] public LocId Description { get; private set; } = string.Empty;
 
     /// <summary>
     /// Cost for difficulty modifiers.
diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageTemperatureMod.cs b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageTemperatureMod.cs
index 17e9af038f3..e8b7235511d 100644
--- a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageTemperatureMod.cs
+++ b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageTemperatureMod.cs
@@ -8,7 +8,7 @@ public sealed partial class SalvageTemperatureMod : IPrototype, IBiomeSpecificMo
 {
     [IdDataField] public string ID { get; } = default!;
 
-    [DataField("desc")] public string Description { get; private set; } = string.Empty;
+    [DataField("desc")] public LocId Description { get; private set; } = string.Empty;
 
     /// <inheritdoc/>
     [DataField("cost")]
diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageWeatherMod.cs b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageWeatherMod.cs
index 1629d02b088..fc704d49e4b 100644
--- a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageWeatherMod.cs
+++ b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageWeatherMod.cs
@@ -10,7 +10,7 @@ public sealed partial class SalvageWeatherMod : IPrototype, IBiomeSpecificMod
 {
     [IdDataField] public string ID { get; } = default!;
 
-    [DataField("desc")] public string Description { get; private set; } = string.Empty;
+    [DataField("desc")] public LocId Description { get; private set; } = string.Empty;
 
     /// <inheritdoc/>
     [DataField("cost")]
diff --git a/Content.Shared/Salvage/Expeditions/SalvageFactionPrototype.cs b/Content.Shared/Salvage/Expeditions/SalvageFactionPrototype.cs
index 4c594945f0d..71be4f7bd08 100644
--- a/Content.Shared/Salvage/Expeditions/SalvageFactionPrototype.cs
+++ b/Content.Shared/Salvage/Expeditions/SalvageFactionPrototype.cs
@@ -7,7 +7,7 @@ public sealed partial class SalvageFactionPrototype : IPrototype
 {
     [IdDataField] public string ID { get; } = default!;
 
-    [DataField("desc")] public string Description { get; private set; } = string.Empty;
+    [DataField("desc")] public LocId Description { get; private set; } = string.Empty;
 
     [ViewVariables(VVAccess.ReadWrite), DataField("entries", required: true)]
     public List<SalvageMobEntry> MobGroups = new();
diff --git a/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs b/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs
index f94558b0b30..b4b383d8000 100644
--- a/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs
+++ b/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs
@@ -153,7 +153,6 @@ private void OnFultonInteract(EntityUid uid, FultonComponent component, AfterInt
         _doAfter.TryStartDoAfter(
             new DoAfterArgs(EntityManager, args.User, component.ApplyFultonDuration, ev, args.Target, args.Target, args.Used)
             {
-                CancelDuplicate = true,
                 MovementThreshold = 0.5f,
                 BreakOnMove = true,
                 Broadcast = true,
diff --git a/Content.Shared/Salvage/SharedSalvageSystem.Magnet.cs b/Content.Shared/Salvage/SharedSalvageSystem.Magnet.cs
index 81390e5f65a..62edb36db93 100644
--- a/Content.Shared/Salvage/SharedSalvageSystem.Magnet.cs
+++ b/Content.Shared/Salvage/SharedSalvageSystem.Magnet.cs
@@ -32,14 +32,14 @@ public ISalvageMagnetOffering GetSalvageOffering(int seed)
             var layers = new Dictionary<string, int>();
 
             // If we ever add more random layers will need to Next on these.
-            foreach (var layer in configProto.PostGeneration)
+            foreach (var layer in configProto.Layers)
             {
                 switch (layer)
                 {
-                    case BiomePostGen:
+                    case BiomeDunGen:
                         rand.Next();
                         break;
-                    case BiomeMarkerLayerPostGen marker:
+                    case BiomeMarkerLayerDunGen marker:
                         for (var i = 0; i < marker.Count; i++)
                         {
                             var proto = _proto.Index(marker.MarkerTemplate).Pick(rand);
diff --git a/Content.Shared/Salvage/SharedSalvageSystem.cs b/Content.Shared/Salvage/SharedSalvageSystem.cs
index 5f5fc875d62..0c56f4f556e 100644
--- a/Content.Shared/Salvage/SharedSalvageSystem.cs
+++ b/Content.Shared/Salvage/SharedSalvageSystem.cs
@@ -55,18 +55,18 @@ public SalvageMission GetMission(SalvageDifficultyPrototype difficulty, int seed
 
         if (air.Description != string.Empty)
         {
-            mods.Add(air.Description);
+            mods.Add(Loc.GetString(air.Description));
         }
 
         // only show the description if there is an atmosphere since wont matter otherwise
         if (temp.Description != string.Empty && !air.Space)
         {
-            mods.Add(temp.Description);
+            mods.Add(Loc.GetString(temp.Description));
         }
 
         if (light.Description != string.Empty)
         {
-            mods.Add(light.Description);
+            mods.Add(Loc.GetString(light.Description));
         }
 
         var duration = TimeSpan.FromSeconds(CfgManager.GetCVar(CCVars.SalvageExpeditionDuration));
diff --git a/Content.Shared/Security/Components/CriminalRecordComponent.cs b/Content.Shared/Security/Components/CriminalRecordComponent.cs
index 25fab3f1350..aa6bd6ad5bd 100644
--- a/Content.Shared/Security/Components/CriminalRecordComponent.cs
+++ b/Content.Shared/Security/Components/CriminalRecordComponent.cs
@@ -11,5 +11,5 @@ public sealed partial class CriminalRecordComponent : Component
     ///     The icon that should be displayed based on the criminal status of the entity.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public ProtoId<StatusIconPrototype> StatusIcon = "SecurityIconWanted";
+    public ProtoId<SecurityIconPrototype> StatusIcon = "SecurityIconWanted";
 }
diff --git a/Content.Server/Shuttles/Components/FTLComponent.cs b/Content.Shared/Shuttles/Components/FTLComponent.cs
similarity index 81%
rename from Content.Server/Shuttles/Components/FTLComponent.cs
rename to Content.Shared/Shuttles/Components/FTLComponent.cs
index 691e9231370..6b236d3dcf0 100644
--- a/Content.Server/Shuttles/Components/FTLComponent.cs
+++ b/Content.Shared/Shuttles/Components/FTLComponent.cs
@@ -2,16 +2,16 @@
 using Content.Shared.Tag;
 using Content.Shared.Timing;
 using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.Shuttles.Components;
+namespace Content.Shared.Shuttles.Components;
 
 /// <summary>
 /// Added to a component when it is queued or is travelling via FTL.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class FTLComponent : Component
 {
     // TODO Full game save / add datafields
@@ -29,13 +29,19 @@ public sealed partial class FTLComponent : Component
     [ViewVariables(VVAccess.ReadWrite)]
     public float TravelTime = 0f;
 
+    [DataField]
+    public EntProtoId? VisualizerProto = "FtlVisualizerEntity";
+
+    [DataField, AutoNetworkedField]
+    public EntityUid? VisualizerEntity;
+
     /// <summary>
     /// Coordinates to arrive it: May be relative to another grid (for docking) or map coordinates.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField]
+    [DataField, AutoNetworkedField]
     public EntityCoordinates TargetCoordinates;
 
-    [DataField]
+    [DataField, AutoNetworkedField]
     public Angle TargetAngle;
 
     /// <summary>
diff --git a/Content.Shared/Shuttles/Components/FtlVisualizerComponent.cs b/Content.Shared/Shuttles/Components/FtlVisualizerComponent.cs
new file mode 100644
index 00000000000..628a4f828b2
--- /dev/null
+++ b/Content.Shared/Shuttles/Components/FtlVisualizerComponent.cs
@@ -0,0 +1,23 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Shuttles.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class FtlVisualizerComponent : Component
+{
+    /// <summary>
+    /// Clientside time tracker for the animation.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    public float Elapsed;
+
+    [DataField(required: true)]
+    public SpriteSpecifier.Rsi Sprite;
+
+    /// <summary>
+    /// Target grid to pull FTL visualization from.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityUid Grid;
+}
diff --git a/Content.Shared/Shuttles/Components/PilotComponent.cs b/Content.Shared/Shuttles/Components/PilotComponent.cs
index cb42db4436f..8823d309c3f 100644
--- a/Content.Shared/Shuttles/Components/PilotComponent.cs
+++ b/Content.Shared/Shuttles/Components/PilotComponent.cs
@@ -39,4 +39,6 @@ public sealed partial class PilotComponent : Component
 
         public override bool SendOnlyToOwner => true;
     }
+
+    public sealed partial class StopPilotingAlertEvent : BaseAlertEvent;
 }
diff --git a/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs b/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs
index a382e943ff9..db2cbaa138b 100644
--- a/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs
+++ b/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs
@@ -18,7 +18,7 @@ public abstract partial class SharedShuttleSystem : EntitySystem
     [Dependency] protected readonly SharedTransformSystem XformSystem = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
-    public const float FTLRange = 512f;
+    public const float FTLRange = 256f;
     public const float FTLBufferRange = 8f;
 
     private EntityQuery<MapGridComponent> _gridQuery;
diff --git a/Content.Shared/Silicons/Borgs/Components/BorgChassisComponent.cs b/Content.Shared/Silicons/Borgs/Components/BorgChassisComponent.cs
index e1776873da9..de0fe0bce38 100644
--- a/Content.Shared/Silicons/Borgs/Components/BorgChassisComponent.cs
+++ b/Content.Shared/Silicons/Borgs/Components/BorgChassisComponent.cs
@@ -15,12 +15,6 @@ namespace Content.Shared.Silicons.Borgs.Components;
 [RegisterComponent, NetworkedComponent, Access(typeof(SharedBorgSystem)), AutoGenerateComponentState]
 public sealed partial class BorgChassisComponent : Component
 {
-    /// <summary>
-    /// Whether or not the borg is activated, meaning it has access to modules and a heightened movement speed
-    /// </summary>
-    [DataField("activated"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
-    public bool Activated;
-
     #region Brain
     /// <summary>
     /// A whitelist for which entities count as valid brains
@@ -68,7 +62,7 @@ public sealed partial class BorgChassisComponent : Component
     /// <summary>
     /// The currently selected module
     /// </summary>
-    [DataField("selectedModule")]
+    [DataField("selectedModule"), AutoNetworkedField]
     public EntityUid? SelectedModule;
 
     #region Visuals
diff --git a/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs b/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
index 2983c0d642f..48d23578368 100644
--- a/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
+++ b/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Access.Components;
 using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Item.ItemToggle;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Popups;
@@ -18,6 +19,7 @@ public abstract partial class SharedBorgSystem : EntitySystem
 {
     [Dependency] protected readonly SharedContainerSystem Container = default!;
     [Dependency] protected readonly ItemSlotsSystem ItemSlots = default!;
+    [Dependency] protected readonly ItemToggleSystem Toggle = default!;
     [Dependency] protected readonly SharedPopupSystem Popup = default!;
 
     /// <inheritdoc/>
@@ -96,7 +98,7 @@ protected virtual void OnRemoved(EntityUid uid, BorgChassisComponent component,
 
     private void OnRefreshMovementSpeedModifiers(EntityUid uid, BorgChassisComponent component, RefreshMovementSpeedModifiersEvent args)
     {
-        if (component.Activated)
+        if (Toggle.IsActivated(uid))
             return;
 
         if (!TryComp<MovementSpeedModifierComponent>(uid, out var movement))
diff --git a/Content.Shared/Silicons/Laws/SiliconLawEditEuiState.cs b/Content.Shared/Silicons/Laws/SiliconLawEditEuiState.cs
new file mode 100644
index 00000000000..b5b35837153
--- /dev/null
+++ b/Content.Shared/Silicons/Laws/SiliconLawEditEuiState.cs
@@ -0,0 +1,29 @@
+using Content.Shared.Eui;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Silicons.Laws;
+
+[Serializable, NetSerializable]
+public sealed class SiliconLawsEuiState : EuiStateBase
+{
+    public List<SiliconLaw> Laws { get; }
+    public NetEntity Target { get; }
+    public SiliconLawsEuiState(List<SiliconLaw> laws, NetEntity target)
+    {
+        Laws = laws;
+        Target = target;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class SiliconLawsSaveMessage : EuiMessageBase
+{
+    public List<SiliconLaw> Laws { get; }
+    public NetEntity Target { get; }
+
+    public SiliconLawsSaveMessage(List<SiliconLaw> laws, NetEntity target)
+    {
+        Laws = laws;
+        Target = target;
+    }
+}
diff --git a/Content.Shared/Silicons/Laws/SiliconLawPrototype.cs b/Content.Shared/Silicons/Laws/SiliconLawPrototype.cs
index d10b86c2417..5924c95cdc1 100644
--- a/Content.Shared/Silicons/Laws/SiliconLawPrototype.cs
+++ b/Content.Shared/Silicons/Laws/SiliconLawPrototype.cs
@@ -6,7 +6,7 @@ namespace Content.Shared.Silicons.Laws;
 
 [Virtual, DataDefinition]
 [Serializable, NetSerializable]
-public partial class SiliconLaw : IComparable<SiliconLaw>
+public partial class SiliconLaw : IComparable<SiliconLaw>, IEquatable<SiliconLaw>
 {
     /// <summary>
     /// A locale string which is the actual text of the law.
@@ -39,13 +39,27 @@ public int CompareTo(SiliconLaw? other)
         return Order.CompareTo(other.Order);
     }
 
-    public bool Equals(SiliconLaw other)
+    public bool Equals(SiliconLaw? other)
     {
+        if (other == null)
+            return false;
         return LawString == other.LawString
                && Order == other.Order
                && LawIdentifierOverride == other.LawIdentifierOverride;
     }
 
+    public override bool Equals(object? obj)
+    {
+        if (obj == null)
+            return false;
+        return Equals(obj as SiliconLaw);
+    }
+
+    public override int GetHashCode()
+    {
+        return HashCode.Combine(LawString, Order, LawIdentifierOverride);
+    }
+
     /// <summary>
     /// Return a shallow clone of this law.
     /// </summary>
diff --git a/Content.Shared/Slippery/NoSlipComponent.cs b/Content.Shared/Slippery/NoSlipComponent.cs
index 186861a5a93..d9c3fe3f761 100644
--- a/Content.Shared/Slippery/NoSlipComponent.cs
+++ b/Content.Shared/Slippery/NoSlipComponent.cs
@@ -1,7 +1,9 @@
-namespace Content.Shared.Slippery
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Slippery;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class NoSlipComponent : Component
 {
-    [RegisterComponent]
-    public sealed partial class NoSlipComponent : Component
-    {
-    }
+
 }
diff --git a/Content.Shared/Slippery/SlipperyComponent.cs b/Content.Shared/Slippery/SlipperyComponent.cs
index b80a9b57e4d..154ca6c51a4 100644
--- a/Content.Shared/Slippery/SlipperyComponent.cs
+++ b/Content.Shared/Slippery/SlipperyComponent.cs
@@ -25,14 +25,14 @@ public sealed partial class SlipperyComponent : Component
         /// </summary>
         [DataField, AutoNetworkedField]
         [Access(Other = AccessPermissions.ReadWrite)]
-        public float ParalyzeTime = 3f;
+        public float ParalyzeTime = 1.5f;
 
         /// <summary>
         /// The entity's speed will be multiplied by this to slip it forwards.
         /// </summary>
         [DataField, AutoNetworkedField]
         [Access(Other = AccessPermissions.ReadWrite)]
-        public float LaunchForwardsMultiplier = 1f;
+        public float LaunchForwardsMultiplier = 1.5f;
 
         /// <summary>
         /// If this is true, any slipping entity loses its friction until
diff --git a/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs b/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
index b238c6fc722..0e216db1467 100644
--- a/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
+++ b/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
@@ -133,7 +133,7 @@ private void OnAirlockInteract(Entity<PaintableAirlockComponent> ent, ref Intera
         {
             BreakOnMove = true,
             BreakOnDamage = true,
-            NeedHand = true
+            NeedHand = true,
         };
         if (!DoAfter.TryStartDoAfter(doAfterEventArgs, out var id))
             return;
diff --git a/Content.Shared/Spreader/EdgeSpreaderPrototype.cs b/Content.Shared/Spreader/EdgeSpreaderPrototype.cs
index fee8f93a6d3..33665d82b5d 100644
--- a/Content.Shared/Spreader/EdgeSpreaderPrototype.cs
+++ b/Content.Shared/Spreader/EdgeSpreaderPrototype.cs
@@ -10,4 +10,10 @@ public sealed partial class EdgeSpreaderPrototype : IPrototype
 {
     [IdDataField] public string ID { get; } = string.Empty;
     [DataField(required:true)] public int UpdatesPerSecond;
+
+    /// <summary>
+    /// If true, this spreader can't spread onto spaced tiles like lattice.
+    /// </summary>
+    [DataField]
+    public bool PreventSpreadOnSpaced = true;
 }
diff --git a/Content.Shared/Standing/StandingStateSystem.cs b/Content.Shared/Standing/StandingStateSystem.cs
index ed586e970dc..8d9be9ab776 100644
--- a/Content.Shared/Standing/StandingStateSystem.cs
+++ b/Content.Shared/Standing/StandingStateSystem.cs
@@ -25,7 +25,10 @@ public bool IsDown(EntityUid uid, StandingStateComponent? standingState = null)
             return !standingState.Standing;
         }
 
-        public bool Down(EntityUid uid, bool playSound = true, bool dropHeldItems = true,
+        public bool Down(EntityUid uid,
+            bool playSound = true,
+            bool dropHeldItems = true,
+            bool force = false,
             StandingStateComponent? standingState = null,
             AppearanceComponent? appearance = null,
             HandsComponent? hands = null)
@@ -49,11 +52,14 @@ public bool Down(EntityUid uid, bool playSound = true, bool dropHeldItems = true
                 RaiseLocalEvent(uid, new DropHandItemsEvent(), false);
             }
 
-            var msg = new DownAttemptEvent();
-            RaiseLocalEvent(uid, msg, false);
+            if (!force)
+            {
+                var msg = new DownAttemptEvent();
+                RaiseLocalEvent(uid, msg, false);
 
-            if (msg.Cancelled)
-                return false;
+                if (msg.Cancelled)
+                    return false;
+            }
 
             standingState.Standing = false;
             Dirty(uid, standingState);
diff --git a/Content.Server/Station/Components/StationMemberComponent.cs b/Content.Shared/Station/Components/StationMemberComponent.cs
similarity index 69%
rename from Content.Server/Station/Components/StationMemberComponent.cs
rename to Content.Shared/Station/Components/StationMemberComponent.cs
index 2100c20c55d..ce5d95ad0d2 100644
--- a/Content.Server/Station/Components/StationMemberComponent.cs
+++ b/Content.Shared/Station/Components/StationMemberComponent.cs
@@ -1,11 +1,11 @@
-using Content.Server.Station.Systems;
+using Robust.Shared.GameStates;
 
-namespace Content.Server.Station.Components;
+namespace Content.Shared.Station.Components;
 
 /// <summary>
 /// Indicates that a grid is a member of the given station.
 /// </summary>
-[RegisterComponent, Access(typeof(StationSystem))]
+[RegisterComponent, NetworkedComponent]
 public sealed partial class StationMemberComponent : Component
 {
     /// <summary>
diff --git a/Content.Shared/Station/SharedStationSpawningSystem.cs b/Content.Shared/Station/SharedStationSpawningSystem.cs
index f352c9db63e..8d960ca4482 100644
--- a/Content.Shared/Station/SharedStationSpawningSystem.cs
+++ b/Content.Shared/Station/SharedStationSpawningSystem.cs
@@ -15,9 +15,9 @@ public abstract class SharedStationSpawningSystem : EntitySystem
 {
     [Dependency] protected readonly IPrototypeManager PrototypeManager = default!;
     [Dependency] protected readonly InventorySystem InventorySystem = default!;
-    [Dependency] private   readonly SharedHandsSystem _handsSystem = default!;
-    [Dependency] private   readonly SharedStorageSystem _storage = default!;
-    [Dependency] private   readonly SharedTransformSystem _xformSystem = default!;
+    [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
+    [Dependency] private readonly SharedStorageSystem _storage = default!;
+    [Dependency] private readonly SharedTransformSystem _xformSystem = default!;
 
     private EntityQuery<HandsComponent> _handsQuery;
     private EntityQuery<InventoryComponent> _inventoryQuery;
@@ -49,25 +49,32 @@ public void EquipRoleLoadout(EntityUid entity, RoleLoadout loadout, RoleLoadoutP
                     continue;
                 }
 
-                if (!PrototypeManager.TryIndex(loadoutProto.Equipment, out var startingGear))
-                {
-                    Log.Error($"Unable to find starting gear {loadoutProto.Equipment} for loadout {loadoutProto}");
-                    continue;
-                }
-
-                // Handle any extra data here.
-                EquipStartingGear(entity, startingGear, raiseEvent: false);
+                EquipStartingGear(entity, loadoutProto, raiseEvent: false);
             }
         }
     }
 
+    public void EquipStartingGear(EntityUid entity, LoadoutPrototype loadout, bool raiseEvent = true)
+    {
+        EquipStartingGear(entity, loadout.StartingGear, raiseEvent);
+        EquipStartingGear(entity, (IEquipmentLoadout) loadout, raiseEvent);
+    }
+
     /// <summary>
     /// <see cref="EquipStartingGear(Robust.Shared.GameObjects.EntityUid,System.Nullable{Robust.Shared.Prototypes.ProtoId{Content.Shared.Roles.StartingGearPrototype}},bool)"/>
     /// </summary>
     public void EquipStartingGear(EntityUid entity, ProtoId<StartingGearPrototype>? startingGear, bool raiseEvent = true)
     {
         PrototypeManager.TryIndex(startingGear, out var gearProto);
-        EquipStartingGear(entity, gearProto);
+        EquipStartingGear(entity, gearProto, raiseEvent);
+    }
+
+    /// <summary>
+    /// <see cref="EquipStartingGear(Robust.Shared.GameObjects.EntityUid,System.Nullable{Robust.Shared.Prototypes.ProtoId{Content.Shared.Roles.StartingGearPrototype}},bool)"/>
+    /// </summary>
+    public void EquipStartingGear(EntityUid entity, StartingGearPrototype? startingGear, bool raiseEvent = true)
+    {
+        EquipStartingGear(entity, (IEquipmentLoadout?) startingGear, raiseEvent);
     }
 
     /// <summary>
@@ -76,7 +83,7 @@ public void EquipStartingGear(EntityUid entity, ProtoId<StartingGearPrototype>?
     /// <param name="entity">Entity to load out.</param>
     /// <param name="startingGear">Starting gear to use.</param>
     /// <param name="raiseEvent">Should we raise the event for equipped. Set to false if you will call this manually</param>
-    public void EquipStartingGear(EntityUid entity, StartingGearPrototype? startingGear, bool raiseEvent = true)
+    public void EquipStartingGear(EntityUid entity, IEquipmentLoadout? startingGear, bool raiseEvent = true)
     {
         if (startingGear == null)
             return;
@@ -91,7 +98,7 @@ public void EquipStartingGear(EntityUid entity, StartingGearPrototype? startingG
                 if (!string.IsNullOrEmpty(equipmentStr))
                 {
                     var equipmentEntity = EntityManager.SpawnEntity(equipmentStr, xform.Coordinates);
-                    InventorySystem.TryEquip(entity, equipmentEntity, slot.Name, silent: true, force:true);
+                    InventorySystem.TryEquip(entity, equipmentEntity, slot.Name, silent: true, force: true);
                 }
             }
         }
@@ -122,15 +129,15 @@ public void EquipStartingGear(EntityUid entity, StartingGearPrototype? startingG
                 if (entProtos.Count == 0)
                     continue;
 
-                foreach (var ent in entProtos)
-                {
-                    ents.Add(Spawn(ent, coords));
-                }
-
                 if (inventoryComp != null &&
                     InventorySystem.TryGetSlotEntity(entity, slot, out var slotEnt, inventoryComponent: inventoryComp) &&
                     _storageQuery.TryComp(slotEnt, out var storage))
                 {
+                    foreach (var ent in entProtos)
+                    {
+                        ents.Add(Spawn(ent, coords));
+                    }
+
                     foreach (var ent in ents)
                     {
                         _storage.Insert(slotEnt.Value, ent, out _, storageComp: storage, playSound: false);
@@ -145,4 +152,4 @@ public void EquipStartingGear(EntityUid entity, StartingGearPrototype? startingG
             RaiseLocalEvent(entity, ref ev);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Content.Shared/StatusIcon/StatusIconPrototype.cs b/Content.Shared/StatusIcon/StatusIconPrototype.cs
index 29a1b60114f..af3cfb133b2 100644
--- a/Content.Shared/StatusIcon/StatusIconPrototype.cs
+++ b/Content.Shared/StatusIcon/StatusIconPrototype.cs
@@ -73,7 +73,6 @@ public partial class StatusIconData : IComparable<StatusIconData>
     /// </summary>
     [DataField]
     public bool IsShaded = false;
-
     public int CompareTo(StatusIconData? other)
     {
         return Priority.CompareTo(other?.Priority ?? int.MaxValue);
@@ -83,11 +82,21 @@ public int CompareTo(StatusIconData? other)
 /// <summary>
 /// <see cref="StatusIconData"/> but in new convenient prototype form!
 /// </summary>
-[Prototype("statusIcon")]
-public sealed partial class StatusIconPrototype : StatusIconData, IPrototype, IInheritingPrototype
+public abstract partial class StatusIconPrototype : StatusIconData, IPrototype
+{
+    /// <inheritdoc/>
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+}
+
+/// <summary>
+/// StatusIcons for showing jobs on the sec HUD
+/// </summary>
+[Prototype]
+public sealed partial class JobIconPrototype : StatusIconPrototype, IInheritingPrototype
 {
     /// <inheritdoc />
-    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<StatusIconPrototype>))]
+    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<JobIconPrototype>))]
     public string[]? Parents { get; }
 
     /// <inheritdoc />
@@ -95,9 +104,116 @@ public sealed partial class StatusIconPrototype : StatusIconData, IPrototype, II
     [AbstractDataField]
     public bool Abstract { get; }
 
-    /// <inheritdoc/>
-    [IdDataField]
-    public string ID { get; private set; } = default!;
+    /// <summary>
+    /// Name of the icon used for menu tooltips.
+    /// </summary>
+    [DataField]
+    public string JobName { get; private set; } = string.Empty;
+
+    [ViewVariables(VVAccess.ReadOnly)]
+    public string LocalizedJobName => Loc.GetString(JobName);
+
+    /// <summary>
+    /// Should the agent ID or ID card console be able to use this job icon?
+    /// </summary>
+    [DataField]
+    public bool AllowSelection = true;
+}
+
+/// <summary>
+/// StatusIcons for the med HUD
+/// </summary>
+[Prototype]
+public sealed partial class HealthIconPrototype : StatusIconPrototype, IInheritingPrototype
+{
+    /// <inheritdoc />
+    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<HealthIconPrototype>))]
+    public string[]? Parents { get; }
+
+    /// <inheritdoc />
+    [NeverPushInheritance]
+    [AbstractDataField]
+    public bool Abstract { get; }
+}
+
+/// <summary>
+/// StatusIcons for the beer goggles and fried onion goggles
+/// </summary>
+[Prototype]
+public sealed partial class SatiationIconPrototype : StatusIconPrototype, IInheritingPrototype
+{
+    /// <inheritdoc />
+    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<SatiationIconPrototype>))]
+    public string[]? Parents { get; }
+
+    /// <inheritdoc />
+    [NeverPushInheritance]
+    [AbstractDataField]
+    public bool Abstract { get; }
+}
+
+/// <summary>
+/// StatusIcons for showing the wanted status on the sec HUD
+/// </summary>
+[Prototype]
+public sealed partial class SecurityIconPrototype : StatusIconPrototype, IInheritingPrototype
+{
+    /// <inheritdoc />
+    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<SecurityIconPrototype>))]
+    public string[]? Parents { get; }
+
+    /// <inheritdoc />
+    [NeverPushInheritance]
+    [AbstractDataField]
+    public bool Abstract { get; }
+}
+
+/// <summary>
+/// StatusIcons for faction membership
+/// </summary>
+[Prototype]
+public sealed partial class FactionIconPrototype : StatusIconPrototype, IInheritingPrototype
+{
+    /// <inheritdoc />
+    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<FactionIconPrototype>))]
+    public string[]? Parents { get; }
+
+    /// <inheritdoc />
+    [NeverPushInheritance]
+    [AbstractDataField]
+    public bool Abstract { get; }
+}
+
+/// <summary>
+/// StatusIcons for debugging purposes
+/// </summary>
+[Prototype]
+public sealed partial class DebugIconPrototype : StatusIconPrototype, IInheritingPrototype
+{
+    /// <inheritdoc />
+    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<DebugIconPrototype>))]
+    public string[]? Parents { get; }
+
+    /// <inheritdoc />
+    [NeverPushInheritance]
+    [AbstractDataField]
+    public bool Abstract { get; }
+}
+
+/// <summary>
+/// StatusIcons for the SSD indicator
+/// </summary>
+[Prototype]
+public sealed partial class SsdIconPrototype : StatusIconPrototype, IInheritingPrototype
+{
+    /// <inheritdoc />
+    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<SsdIconPrototype>))]
+    public string[]? Parents { get; }
+
+    /// <inheritdoc />
+    [NeverPushInheritance]
+    [AbstractDataField]
+    public bool Abstract { get; }
 }
 
 [Serializable, NetSerializable]
diff --git a/Content.Shared/Sticky/Components/StickyComponent.cs b/Content.Shared/Sticky/Components/StickyComponent.cs
new file mode 100644
index 00000000000..45130917548
--- /dev/null
+++ b/Content.Shared/Sticky/Components/StickyComponent.cs
@@ -0,0 +1,90 @@
+using Content.Shared.Sticky.Systems;
+using Content.Shared.Whitelist;
+using Robust.Shared.GameStates;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Sticky.Components;
+
+/// <summary>
+/// Items that can be stuck to other structures or entities.
+/// For example, paper stickers or C4 charges.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(StickySystem))]
+[AutoGenerateComponentState]
+public sealed partial class StickyComponent : Component
+{
+    /// <summary>
+    /// What target entities are valid to be surface for sticky entity.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Whitelist;
+
+    /// <summary>
+    /// What target entities can't be used as surface for sticky entity.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Blacklist;
+
+    /// <summary>
+    /// How much time it takes to stick the entity to a target.
+    /// If zero, it will immediately be stuck.
+    /// </summary>
+    [DataField]
+    public TimeSpan StickDelay = TimeSpan.Zero;
+
+    /// <summary>
+    /// Whether users can unstick the entity after it has been stuck.
+    /// </summary>
+    [DataField]
+    public bool CanUnstick = true;
+
+    /// <summary>
+    /// How much time it takes to unstick the entity.
+    /// If zero, it will immediately be unstuck.
+    /// </summary>
+    [DataField]
+    public TimeSpan UnstickDelay = TimeSpan.Zero;
+
+    /// <summary>
+    /// Popup message shown when player starts sticking the entity to another entity.
+    /// </summary>
+    [DataField]
+    public LocId? StickPopupStart;
+
+    /// <summary>
+    /// Popup message shown when a player successfully sticks the entity.
+    /// </summary>
+    [DataField]
+    public LocId? StickPopupSuccess;
+
+    /// <summary>
+    /// Popup message shown when a player starts unsticking the entity from another entity.
+    /// </summary>
+    [DataField]
+    public LocId? UnstickPopupStart;
+
+    /// <summary>
+    /// Popup message shown when a player successfully unsticks the entity.
+    /// </summary>
+    [DataField]
+    public LocId? UnstickPopupSuccess;
+
+    /// <summary>
+    /// Entity that is used as a surface for the sticky entity.
+    /// Null if entity isn't stuck to anything.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityUid? StuckTo;
+
+    /// <summary>
+    /// Text to use for the unstick verb.
+    /// </summary>
+    [DataField]
+    public LocId VerbText = "comp-sticky-unstick-verb-text";
+
+    /// <summary>
+    /// Icon to use for the unstick verb.
+    /// </summary>
+    [DataField]
+    public SpriteSpecifier VerbIcon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/eject.svg.192dpi.png"));
+}
diff --git a/Content.Shared/Sticky/Components/StickyVisualizerComponent.cs b/Content.Shared/Sticky/Components/StickyVisualizerComponent.cs
index c32be646fc3..fd37836dcf6 100644
--- a/Content.Shared/Sticky/Components/StickyVisualizerComponent.cs
+++ b/Content.Shared/Sticky/Components/StickyVisualizerComponent.cs
@@ -1,23 +1,26 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Sticky.Components;
-using DrawDepth;
 
+using DrawDepth;
+
+/// <summary>
+/// Sets the sprite's draw depth depending on whether it's stuck.
+/// </summary>
 [RegisterComponent]
 public sealed partial class StickyVisualizerComponent : Component
 {
     /// <summary>
-    ///     What sprite draw depth set when entity stuck.
+    /// What sprite draw depth gets set to when stuck to something.
     /// </summary>
-    [DataField("stuckDrawDepth")]
-    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public int StuckDrawDepth = (int) DrawDepth.Overdoors;
 
     /// <summary>
-    ///     What sprite draw depth set when entity unstuck.
+    /// The sprite's original draw depth before being stuck.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    public int DefaultDrawDepth;
+    [DataField]
+    public int OriginalDrawDepth;
 }
 
 [Serializable, NetSerializable]
diff --git a/Content.Shared/Sticky/EntityStuckEvent.cs b/Content.Shared/Sticky/EntityStuckEvent.cs
new file mode 100644
index 00000000000..ae7a65c0ad8
--- /dev/null
+++ b/Content.Shared/Sticky/EntityStuckEvent.cs
@@ -0,0 +1,26 @@
+namespace Content.Shared.Sticky;
+
+/// <summary>
+///     Risen on sticky entity to see if it can stick to another entity.
+/// </summary>
+[ByRefEvent]
+public record struct AttemptEntityStickEvent(EntityUid Target, EntityUid User, bool Cancelled = false);
+
+/// <summary>
+///     Risen on sticky entity to see if it can unstick from another entity.
+/// </summary>
+[ByRefEvent]
+public record struct AttemptEntityUnstickEvent(EntityUid Target, EntityUid User, bool Cancelled = false);
+
+
+/// <summary>
+///     Risen on sticky entity when it was stuck to other entity.
+/// </summary>
+[ByRefEvent]
+public record struct EntityStuckEvent(EntityUid Target, EntityUid User);
+
+/// <summary>
+///     Risen on sticky entity when it was unstuck from other entity.
+/// </summary>
+[ByRefEvent]
+public record struct EntityUnstuckEvent(EntityUid Target, EntityUid User);
diff --git a/Content.Shared/Sticky/Systems/StickySystem.cs b/Content.Shared/Sticky/Systems/StickySystem.cs
new file mode 100644
index 00000000000..ea768fea935
--- /dev/null
+++ b/Content.Shared/Sticky/Systems/StickySystem.cs
@@ -0,0 +1,220 @@
+using Content.Shared.DoAfter;
+using Content.Shared.Hands.EntitySystems;
+using Content.Shared.Interaction;
+using Content.Shared.Popups;
+using Content.Shared.Sticky.Components;
+using Content.Shared.Verbs;
+using Content.Shared.Whitelist;
+using Robust.Shared.Containers;
+
+namespace Content.Shared.Sticky.Systems;
+
+public sealed class StickySystem : EntitySystem
+{
+    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly SharedContainerSystem _container = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
+    [Dependency] private readonly SharedInteractionSystem _interaction = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+
+    private const string StickerSlotId = "stickers_container";
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<StickyComponent, AfterInteractEvent>(OnAfterInteract);
+        SubscribeLocalEvent<StickyComponent, StickyDoAfterEvent>(OnStickyDoAfter);
+        SubscribeLocalEvent<StickyComponent, GetVerbsEvent<Verb>>(OnGetVerbs);
+    }
+
+    private void OnAfterInteract(Entity<StickyComponent> ent, ref AfterInteractEvent args)
+    {
+        if (args.Handled || !args.CanReach || args.Target is not {} target)
+            return;
+
+        // try stick object to a clicked target entity
+        args.Handled = StartSticking(ent, target, args.User);
+    }
+
+    private void OnGetVerbs(Entity<StickyComponent> ent, ref GetVerbsEvent<Verb> args)
+    {
+        var (uid, comp) = ent;
+        if (comp.StuckTo == null || !comp.CanUnstick || !args.CanInteract || args.Hands == null)
+            return;
+
+        // we can't use args.CanAccess, because it stuck in another container
+        // we also need to ignore entity that it stuck to
+        var user = args.User;
+        var inRange = _interaction.InRangeUnobstructed(uid, user,
+            predicate: entity => comp.StuckTo == entity);
+        if (!inRange)
+            return;
+
+        args.Verbs.Add(new Verb
+        {
+            DoContactInteraction = true,
+            Text = Loc.GetString(comp.VerbText),
+            Icon = comp.VerbIcon,
+            Act = () => StartUnsticking(ent, user)
+        });
+    }
+
+    private bool StartSticking(Entity<StickyComponent> ent, EntityUid target, EntityUid user)
+    {
+        var (uid, comp) = ent;
+
+        // check whitelist and blacklist
+        if (_whitelist.IsWhitelistFail(comp.Whitelist, target) ||
+            _whitelist.IsBlacklistPass(comp.Blacklist, target))
+            return false;
+
+        var attemptEv = new AttemptEntityStickEvent(target, user);
+        RaiseLocalEvent(uid, ref attemptEv);
+        if (attemptEv.Cancelled)
+            return false;
+
+        // skip doafter and popup if it's instant
+        if (comp.StickDelay <= TimeSpan.Zero)
+        {
+            StickToEntity(ent, target, user);
+            return true;
+        }
+
+        // show message to user
+        if (comp.StickPopupStart != null)
+        {
+            var msg = Loc.GetString(comp.StickPopupStart);
+            _popup.PopupClient(msg, user, user);
+        }
+
+        // start sticking object to target
+        _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, comp.StickDelay, new StickyDoAfterEvent(), uid, target: target, used: uid)
+        {
+            BreakOnMove = true,
+            NeedHand = true,
+        });
+
+        return true;
+    }
+
+    private void OnStickyDoAfter(Entity<StickyComponent> ent, ref StickyDoAfterEvent args)
+    {
+        // target is the sticky item when unsticking and the surface when sticking, it will never be null
+        if (args.Handled || args.Cancelled || args.Args.Target is not {} target)
+            return;
+
+        var user = args.User;
+        if (ent.Comp.StuckTo == null)
+            StickToEntity(ent, target, user);
+        else
+            UnstickFromEntity(ent, user);
+
+        args.Handled = true;
+    }
+
+    private void StartUnsticking(Entity<StickyComponent> ent, EntityUid user)
+    {
+        var (uid, comp) = ent;
+        if (comp.StuckTo is not {} stuckTo)
+            return;
+
+        var attemptEv = new AttemptEntityUnstickEvent(stuckTo, user);
+        RaiseLocalEvent(uid, ref attemptEv);
+        if (attemptEv.Cancelled)
+            return;
+
+        // skip doafter and popup if it's instant
+        if (comp.UnstickDelay <= TimeSpan.Zero)
+        {
+            UnstickFromEntity(ent, user);
+            return;
+        }
+
+        // show message to user
+        if (comp.UnstickPopupStart != null)
+        {
+            var msg = Loc.GetString(comp.UnstickPopupStart);
+            _popup.PopupClient(msg, user, user);
+        }
+
+        // start unsticking object
+        _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, comp.UnstickDelay, new StickyDoAfterEvent(), uid, target: uid)
+        {
+            BreakOnMove = true,
+            NeedHand = true,
+        });
+    }
+
+    public void StickToEntity(Entity<StickyComponent> ent, EntityUid target, EntityUid user)
+    {
+        var (uid, comp) = ent;
+        var attemptEv = new AttemptEntityStickEvent(target, user);
+        RaiseLocalEvent(uid, ref attemptEv);
+        if (attemptEv.Cancelled)
+            return;
+
+        // add container to entity and insert sticker into it
+        var container = _container.EnsureContainer<Container>(target, StickerSlotId);
+        container.ShowContents = true;
+        if (!_container.Insert(uid, container))
+            return;
+
+        // show message to user
+        if (comp.StickPopupSuccess != null)
+        {
+            var msg = Loc.GetString(comp.StickPopupSuccess);
+            _popup.PopupClient(msg, user, user);
+        }
+
+        // send information to appearance that entity is stuck
+        _appearance.SetData(uid, StickyVisuals.IsStuck, true);
+
+        comp.StuckTo = target;
+        Dirty(uid, comp);
+
+        var ev = new EntityStuckEvent(target, user);
+        RaiseLocalEvent(uid, ref ev);
+    }
+
+    public void UnstickFromEntity(Entity<StickyComponent> ent, EntityUid user)
+    {
+        var (uid, comp) = ent;
+        if (comp.StuckTo is not {} stuckTo)
+            return;
+
+        var attemptEv = new AttemptEntityUnstickEvent(stuckTo, user);
+        RaiseLocalEvent(uid, ref attemptEv);
+        if (attemptEv.Cancelled)
+            return;
+
+        // try to remove sticky item from target container
+        if (!_container.TryGetContainer(stuckTo, StickerSlotId, out var container) || !_container.Remove(uid, container))
+            return;
+
+        // delete container if it's now empty
+        if (container.ContainedEntities.Count == 0)
+            _container.ShutdownContainer(container);
+
+        // try place dropped entity into user hands
+        _hands.PickupOrDrop(user, uid);
+
+        // send information to appearance that entity isn't stuck
+        _appearance.SetData(uid, StickyVisuals.IsStuck, false);
+
+        // show message to user
+        if (comp.UnstickPopupSuccess != null)
+        {
+            var msg = Loc.GetString(comp.UnstickPopupSuccess);
+            _popup.PopupClient(msg, user, user);
+        }
+
+        comp.StuckTo = null;
+        Dirty(uid, comp);
+
+        var ev = new EntityUnstuckEvent(stuckTo, user);
+        RaiseLocalEvent(uid, ref ev);
+    }
+}
diff --git a/Content.Shared/Storage/Components/ItemCounterComponent.cs b/Content.Shared/Storage/Components/ItemCounterComponent.cs
index 890bc84e721..6a1444ebf62 100644
--- a/Content.Shared/Storage/Components/ItemCounterComponent.cs
+++ b/Content.Shared/Storage/Components/ItemCounterComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Storage.EntitySystems;
+using Content.Shared.Storage.EntitySystems;
 using Content.Shared.Whitelist;
 
 namespace Content.Shared.Storage.Components
diff --git a/Content.Shared/Storage/Components/SecretStashComponent.cs b/Content.Shared/Storage/Components/SecretStashComponent.cs
index 8595f79ca57..3bf8e2e871b 100644
--- a/Content.Shared/Storage/Components/SecretStashComponent.cs
+++ b/Content.Shared/Storage/Components/SecretStashComponent.cs
@@ -7,84 +7,56 @@
 using Robust.Shared.GameStates;
 using Content.Shared.DoAfter;
 using Robust.Shared.Serialization;
+using Robust.Shared.Audio;
 
 namespace Content.Shared.Storage.Components
 {
     /// <summary>
     ///     Logic for a secret slot stash, like plant pot or toilet cistern.
-    ///     Unlike <see cref="ItemSlotsComponent"/> it doesn't have interaction logic or verbs.
-    ///     Other classes like <see cref="ToiletComponent"/> should implement it.
+    ///     Unlike <see cref="ItemSlotsComponent"/> it has logic for opening and closing
+    ///     the stash.
     /// </summary>
     [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
     [Access(typeof(SecretStashSystem))]
     public sealed partial class SecretStashComponent : Component
     {
         /// <summary>
-        ///     Max item size that can be fitted into secret stash.
+        ///     Max item size that can be inserted into secret stash.
         /// </summary>
         [DataField("maxItemSize")]
         public ProtoId<ItemSizePrototype> MaxItemSize = "Small";
 
         /// <summary>
-        /// If stash has way to open then this will switch between open and closed.
+        ///     This sound will be played when you try to insert an item in the stash.
+        ///     The sound will be played whether or not the item is actually inserted.
         /// </summary>
-        [DataField, AutoNetworkedField]
-        public bool ToggleOpen;
+        [DataField]
+        public SoundSpecifier? TryInsertItemSound;
 
         /// <summary>
-        /// Prying the door.
+        ///     This sound will be played when you try to remove an item in the stash.
+        ///     The sound will be played whether or not the item is actually removed.
         /// </summary>
         [DataField]
-        public float PryDoorTime = 1f;
-
-        [DataField]
-        public ProtoId<ToolQualityPrototype> PryingQuality = "Prying";
+        public SoundSpecifier? TryRemoveItemSound;
 
         /// <summary>
-        /// Is stash openable?.
+        ///     If true, verbs will appear to help interact with the stash.
         /// </summary>
         [DataField, AutoNetworkedField]
-        public bool OpenableStash = false;
+        public bool HasVerbs = true;
 
         /// <summary>
-        ///     IC secret stash name. For example "the toilet cistern".
-        ///     If empty string, will replace it with entity name in init.
+        ///     The name of the secret stash. For example "the toilet cistern".
+        ///     If null, the name of the entity will be used instead.
         /// </summary>
         [DataField]
-        public string SecretPartName { get; set; } = "";
-
-        [DataField, AutoNetworkedField]
-        public string ExamineStash = "comp-secret-stash-on-examine-found-hidden-item";
+        public string? SecretStashName;
 
         /// <summary>
         ///     Container used to keep secret stash item.
         /// </summary>
         [ViewVariables]
         public ContainerSlot ItemContainer = default!;
-
-    }
-
-    /// <summary>
-    /// Simple pry event for prying open a stash door.
-    /// </summary>
-    [Serializable, NetSerializable]
-    public sealed partial class StashPryDoAfterEvent : SimpleDoAfterEvent
-    {
-    }
-
-    /// <summary>
-    /// Visualizers for handling stash open closed state if stash has door.
-    /// </summary>
-    [Serializable, NetSerializable]
-    public enum StashVisuals : byte
-    {
-        DoorVisualState,
-    }
-
-    [Serializable, NetSerializable]
-    public enum DoorVisualState : byte
-    {
-        DoorOpen,
-        DoorClosed
     }
 }
diff --git a/Content.Shared/Storage/EntitySpawnEntry.cs b/Content.Shared/Storage/EntitySpawnEntry.cs
index 792459c72f7..6e24681c2db 100644
--- a/Content.Shared/Storage/EntitySpawnEntry.cs
+++ b/Content.Shared/Storage/EntitySpawnEntry.cs
@@ -5,6 +5,19 @@
 
 namespace Content.Shared.Storage;
 
+/// <summary>
+/// Prototype wrapper around <see cref="EntitySpawnEntry"/>
+/// </summary>
+[Prototype]
+public sealed class EntitySpawnEntryPrototype : IPrototype
+{
+    [IdDataField]
+    public string ID { get; } = string.Empty;
+
+    [DataField]
+    public List<EntitySpawnEntry> Entries = new();
+}
+
 /// <summary>
 ///     Dictates a list of items that can be spawned.
 /// </summary>
diff --git a/Content.Shared/Storage/EntitySystems/DumpableSystem.cs b/Content.Shared/Storage/EntitySystems/DumpableSystem.cs
index 91acde47e19..93c4b69e4dd 100644
--- a/Content.Shared/Storage/EntitySystems/DumpableSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/DumpableSystem.cs
@@ -133,7 +133,7 @@ private void StartDoAfter(EntityUid storageUid, EntityUid targetUid, EntityUid u
         _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, userUid, delay, new DumpableDoAfterEvent(), storageUid, target: targetUid, used: storageUid)
         {
             BreakOnMove = true,
-            NeedHand = true
+            NeedHand = true,
         });
     }
 
diff --git a/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs b/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs
index 9aee1b982e0..901d744df5f 100644
--- a/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs
@@ -8,215 +8,206 @@
 using Content.Shared.Interaction;
 using Content.Shared.Tools.Systems;
 using Content.Shared.Examine;
-
-namespace Content.Shared.Storage.EntitySystems
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
+using Content.Shared.Verbs;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Tools.EntitySystems;
+
+namespace Content.Shared.Storage.EntitySystems;
+
+/// <summary>
+///     Secret Stash allows an item to be hidden within.
+/// </summary>
+public sealed class SecretStashSystem : EntitySystem
 {
-    /// <summary>
-    /// Secret Stash allows an item to be hidden within.
-    /// </summary>
-    public sealed class SecretStashSystem : EntitySystem
-    {
-        [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
-        [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
-        [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
-        [Dependency] private readonly SharedItemSystem _item = default!;
-        [Dependency] private readonly SharedToolSystem _tool = default!;
-        [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<SecretStashComponent, ComponentInit>(OnInit);
-            SubscribeLocalEvent<SecretStashComponent, DestructionEventArgs>(OnDestroyed);
-            SubscribeLocalEvent<SecretStashComponent, StashPryDoAfterEvent>(OnSecretStashPried);
-            SubscribeLocalEvent<SecretStashComponent, InteractUsingEvent>(OnInteractUsing);
-            SubscribeLocalEvent<SecretStashComponent, InteractHandEvent>(OnInteractHand);
-            SubscribeLocalEvent<SecretStashComponent, ExaminedEvent>(OnExamine);
-        }
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+    [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
+    [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
+    [Dependency] private readonly SharedItemSystem _item = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly ToolOpenableSystem _toolOpenableSystem = default!;
 
-        private void OnInit(EntityUid uid, SecretStashComponent component, ComponentInit args)
-        {
-            component.ItemContainer = _containerSystem.EnsureContainer<ContainerSlot>(uid, "stash", out _);
-        }
 
-        private void OnDestroyed(EntityUid uid, SecretStashComponent component, DestructionEventArgs args)
-        {
-            _containerSystem.EmptyContainer(component.ItemContainer);
-        }
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<SecretStashComponent, ComponentInit>(OnInit);
+        SubscribeLocalEvent<SecretStashComponent, DestructionEventArgs>(OnDestroyed);
+        SubscribeLocalEvent<SecretStashComponent, InteractUsingEvent>(OnInteractUsing, after: new[] { typeof(ToolOpenableSystem) });
+        SubscribeLocalEvent<SecretStashComponent, InteractHandEvent>(OnInteractHand);
+        SubscribeLocalEvent<SecretStashComponent, GetVerbsEvent<InteractionVerb>>(OnGetVerb);
+    }
+
+    private void OnInit(Entity<SecretStashComponent> entity, ref ComponentInit args)
+    {
+        entity.Comp.ItemContainer = _containerSystem.EnsureContainer<ContainerSlot>(entity, "stash", out _);
+    }
 
-        /// <summary>
-        ///     Is there something inside secret stash item container?
-        /// </summary>
-        public bool HasItemInside(EntityUid uid, SecretStashComponent? component = null)
+    private void OnDestroyed(Entity<SecretStashComponent> entity, ref DestructionEventArgs args)
+    {
+        var storedInside = _containerSystem.EmptyContainer(entity.Comp.ItemContainer);
+        if (storedInside != null && storedInside.Count >= 1)
         {
-            if (!Resolve(uid, ref component))
-                return false;
-            return component.ItemContainer.ContainedEntity != null;
+            var popup = Loc.GetString("comp-secret-stash-on-destroyed-popup", ("stashname", GetStashName(entity)));
+            _popupSystem.PopupEntity(popup, storedInside[0], PopupType.MediumCaution);
         }
+    }
 
-        private void OnInteractUsing(EntityUid uid, SecretStashComponent component, InteractUsingEvent args)
-        {
-            if (args.Handled)
-                return;
+    private void OnInteractUsing(Entity<SecretStashComponent> entity, ref InteractUsingEvent args)
+    {
+        if (args.Handled || !IsStashOpen(entity))
+            return;
 
-            if (!component.OpenableStash)
-                return;
+        args.Handled = TryStashItem(entity, args.User, args.Used);
+    }
 
-            // is player trying place or lift off cistern lid?
-            if (_tool.UseTool(args.Used, args.User, uid, component.PryDoorTime, component.PryingQuality, new StashPryDoAfterEvent()))
-                args.Handled = true;
-            // maybe player is trying to hide something inside cistern?
-            else if (component.ToggleOpen)
-            {
-                TryHideItem(uid, args.User, args.Used);
-                args.Handled = true;
-            }
-        }
+    private void OnInteractHand(Entity<SecretStashComponent> entity, ref InteractHandEvent args)
+    {
+        if (args.Handled || !IsStashOpen(entity))
+            return;
 
-        private void OnInteractHand(EntityUid uid, SecretStashComponent component, InteractHandEvent args)
-        {
-            if (args.Handled)
-                return;
+        args.Handled = TryGetItem(entity, args.User);
+    }
 
-            if (!component.OpenableStash)
-                return;
+    /// <summary>
+    ///     Tries to hide the given item into the stash.
+    /// </summary>
+    /// <returns>True if item was hidden inside stash and false otherwise.</returns>
+    private bool TryStashItem(Entity<SecretStashComponent> entity, EntityUid userUid, EntityUid itemToHideUid)
+    {
+        if (!TryComp<ItemComponent>(itemToHideUid, out var itemComp))
+            return false;
 
-            // trying to get something from stash?
-            if (component.ToggleOpen)
-            {
-                var gotItem = TryGetItem(uid, args.User);
-                if (gotItem)
-                {
-                    args.Handled = true;
-                    return;
-                }
-            }
-            args.Handled = true;
-        }
+        _audio.PlayPredicted(entity.Comp.TryInsertItemSound, entity, userUid, AudioParams.Default.WithVariation(0.25f));
 
-        private void OnSecretStashPried(EntityUid uid, SecretStashComponent component, StashPryDoAfterEvent args)
+        // check if secret stash is already occupied
+        var container = entity.Comp.ItemContainer;
+        if (HasItemInside(entity))
         {
-            if (args.Cancelled)
-                return;
-
-            ToggleOpen(uid, component);
+            var popup = Loc.GetString("comp-secret-stash-action-hide-container-not-empty");
+            _popupSystem.PopupClient(popup, entity, userUid);
+            return false;
         }
 
-        public void ToggleOpen(EntityUid uid, SecretStashComponent? component = null, MetaDataComponent? meta = null)
+        // check if item is too big to fit into secret stash
+        if (_item.GetSizePrototype(itemComp.Size) > _item.GetSizePrototype(entity.Comp.MaxItemSize))
         {
-            if (!Resolve(uid, ref component))
-                return;
-
-            component.ToggleOpen = !component.ToggleOpen;
-
-            UpdateAppearance(uid, component);
-            Dirty(uid, component, meta);
+            var msg = Loc.GetString("comp-secret-stash-action-hide-item-too-big",
+                ("item", itemToHideUid), ("stashname", GetStashName(entity)));
+            _popupSystem.PopupClient(msg, entity, userUid);
+            return false;
         }
 
-        private void UpdateAppearance(EntityUid uid, SecretStashComponent? component = null)
-        {
-            if (!Resolve(uid, ref component))
-                return;
+        // try to move item from hands to stash container
+        if (!_handsSystem.TryDropIntoContainer(userUid, itemToHideUid, container))
+            return false;
 
-            _appearance.SetData(uid, StashVisuals.DoorVisualState, component.ToggleOpen ? DoorVisualState.DoorOpen : DoorVisualState.DoorClosed);
-        }
+        // all done, show success message
+        var successMsg = Loc.GetString("comp-secret-stash-action-hide-success",
+            ("item", itemToHideUid), ("stashname", GetStashName(entity)));
+        _popupSystem.PopupClient(successMsg, entity, userUid);
+        return true;
+    }
 
-        /// <summary>
-        ///     Tries to hide item inside secret stash from hands of user.
-        /// </summary>
-        /// <returns>True if item was hidden inside stash</returns>
-        public bool TryHideItem(EntityUid uid, EntityUid userUid, EntityUid itemToHideUid,
-            SecretStashComponent? component = null, ItemComponent? item = null,
-            HandsComponent? hands = null)
-        {
-            if (!Resolve(uid, ref component))
-                return false;
-            if (!Resolve(itemToHideUid, ref item))
-                return false;
-            if (!Resolve(userUid, ref hands))
-                return false;
-
-            // check if secret stash is already occupied
-            var container = component.ItemContainer;
-            if (container.ContainedEntity != null)
-            {
-                var msg = Loc.GetString("comp-secret-stash-action-hide-container-not-empty");
-                _popupSystem.PopupClient(msg, uid, userUid);
-                return false;
-            }
+    /// <summary>
+    ///     Try the given item in the stash and place it in users hand.
+    ///     If user can't take hold the item in their hands, the item will be dropped onto the ground.
+    /// </summary>
+    /// <returns>True if user received item.</returns>
+    private bool TryGetItem(Entity<SecretStashComponent> entity, EntityUid userUid)
+    {
+        if (!TryComp<HandsComponent>(userUid, out var handsComp))
+            return false;
 
-            // check if item is too big to fit into secret stash
-            if (_item.GetSizePrototype(item.Size) > _item.GetSizePrototype(component.MaxItemSize))
-            {
-                var msg = Loc.GetString("comp-secret-stash-action-hide-item-too-big",
-                    ("item", itemToHideUid), ("stash", GetSecretPartName(uid, component)));
-                _popupSystem.PopupClient(msg, uid, userUid);
-                return false;
-            }
+        _audio.PlayPredicted(entity.Comp.TryRemoveItemSound, entity, userUid, AudioParams.Default.WithVariation(0.25f));
 
-            // try to move item from hands to stash container
-            if (!_handsSystem.TryDropIntoContainer(userUid, itemToHideUid, container))
-            {
-                return false;
-            }
+        // check if secret stash has something inside
+        var itemInStash = entity.Comp.ItemContainer.ContainedEntity;
+        if (itemInStash == null)
+            return false;
 
-            // all done, show success message
-            var successMsg = Loc.GetString("comp-secret-stash-action-hide-success",
-                ("item", itemToHideUid), ("this", GetSecretPartName(uid, component)));
-            _popupSystem.PopupClient(successMsg, uid, userUid);
-            return true;
-        }
+        _handsSystem.PickupOrDrop(userUid, itemInStash.Value, handsComp: handsComp);
 
-        /// <summary>
-        ///     Try get item and place it in users hand.
-        ///     If user can't take it by hands, will drop item from container.
-        /// </summary>
-        /// <returns>True if user received item</returns>
-        public bool TryGetItem(EntityUid uid, EntityUid userUid, SecretStashComponent? component = null,
-            HandsComponent? hands = null)
-        {
-            if (!Resolve(uid, ref component))
-                return false;
-            if (!Resolve(userUid, ref hands))
-                return false;
-
-            // check if secret stash has something inside
-            var container = component.ItemContainer;
-            if (container.ContainedEntity == null)
-            {
-                return false;
-            }
+        // show success message
+        var successMsg = Loc.GetString("comp-secret-stash-action-get-item-found-something",
+            ("stashname", GetStashName(entity)));
+        _popupSystem.PopupClient(successMsg, entity, userUid);
 
-            _handsSystem.PickupOrDrop(userUid, container.ContainedEntity.Value, handsComp: hands);
+        return true;
+    }
+
+    private void OnGetVerb(Entity<SecretStashComponent> entity, ref GetVerbsEvent<InteractionVerb> args)
+    {
+        if (!args.CanInteract || !args.CanAccess || !entity.Comp.HasVerbs)
+            return;
 
-            // show success message
-            var successMsg = Loc.GetString("comp-secret-stash-action-get-item-found-something",
-                ("stash", GetSecretPartName(uid, component)));
-            _popupSystem.PopupClient(successMsg, uid, userUid);
+        var user = args.User;
+        var item = args.Using;
+        var stashName = GetStashName(entity);
 
-            return true;
-        }
+        var itemVerb = new InteractionVerb();
 
-        private void OnExamine(EntityUid uid, SecretStashComponent component, ExaminedEvent args)
+        // This will add the verb relating to inserting / grabbing items.
+        if (IsStashOpen(entity))
         {
-            if (args.IsInDetailsRange && component.ToggleOpen)
+            if (item != null)
             {
-                if (HasItemInside(uid))
+                itemVerb.Text = Loc.GetString("comp-secret-stash-verb-insert-into-stash");
+                if (HasItemInside(entity))
                 {
-                    var msg = Loc.GetString(component.ExamineStash);
-                    args.PushMarkup(msg);
+                    itemVerb.Disabled = true;
+                    itemVerb.Message = Loc.GetString("comp-secret-stash-verb-insert-message-item-already-inside", ("stashname", stashName));
                 }
+                else
+                {
+                    itemVerb.Message = Loc.GetString("comp-secret-stash-verb-insert-message-no-item", ("item", item), ("stashname", stashName));
+                }
+
+                itemVerb.Act = () => TryStashItem(entity, user, item.Value);
+            }
+            else
+            {
+                itemVerb.Text = Loc.GetString("comp-secret-stash-verb-take-out-item");
+                itemVerb.Message = Loc.GetString("comp-secret-stash-verb-take-out-message-something", ("stashname", stashName));
+                if (!HasItemInside(entity))
+                {
+                    itemVerb.Disabled = true;
+                    itemVerb.Message = Loc.GetString("comp-secret-stash-verb-take-out-message-nothing", ("stashname", stashName));
+                }
+
+                itemVerb.Act = () => TryGetItem(entity, user);
             }
+
+            args.Verbs.Add(itemVerb);
         }
+    }
 
-        private string GetSecretPartName(EntityUid uid, SecretStashComponent stash)
-        {
-            if (stash.SecretPartName != "")
-                return Loc.GetString(stash.SecretPartName);
+    #region Helper functions
 
-            var entityName = Loc.GetString("comp-secret-stash-secret-part-name", ("this", uid));
+    /// <returns>
+    ///     The stash name if it exists, or the entity name if it doesn't.
+    ///  </returns>
+    private string GetStashName(Entity<SecretStashComponent> entity)
+    {
+        if (entity.Comp.SecretStashName == null)
+            return Identity.Name(entity, EntityManager);
+        return Loc.GetString(entity.Comp.SecretStashName);
+    }
 
-            return entityName;
-        }
+    /// <returns>
+    ///     True if the stash is open OR the there is no toolOpenableComponent attacheded to the entity
+    ///     and false otherwise.
+    ///  </returns>
+    private bool IsStashOpen(Entity<SecretStashComponent> stash)
+    {
+        return _toolOpenableSystem.IsOpen(stash);
     }
+
+    private bool HasItemInside(Entity<SecretStashComponent> entity)
+    {
+        return entity.Comp.ItemContainer.ContainedEntity != null;
+    }
+
+    #endregion
 }
diff --git a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
index bb49725e047..4932613d0e6 100644
--- a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
@@ -16,16 +16,14 @@
 using Content.Shared.Verbs;
 using Content.Shared.Wall;
 using Content.Shared.Whitelist;
-using Robust.Shared.Audio;
+using Content.Shared.ActionBlocker;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
 using Robust.Shared.Map;
 using Robust.Shared.Network;
 using Robust.Shared.Physics;
-using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Systems;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
@@ -47,6 +45,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
     [Dependency] protected readonly SharedTransformSystem TransformSystem = default!;
     [Dependency] private   readonly WeldableSystem _weldable = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+    [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
 
     public const string ContainerName = "entity_storage";
 
@@ -132,6 +131,9 @@ protected void OnRelayMovement(EntityUid uid, SharedEntityStorageComponent compo
         if (!HasComp<HandsComponent>(args.Entity))
             return;
 
+        if (!_actionBlocker.CanMove(args.Entity))
+            return;
+
         if (_timing.CurTime < component.NextInternalOpenAttempt)
             return;
 
@@ -139,9 +141,7 @@ protected void OnRelayMovement(EntityUid uid, SharedEntityStorageComponent compo
         Dirty(uid, component);
 
         if (component.OpenOnMove)
-        {
             TryOpenStorage(args.Entity, uid);
-        }
     }
 
     protected void OnFoldAttempt(EntityUid uid, SharedEntityStorageComponent component, ref FoldAttemptEvent args)
diff --git a/Content.Shared/Storage/EntitySystems/SharedItemMapperSystem.cs b/Content.Shared/Storage/EntitySystems/SharedItemMapperSystem.cs
index cfa082a9eeb..7ae821d8d91 100644
--- a/Content.Shared/Storage/EntitySystems/SharedItemMapperSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedItemMapperSystem.cs
@@ -4,106 +4,109 @@
 using JetBrains.Annotations;
 using Robust.Shared.Containers;
 
-namespace Content.Shared.Storage.EntitySystems
+namespace Content.Shared.Storage.EntitySystems;
+
+/// <summary>
+/// <c>ItemMapperSystem</c> is a system that on each initialization, insertion, removal of an entity from
+/// given <see cref="ItemMapperComponent"/> (with appropriate storage attached) will check each stored item to see
+/// if its tags/component, and overall quantity match <see cref="ItemMapperComponent.MapLayers"/>.
+/// </summary>
+[UsedImplicitly]
+public abstract class SharedItemMapperSystem : EntitySystem
 {
-    /// <summary>
-    /// <c>ItemMapperSystem</c> is a system that on each initialization, insertion, removal of an entity from
-    /// given <see cref="ItemMapperComponent"/> (with appropriate storage attached) will check each stored item to see
-    /// if its tags/component, and overall quantity match <see cref="ItemMapperComponent.MapLayers"/>.
-    /// </summary>
-    [UsedImplicitly]
-    public abstract class SharedItemMapperSystem : EntitySystem
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly SharedContainerSystem _container = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+
+    /// <inheritdoc />
+    public override void Initialize()
     {
-        [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-        [Dependency] private readonly SharedContainerSystem _container = default!;
-        [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+        base.Initialize();
+        SubscribeLocalEvent<ItemMapperComponent, ComponentInit>(InitLayers);
+        SubscribeLocalEvent<ItemMapperComponent, EntInsertedIntoContainerMessage>(MapperEntityInserted);
+        SubscribeLocalEvent<ItemMapperComponent, EntRemovedFromContainerMessage>(MapperEntityRemoved);
+    }
 
-        /// <inheritdoc />
-        public override void Initialize()
+    private void InitLayers(EntityUid uid, ItemMapperComponent component, ComponentInit args)
+    {
+        foreach (var (layerName, val) in component.MapLayers)
         {
-            base.Initialize();
-            SubscribeLocalEvent<ItemMapperComponent, ComponentInit>(InitLayers);
-            SubscribeLocalEvent<ItemMapperComponent, EntInsertedIntoContainerMessage>(MapperEntityInserted);
-            SubscribeLocalEvent<ItemMapperComponent, EntRemovedFromContainerMessage>(MapperEntityRemoved);
+            val.Layer = layerName;
         }
 
-        private void InitLayers(EntityUid uid, ItemMapperComponent component, ComponentInit args)
+        if (EntityManager.TryGetComponent(uid, out AppearanceComponent? appearanceComponent))
         {
-            foreach (var (layerName, val) in component.MapLayers)
-            {
-                val.Layer = layerName;
-            }
+            var list = new List<string>(component.MapLayers.Keys);
+            _appearance.SetData(uid, StorageMapVisuals.InitLayers, new ShowLayerData(list), appearanceComponent);
+        }
 
-            if (EntityManager.TryGetComponent(uid, out AppearanceComponent? appearanceComponent))
-            {
-                var list = new List<string>(component.MapLayers.Keys);
-                _appearance.SetData(uid, StorageMapVisuals.InitLayers, new ShowLayerData(list), appearanceComponent);
-            }
+        // Ensure appearance is correct with current contained entities.
+        UpdateAppearance(uid, component);
+    }
 
-            // Ensure appearance is correct with current contained entities.
-            UpdateAppearance(uid, component);
-        }
+    private void MapperEntityRemoved(EntityUid uid, ItemMapperComponent itemMapper, EntRemovedFromContainerMessage args)
+    {
+        if (itemMapper.ContainerWhitelist != null && !itemMapper.ContainerWhitelist.Contains(args.Container.ID))
+            return;
 
-        private void MapperEntityRemoved(EntityUid uid, ItemMapperComponent itemMapper,
-            EntRemovedFromContainerMessage args)
-        {
-            if (itemMapper.ContainerWhitelist != null && !itemMapper.ContainerWhitelist.Contains(args.Container.ID))
-                return;
+        UpdateAppearance(uid, itemMapper);
+    }
 
-            UpdateAppearance(uid, itemMapper);
-        }
+    private void MapperEntityInserted(EntityUid uid,
+        ItemMapperComponent itemMapper,
+        EntInsertedIntoContainerMessage args)
+    {
+        if (itemMapper.ContainerWhitelist != null && !itemMapper.ContainerWhitelist.Contains(args.Container.ID))
+            return;
 
-        private void MapperEntityInserted(EntityUid uid, ItemMapperComponent itemMapper,
-            EntInsertedIntoContainerMessage args)
-        {
-            if (itemMapper.ContainerWhitelist != null && !itemMapper.ContainerWhitelist.Contains(args.Container.ID))
-                return;
+        UpdateAppearance(uid, itemMapper);
+    }
 
-            UpdateAppearance(uid, itemMapper);
-        }
+    private void UpdateAppearance(EntityUid uid, ItemMapperComponent? itemMapper = null)
+    {
+        if (!Resolve(uid, ref itemMapper))
+            return;
 
-        private void UpdateAppearance(EntityUid uid, ItemMapperComponent? itemMapper = null)
+        if (EntityManager.TryGetComponent(uid, out AppearanceComponent? appearanceComponent)
+            && TryGetLayers(uid, itemMapper, out var containedLayers))
         {
-            if(!Resolve(uid, ref itemMapper))
-                return;
-
-            if (EntityManager.TryGetComponent(uid, out AppearanceComponent? appearanceComponent)
-                && TryGetLayers(uid, itemMapper, out var containedLayers))
-            {
-                _appearance.SetData(uid, StorageMapVisuals.LayerChanged, new ShowLayerData(containedLayers), appearanceComponent);
-            }
+            _appearance.SetData(uid,
+                StorageMapVisuals.LayerChanged,
+                new ShowLayerData(containedLayers),
+                appearanceComponent);
         }
+    }
 
-        /// <summary>
-        /// Method that iterates over storage of the entity in <paramref name="uid"/> and sets <paramref name="containedLayers"/> according to
-        /// <paramref name="itemMapper"/> definition. It will have O(n*m) time behavior (n - number of entities in container, and m - number of
-        /// definitions in <paramref name="containedLayers"/>.
-        /// </summary>
-        /// <param name="uid">EntityUid used to search the storage</param>
-        /// <param name="itemMapper">component that contains definition used to map <see cref="Content.Shared.Whitelist.EntityWhitelist">whitelist</see> in
-        /// <c>mapLayers</c> to string.
-        /// </param>
-        /// <param name="containedLayers">list of <paramref name="itemMapper"/> layers that should be visible</param>
-        /// <returns>false if <c>msg.Container.Owner</c> is not a storage, true otherwise.</returns>
-        private bool TryGetLayers(EntityUid uid,
-            ItemMapperComponent itemMapper,
-            out List<string> showLayers)
-        {
-            var containedLayers = _container.GetAllContainers(uid)
-                .Where(c => itemMapper.ContainerWhitelist?.Contains(c.ID) ?? true).SelectMany(cont => cont.ContainedEntities).ToArray();
+    /// <summary>
+    /// Method that iterates over storage of the entity in <paramref name="uid"/> and sets <paramref name="showLayers"/>
+    /// according to <paramref name="itemMapper"/> definition. It will have O(n*m) time behavior
+    /// (n - number of entities in container, and m - number of definitions in <paramref name="showLayers"/>).
+    /// </summary>
+    /// <param name="uid">EntityUid used to search the storage</param>
+    /// <param name="itemMapper">component that contains definition used to map
+    /// <see cref="EntityWhitelist">Whitelist</see> in <see cref="ItemMapperComponent.MapLayers"/> to string.
+    /// </param>
+    /// <param name="showLayers">list of <paramref name="itemMapper"/> layers that should be visible</param>
+    /// <returns>false if <c>msg.Container.Owner</c> is not a storage, true otherwise.</returns>
+    private bool TryGetLayers(EntityUid uid, ItemMapperComponent itemMapper, out List<string> showLayers)
+    {
+        var containedLayers = _container.GetAllContainers(uid)
+            .Where(c => itemMapper.ContainerWhitelist?.Contains(c.ID) ?? true)
+            .SelectMany(cont => cont.ContainedEntities)
+            .ToArray();
 
-            var list = new List<string>();
-            foreach (var mapLayerData in itemMapper.MapLayers.Values)
+        var list = new List<string>();
+        foreach (var mapLayerData in itemMapper.MapLayers.Values)
+        {
+            var count = containedLayers.Count(ent => _whitelistSystem.IsWhitelistPassOrNull(mapLayerData.Whitelist,
+                ent));
+            if (count >= mapLayerData.MinCount && count <= mapLayerData.MaxCount)
             {
-                var count = containedLayers.Count(ent => _whitelistSystem.IsWhitelistPass(mapLayerData.Whitelist, ent));
-                if (count >= mapLayerData.MinCount && count <= mapLayerData.MaxCount)
-                {
-                    list.Add(mapLayerData.Layer);
-                }
+                list.Add(mapLayerData.Layer);
             }
-
-            showLayers = list;
-            return true;
         }
+
+        showLayers = list;
+        return true;
     }
 }
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index ac168a3a841..a7082e96a28 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -2,7 +2,9 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Shared.ActionBlocker;
+using Content.Shared.Administration.Logs;
 using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Database;
 using Content.Shared.Destructible;
 using Content.Shared.DoAfter;
 using Content.Shared.Hands.Components;
@@ -23,6 +25,7 @@
 using Content.Shared.Timing;
 using Content.Shared.Verbs;
 using Content.Shared.Whitelist;
+using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
@@ -57,6 +60,7 @@ public abstract class SharedStorageSystem : EntitySystem
     [Dependency] private   readonly SharedUserInterfaceSystem _ui = default!;
     [Dependency] protected readonly UseDelaySystem UseDelay = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLog = default!;
 
     private EntityQuery<ItemComponent> _itemQuery;
     private EntityQuery<StackComponent> _stackQuery;
@@ -66,6 +70,9 @@ public abstract class SharedStorageSystem : EntitySystem
     public const string DefaultStorageMaxItemSize = "Normal";
 
     public const float AreaInsertDelayPerItem = 0.075f;
+    private static AudioParams _audioParams = AudioParams.Default
+        .WithMaxDistance(7f)
+        .WithVolume(-2f);
 
     private ItemSizePrototype _defaultStorageMaxItemSize = default!;
 
@@ -444,7 +451,7 @@ private void AfterInteract(EntityUid uid, StorageComponent storageComp, AfterInt
                 {
                     BreakOnDamage = true,
                     BreakOnMove = true,
-                    NeedHand = true
+                    NeedHand = true,
                 };
 
                 _doAfterSystem.TryStartDoAfter(doAfterArgs);
@@ -543,7 +550,7 @@ private void OnDoAfter(EntityUid uid, StorageComponent component, AreaPickupDoAf
         // If we picked up at least one thing, play a sound and do a cool animation!
         if (successfullyInserted.Count > 0)
         {
-            Audio.PlayPredicted(component.StorageInsertSound, uid, args.User);
+            Audio.PlayPredicted(component.StorageInsertSound, uid, args.User, _audioParams);
             EntityManager.RaiseSharedEvent(new AnimateInsertingEntitiesEvent(
                 GetNetEntity(uid),
                 GetNetEntityList(successfullyInserted),
@@ -574,151 +581,79 @@ private void OnDestroy(EntityUid uid, StorageComponent storageComp, DestructionE
     /// </summary>
     private void OnInteractWithItem(StorageInteractWithItemEvent msg, EntitySessionEventArgs args)
     {
-        if (args.SenderSession.AttachedEntity is not { } player)
-            return;
-
-        var uid = GetEntity(msg.StorageUid);
-        var entity = GetEntity(msg.InteractedItemUid);
-
-        if (!TryComp<StorageComponent>(uid, out var storageComp))
-            return;
-
-        if (!_ui.IsUiOpen(uid, StorageComponent.StorageUiKey.Key, player))
-            return;
-
-        if (!Exists(entity))
-        {
-            Log.Error($"Player {args.SenderSession} interacted with non-existent item {msg.InteractedItemUid} stored in {ToPrettyString(uid)}");
-            return;
-        }
-
-        if (!ActionBlocker.CanInteract(player, entity) || !storageComp.Container.Contains(entity))
-            return;
-
-        // Does the player have hands?
-        if (!TryComp(player, out HandsComponent? hands) || hands.Count == 0)
+        if (!ValidateInput(args, msg.StorageUid, msg.InteractedItemUid, out var player, out var storage, out var item))
             return;
 
         // If the user's active hand is empty, try pick up the item.
-        if (hands.ActiveHandEntity == null)
+        if (player.Comp.ActiveHandEntity == null)
         {
-            if (_sharedHandsSystem.TryPickupAnyHand(player, entity, handsComp: hands)
-                && storageComp.StorageRemoveSound != null)
-                Audio.PlayPredicted(storageComp.StorageRemoveSound, uid, player);
+            _adminLog.Add(
+                LogType.Storage,
+                LogImpact.Low,
+                $"{ToPrettyString(player):player} is attempting to take {ToPrettyString(item):item} out of {ToPrettyString(storage):storage}");
+
+            if (_sharedHandsSystem.TryPickupAnyHand(player, item, handsComp: player.Comp)
+                && storage.Comp.StorageRemoveSound != null)
             {
-                return;
+                Audio.PlayPredicted(storage.Comp.StorageRemoveSound, storage, player, _audioParams);
             }
+
+            return;
         }
 
+        _adminLog.Add(
+            LogType.Storage,
+            LogImpact.Low,
+            $"{ToPrettyString(player):player} is interacting with {ToPrettyString(item):item} while it is stored in {ToPrettyString(storage):storage} using {ToPrettyString(player.Comp.ActiveHandEntity):used}");
+
         // Else, interact using the held item
-        _interactionSystem.InteractUsing(player, hands.ActiveHandEntity.Value, entity, Transform(entity).Coordinates, checkCanInteract: false);
+        _interactionSystem.InteractUsing(player, player.Comp.ActiveHandEntity.Value, item, Transform(item).Coordinates, checkCanInteract: false);
     }
 
     private void OnSetItemLocation(StorageSetItemLocationEvent msg, EntitySessionEventArgs args)
     {
-        if (args.SenderSession.AttachedEntity is not { } player)
-            return;
-
-        var storageEnt = GetEntity(msg.StorageEnt);
-        var itemEnt = GetEntity(msg.ItemEnt);
-
-        if (!TryComp<StorageComponent>(storageEnt, out var storageComp))
-            return;
-
-        if (!_ui.IsUiOpen(storageEnt, StorageComponent.StorageUiKey.Key, player))
-            return;
-
-        if (!Exists(itemEnt))
-        {
-            Log.Error($"Player {args.SenderSession} set location of non-existent item {msg.ItemEnt} stored in {ToPrettyString(storageEnt)}");
+        if (!ValidateInput(args, msg.StorageEnt, msg.ItemEnt, out var player, out var storage, out var item))
             return;
-        }
 
-        if (!ActionBlocker.CanInteract(player, itemEnt))
-            return;
+        _adminLog.Add(
+            LogType.Storage,
+            LogImpact.Low,
+            $"{ToPrettyString(player):player} is updating the location of {ToPrettyString(item):item} within {ToPrettyString(storage):storage}");
 
-        TrySetItemStorageLocation((itemEnt, null), (storageEnt, storageComp), msg.Location);
+        TrySetItemStorageLocation(item!, storage!, msg.Location);
     }
 
     private void OnRemoveItem(StorageRemoveItemEvent msg, EntitySessionEventArgs args)
     {
-        if (args.SenderSession.AttachedEntity is not { } player)
+        if (!ValidateInput(args, msg.StorageEnt, msg.ItemEnt, out var player, out var storage, out var item))
             return;
 
-        var storageEnt = GetEntity(msg.StorageEnt);
-        var itemEnt = GetEntity(msg.ItemEnt);
-
-        if (!TryComp<StorageComponent>(storageEnt, out var storageComp))
-            return;
-
-        if (!_ui.IsUiOpen(storageEnt, StorageComponent.StorageUiKey.Key, player))
-            return;
-
-        if (!Exists(itemEnt))
-        {
-            Log.Error($"Player {args.SenderSession} set location of non-existent item {msg.ItemEnt} stored in {ToPrettyString(storageEnt)}");
-            return;
-        }
-
-        if (!ActionBlocker.CanInteract(player, itemEnt))
-            return;
-
-        TransformSystem.DropNextTo(itemEnt, player);
-        Audio.PlayPredicted(storageComp.StorageRemoveSound, storageEnt, player);
+        _adminLog.Add(
+            LogType.Storage,
+            LogImpact.Low,
+            $"{ToPrettyString(player):player} is removing {ToPrettyString(item):item} from {ToPrettyString(storage):storage}");
+        TransformSystem.DropNextTo(item.Owner, player.Owner);
+        Audio.PlayPredicted(storage.Comp.StorageRemoveSound, storage, player, _audioParams);
     }
 
     private void OnInsertItemIntoLocation(StorageInsertItemIntoLocationEvent msg, EntitySessionEventArgs args)
     {
-        if (args.SenderSession.AttachedEntity is not { } player)
-            return;
-
-        var storageEnt = GetEntity(msg.StorageEnt);
-        var itemEnt = GetEntity(msg.ItemEnt);
-
-        if (!TryComp<StorageComponent>(storageEnt, out var storageComp))
-            return;
-
-        if (!_ui.IsUiOpen(storageEnt, StorageComponent.StorageUiKey.Key, player))
-            return;
-
-        if (!Exists(itemEnt))
-        {
-            Log.Error($"Player {args.SenderSession} set location of non-existent item {msg.ItemEnt} stored in {ToPrettyString(storageEnt)}");
-            return;
-        }
-
-        if (!ActionBlocker.CanInteract(player, itemEnt) || !_sharedHandsSystem.IsHolding(player, itemEnt, out _))
+        if (!ValidateInput(args, msg.StorageEnt, msg.ItemEnt, out var player, out var storage, out var item, held: true))
             return;
 
-        InsertAt((storageEnt, storageComp), (itemEnt, null), msg.Location, out _, player, stackAutomatically: false);
+        _adminLog.Add(
+            LogType.Storage,
+            LogImpact.Low,
+            $"{ToPrettyString(player):player} is inserting {ToPrettyString(item):item} into {ToPrettyString(storage):storage}");
+        InsertAt(storage!, item!, msg.Location, out _, player, stackAutomatically: false);
     }
 
-    // TODO: if/when someone cleans up this shitcode please make all these
-    // handlers use a shared helper for checking that the ui is open etc, thanks
     private void OnSaveItemLocation(StorageSaveItemLocationEvent msg, EntitySessionEventArgs args)
     {
-        if (args.SenderSession.AttachedEntity is not {} player)
+        if (!ValidateInput(args, msg.Storage, msg.Item, out var player, out var storage, out var item, held: true))
             return;
 
-        var storage = GetEntity(msg.Storage);
-        var item = GetEntity(msg.Item);
-
-        if (!HasComp<StorageComponent>(storage))
-            return;
-
-        if (!_ui.IsUiOpen(storage, StorageComponent.StorageUiKey.Key, player))
-            return;
-
-        if (!Exists(item))
-        {
-            Log.Error($"Player {args.SenderSession} saved location of non-existent item {msg.Item} stored in {ToPrettyString(storage)}");
-            return;
-        }
-
-        if (!ActionBlocker.CanInteract(player, item))
-            return;
-
-        SaveItemLocation(storage, item);
+        SaveItemLocation(storage!, item.Owner);
     }
 
     private void OnBoundUIOpen(EntityUid uid, StorageComponent storageComp, BoundUIOpenedEvent args)
@@ -807,7 +742,11 @@ public void UpdateAppearance(Entity<StorageComponent?, AppearanceComponent?> ent
         _appearance.SetData(uid, StorageVisuals.Capacity, capacity, appearance);
         _appearance.SetData(uid, StorageVisuals.Open, isOpen, appearance);
         _appearance.SetData(uid, SharedBagOpenVisuals.BagState, isOpen ? SharedBagState.Open : SharedBagState.Closed, appearance);
-        _appearance.SetData(uid, StackVisuals.Hide, !isOpen, appearance);
+
+        // HideClosedStackVisuals true sets the StackVisuals.Hide to the open state of the storage.
+        // This is for containers that only show their contents when open. (e.g. donut boxes)
+        if (storage.HideStackVisualsWhenClosed)
+            _appearance.SetData(uid, StackVisuals.Hide, !isOpen, appearance);
     }
 
     /// <summary>
@@ -836,7 +775,7 @@ public void TransferEntities(EntityUid source, EntityUid target, EntityUid? user
             Insert(target, entity, out _, user: user, targetComp, playSound: false);
         }
 
-        Audio.PlayPredicted(sourceComp.StorageInsertSound, target, user);
+        Audio.PlayPredicted(sourceComp.StorageInsertSound, target, user, _audioParams);
     }
 
     /// <summary>
@@ -1015,7 +954,7 @@ public bool Insert(
                 return false;
 
             if (playSound)
-                Audio.PlayPredicted(storageComp.StorageInsertSound, uid, user);
+                Audio.PlayPredicted(storageComp.StorageInsertSound, uid, user, _audioParams);
 
             return true;
         }
@@ -1045,7 +984,7 @@ public bool Insert(
         }
 
         if (playSound)
-            Audio.PlayPredicted(storageComp.StorageInsertSound, uid, user);
+            Audio.PlayPredicted(storageComp.StorageInsertSound, uid, user, _audioParams);
 
         return true;
     }
@@ -1427,7 +1366,7 @@ private void OnLockToggled(EntityUid uid, StorageComponent component, ref LockTo
 
     private void OnStackCountChanged(EntityUid uid, MetaDataComponent component, StackCountChangedEvent args)
     {
-        if (_containerSystem.TryGetContainingContainer(uid, out var container, component) &&
+        if (_containerSystem.TryGetContainingContainer((uid, null, component), out var container) &&
             container.ID == StorageComponent.ContainerId)
         {
             UpdateAppearance(container.Owner);
@@ -1496,6 +1435,79 @@ private bool CanInteract(EntityUid user, Entity<StorageComponent> storage, bool
     public abstract void PlayPickupAnimation(EntityUid uid, EntityCoordinates initialCoordinates,
         EntityCoordinates finalCoordinates, Angle initialRotation, EntityUid? user = null);
 
+    private bool ValidateInput(
+        EntitySessionEventArgs args,
+        NetEntity netStorage,
+        out Entity<HandsComponent> player,
+        out Entity<StorageComponent> storage)
+    {
+        player = default;
+        storage = default;
+
+        if (args.SenderSession.AttachedEntity is not { } playerUid)
+            return false;
+
+        if (!TryComp(playerUid, out HandsComponent? hands) || hands.Count == 0)
+            return false;
+
+        if (!TryGetEntity(netStorage, out var storageUid))
+            return false;
+
+        if (!TryComp(storageUid, out StorageComponent? storageComp))
+            return false;
+
+        // TODO STORAGE use BUI events
+        // This would automatically validate that the UI is open & that the user can interact.
+        // However, we still need to manually validate that items being used are in the users hands or in the storage.
+        if (!_ui.IsUiOpen(storageUid.Value, StorageComponent.StorageUiKey.Key, playerUid))
+            return false;
+
+        if (!ActionBlocker.CanInteract(playerUid, storageUid))
+            return false;
+
+        player = new(playerUid, hands);
+        storage = new(storageUid.Value, storageComp);
+        return true;
+    }
+
+    private bool ValidateInput(EntitySessionEventArgs args,
+        NetEntity netStorage,
+        NetEntity netItem,
+        out Entity<HandsComponent> player,
+        out Entity<StorageComponent> storage,
+        out Entity<ItemComponent> item,
+        bool held = false)
+    {
+        item = default!;
+        if (!ValidateInput(args, netStorage, out player, out storage))
+            return false;
+
+        if (!TryGetEntity(netItem, out var itemUid))
+            return false;
+
+        if (held)
+        {
+            if (!_sharedHandsSystem.IsHolding(player, itemUid, out _))
+                return false;
+        }
+        else
+        {
+            if (!storage.Comp.Container.Contains(itemUid.Value))
+                return false;
+
+            DebugTools.Assert(storage.Comp.StoredItems.ContainsKey(itemUid.Value));
+        }
+
+        if (!TryComp(itemUid, out ItemComponent? itemComp))
+            return false;
+
+        if (!ActionBlocker.CanInteract(player, itemUid))
+            return false;
+
+        item = new(itemUid.Value, itemComp);
+        return true;
+    }
+
     [Serializable, NetSerializable]
     protected sealed class StorageComponentState : ComponentState
     {
diff --git a/Content.Shared/Storage/StorageComponent.cs b/Content.Shared/Storage/StorageComponent.cs
index 2860f8dacfe..a666169f529 100644
--- a/Content.Shared/Storage/StorageComponent.cs
+++ b/Content.Shared/Storage/StorageComponent.cs
@@ -123,6 +123,14 @@ public sealed partial class StorageComponent : Component
         [DataField, ViewVariables(VVAccess.ReadWrite)]
         public StorageDefaultOrientation? DefaultStorageOrientation;
 
+        /// <summary>
+        /// If true, sets StackVisuals.Hide to true when the container is closed
+        /// Used in cases where there are sprites that are shown when the container is open but not
+        /// when it is closed
+        /// </summary>
+        [DataField]
+        public bool HideStackVisualsWhenClosed = true;
+
         [Serializable, NetSerializable]
         public enum StorageUiKey : byte
         {
diff --git a/Content.Shared/Strip/SharedStrippableSystem.cs b/Content.Shared/Strip/SharedStrippableSystem.cs
index 38e2f9fd7a5..e42f6e3aa78 100644
--- a/Content.Shared/Strip/SharedStrippableSystem.cs
+++ b/Content.Shared/Strip/SharedStrippableSystem.cs
@@ -61,11 +61,12 @@ public bool TryOpenStrippingUi(EntityUid user, Entity<StrippableComponent> targe
 
     private void OnCanDropOn(EntityUid uid, StrippingComponent component, ref CanDropTargetEvent args)
     {
-        args.Handled = true;
-        args.CanDrop |= uid == args.User &&
-                        HasComp<StrippableComponent>(args.Dragged) &&
-                        HasComp<HandsComponent>(args.User) &&
-                        HasComp<StrippingComponent>(args.User);
+        var val = uid == args.User &&
+                  HasComp<StrippableComponent>(args.Dragged) &&
+                  HasComp<HandsComponent>(args.User) &&
+                  HasComp<StrippingComponent>(args.User);
+        args.Handled |= val;
+        args.CanDrop |= val;
     }
 
     private void OnCanDrop(EntityUid uid, StrippableComponent component, ref CanDropDraggedEvent args)
diff --git a/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs b/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs
index 58c249fec54..0fbaefc31bf 100644
--- a/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs
+++ b/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs
@@ -45,7 +45,7 @@ public override void Initialize()
     private void OnInteract(Entity<SwapTeleporterComponent> ent, ref AfterInteractEvent args)
     {
         var (uid, comp) = ent;
-        if (args.Target == null)
+        if (args.Target == null || !args.CanReach)
             return;
 
         var target = args.Target.Value;
@@ -153,9 +153,23 @@ public void DoTeleport(Entity<SwapTeleporterComponent, TransformComponent> ent)
         var teleEnt = GetTeleportingEntity((uid, xform));
         var otherTeleEnt = GetTeleportingEntity((linkedEnt, Transform(linkedEnt)));
 
-        _popup.PopupEntity(Loc.GetString("swap-teleporter-popup-teleport-other",
+        _container.TryGetOuterContainer(teleEnt, Transform(teleEnt), out var cont);
+        _container.TryGetOuterContainer(otherTeleEnt, Transform(otherTeleEnt), out var otherCont);
+
+        if (otherCont != null && !_container.CanInsert(teleEnt, otherCont) ||
+            cont != null && !_container.CanInsert(otherTeleEnt, cont))
+        {
+            _popup.PopupEntity(Loc.GetString("swap-teleporter-popup-teleport-fail",
+                ("entity", Identity.Entity(linkedEnt, EntityManager))),
+                teleEnt,
+                teleEnt,
+                PopupType.MediumCaution);
+            return;
+        }
+
+        _popup.PopupClient(Loc.GetString("swap-teleporter-popup-teleport-other",
             ("entity", Identity.Entity(linkedEnt, EntityManager))),
-            otherTeleEnt,
+            teleEnt,
             otherTeleEnt,
             PopupType.MediumCaution);
         _transform.SwapPositions(teleEnt, otherTeleEnt);
@@ -187,8 +201,6 @@ 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;
diff --git a/Content.Shared/Temperature/Components/TemperatureSpeedComponent.cs b/Content.Shared/Temperature/Components/TemperatureSpeedComponent.cs
new file mode 100644
index 00000000000..74ba2a02749
--- /dev/null
+++ b/Content.Shared/Temperature/Components/TemperatureSpeedComponent.cs
@@ -0,0 +1,30 @@
+using Content.Shared.Temperature.Systems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Temperature.Components;
+
+/// <summary>
+/// This is used for an entity that varies in speed based on current temperature.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedTemperatureSystem)), AutoGenerateComponentState, AutoGenerateComponentPause]
+public sealed partial class TemperatureSpeedComponent : Component
+{
+    /// <summary>
+    /// Pairs of temperature thresholds to applied slowdown values.
+    /// </summary>
+    [DataField]
+    public Dictionary<float, float> Thresholds = new();
+
+    /// <summary>
+    /// The current speed modifier from <see cref="Thresholds"/> we reached.
+    /// Stored and networked so that the client doesn't mispredict temperature
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float? CurrentSpeedModifier;
+
+    /// <summary>
+    /// The time at which the temperature slowdown is updated.
+    /// </summary>
+    [DataField, AutoNetworkedField, AutoPausedField]
+    public TimeSpan? NextSlowdownUpdate;
+}
diff --git a/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs b/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs
new file mode 100644
index 00000000000..efea2df5aff
--- /dev/null
+++ b/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs
@@ -0,0 +1,80 @@
+using System.Linq;
+using Content.Shared.Movement.Components;
+using Content.Shared.Movement.Systems;
+using Content.Shared.Temperature.Components;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Temperature.Systems;
+
+/// <summary>
+/// This handles predicting temperature based speedup.
+/// </summary>
+public sealed class SharedTemperatureSystem : EntitySystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
+
+    /// <summary>
+    /// Band-aid for unpredicted atmos. Delays the application for a short period so that laggy clients can get the replicated temperature.
+    /// </summary>
+    private static readonly TimeSpan SlowdownApplicationDelay = TimeSpan.FromSeconds(1f);
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TemperatureSpeedComponent, OnTemperatureChangeEvent>(OnTemperatureChanged);
+        SubscribeLocalEvent<TemperatureSpeedComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovementSpeedModifiers);
+    }
+
+    private void OnTemperatureChanged(Entity<TemperatureSpeedComponent> ent, ref OnTemperatureChangeEvent args)
+    {
+        foreach (var (threshold, modifier) in ent.Comp.Thresholds)
+        {
+            if (args.CurrentTemperature < threshold && args.LastTemperature > threshold ||
+                args.CurrentTemperature > threshold && args.LastTemperature < threshold)
+            {
+                ent.Comp.NextSlowdownUpdate = _timing.CurTime + SlowdownApplicationDelay;
+                ent.Comp.CurrentSpeedModifier = modifier;
+                Dirty(ent);
+                break;
+            }
+        }
+
+        var maxThreshold = ent.Comp.Thresholds.Max(p => p.Key);
+        if (args.CurrentTemperature > maxThreshold && args.LastTemperature < maxThreshold)
+        {
+            ent.Comp.NextSlowdownUpdate = _timing.CurTime + SlowdownApplicationDelay;
+            ent.Comp.CurrentSpeedModifier = null;
+            Dirty(ent);
+        }
+    }
+
+    private void OnRefreshMovementSpeedModifiers(Entity<TemperatureSpeedComponent> ent, ref RefreshMovementSpeedModifiersEvent args)
+    {
+        // Don't update speed and mispredict while we're compensating for lag.
+        if (ent.Comp.NextSlowdownUpdate != null || ent.Comp.CurrentSpeedModifier == null)
+            return;
+
+        args.ModifySpeed(ent.Comp.CurrentSpeedModifier.Value, ent.Comp.CurrentSpeedModifier.Value);
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<TemperatureSpeedComponent, MovementSpeedModifierComponent>();
+        while (query.MoveNext(out var uid, out var temp, out var movement))
+        {
+            if (temp.NextSlowdownUpdate == null)
+                continue;
+
+            if (_timing.CurTime < temp.NextSlowdownUpdate)
+                continue;
+
+            temp.NextSlowdownUpdate = null;
+            _movementSpeedModifier.RefreshMovementSpeedModifiers(uid, movement);
+            Dirty(uid, temp);
+        }
+    }
+}
diff --git a/Content.Shared/Temperature/TemperatureEvents.cs b/Content.Shared/Temperature/TemperatureEvents.cs
index ac12224868f..7a26d07e306 100644
--- a/Content.Shared/Temperature/TemperatureEvents.cs
+++ b/Content.Shared/Temperature/TemperatureEvents.cs
@@ -13,3 +13,18 @@ public ModifyChangedTemperatureEvent(float temperature)
         TemperatureDelta = temperature;
     }
 }
+
+public sealed class OnTemperatureChangeEvent : EntityEventArgs
+{
+    public readonly float CurrentTemperature;
+    public readonly float LastTemperature;
+    public readonly float TemperatureDelta;
+
+    public OnTemperatureChangeEvent(float current, float last, float delta)
+    {
+        CurrentTemperature = current;
+        LastTemperature = last;
+        TemperatureDelta = delta;
+    }
+}
+
diff --git a/Content.Shared/Throwing/BeforeThrowEvent.cs b/Content.Shared/Throwing/BeforeThrowEvent.cs
index 36e7dd758b8..d2bf2f38b8e 100644
--- a/Content.Shared/Throwing/BeforeThrowEvent.cs
+++ b/Content.Shared/Throwing/BeforeThrowEvent.cs
@@ -5,17 +5,17 @@ namespace Content.Shared.Throwing;
 [ByRefEvent]
 public struct BeforeThrowEvent
 {
-    public BeforeThrowEvent(EntityUid itemUid, Vector2 direction, float throwStrength,  EntityUid playerUid)
+    public BeforeThrowEvent(EntityUid itemUid, Vector2 direction, float throwSpeed,  EntityUid playerUid)
     {
         ItemUid = itemUid;
         Direction = direction;
-        ThrowStrength = throwStrength;
+        ThrowSpeed = throwSpeed;
         PlayerUid = playerUid;
     }
 
     public EntityUid ItemUid { get; set; }
     public Vector2 Direction { get; }
-    public float ThrowStrength { get; set;}
+    public float ThrowSpeed { get; set;}
     public EntityUid PlayerUid { get; }
 
     public bool Cancelled = false;
diff --git a/Content.Shared/Throwing/LandAtCursorComponent.cs b/Content.Shared/Throwing/LandAtCursorComponent.cs
new file mode 100644
index 00000000000..f8e99e2fc87
--- /dev/null
+++ b/Content.Shared/Throwing/LandAtCursorComponent.cs
@@ -0,0 +1,12 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Throwing
+{
+    /// <summary>
+    ///     Makes an item land at the cursor when thrown and slide a little further.
+    ///     Without it the item lands slightly in front and stops moving at the cursor.
+    ///     Use this for throwing weapons that should pierce the opponent, for example spears.
+    /// </summary>
+    [RegisterComponent, NetworkedComponent]
+    public sealed partial class LandAtCursorComponent : Component { }
+}
diff --git a/Content.Shared/Throwing/ThrowAttemptEvent.cs b/Content.Shared/Throwing/ThrowAttemptEvent.cs
index bf8cad6c746..dfb3dca5c7d 100644
--- a/Content.Shared/Throwing/ThrowAttemptEvent.cs
+++ b/Content.Shared/Throwing/ThrowAttemptEvent.cs
@@ -13,6 +13,14 @@ public ThrowAttemptEvent(EntityUid uid, EntityUid itemUid)
         public EntityUid ItemUid { get; }
     }
 
+    /// <summary>
+    ///     Raised on the item entity that is thrown.
+    /// </summary>
+    /// <param name="User">The user that threw this entity.</param>
+    /// <param name="Cancelled">Whether or not the throw should be cancelled.</param>
+    [ByRefEvent]
+    public record struct ThrowItemAttemptEvent(EntityUid User, bool Cancelled = false);
+
     /// <summary>
     /// Raised when we try to pushback an entity from throwing
     /// </summary>
diff --git a/Content.Shared/Throwing/ThrowingSystem.cs b/Content.Shared/Throwing/ThrowingSystem.cs
index 7d94ada924d..549473278e4 100644
--- a/Content.Shared/Throwing/ThrowingSystem.cs
+++ b/Content.Shared/Throwing/ThrowingSystem.cs
@@ -1,13 +1,12 @@
 using System.Numerics;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Camera;
+using Content.Shared.CCVar;
 using Content.Shared.Database;
+using Content.Shared.Friction;
 using Content.Shared.Gravity;
-using Content.Shared.Hands.Components;
-using Content.Shared.Hands.EntitySystems;
-using Content.Shared.Interaction;
 using Content.Shared.Projectiles;
-using Content.Shared.Tag;
+using Robust.Shared.Configuration;
 using Robust.Shared.Map;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
@@ -27,11 +26,9 @@ public sealed class ThrowingSystem : EntitySystem
 
     public const float PushbackDefault = 2f;
 
-    /// <summary>
-    /// The minimum amount of time an entity needs to be thrown before the timer can be run.
-    /// Anything below this threshold never enters the air.
-    /// </summary>
-    public const float FlyTime = 0.15f;
+    public const float FlyTimePercentage = 0.8f;
+
+    private float _frictionModifier;
 
     [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly SharedGravitySystem _gravity = default!;
@@ -40,13 +37,23 @@ public sealed class ThrowingSystem : EntitySystem
     [Dependency] private readonly ThrownItemSystem _thrownSystem = default!;
     [Dependency] private readonly SharedCameraRecoilSystem _recoil = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly IConfigurationManager _configManager = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        Subs.CVar(_configManager, CCVars.TileFrictionModifier, value => _frictionModifier = value, true);
+    }
 
     public void TryThrow(
         EntityUid uid,
         EntityCoordinates coordinates,
-        float strength = 1.0f,
+        float baseThrowSpeed = 10.0f,
         EntityUid? user = null,
         float pushbackRatio = PushbackDefault,
+        float? friction = null,
+        bool compensateFriction = false,
         bool recoil = true,
         bool animated = true,
         bool playSound = true,
@@ -58,7 +65,7 @@ public void TryThrow(
         if (mapPos.MapId != thrownPos.MapId)
             return;
 
-        TryThrow(uid, mapPos.Position - thrownPos.Position, strength, user, pushbackRatio, recoil: recoil, animated: animated, playSound: playSound, doSpin: doSpin);
+        TryThrow(uid, mapPos.Position - thrownPos.Position, baseThrowSpeed, user, pushbackRatio, friction, compensateFriction: compensateFriction, recoil: recoil, animated: animated, playSound: playSound, doSpin: doSpin);
     }
 
     /// <summary>
@@ -66,14 +73,18 @@ public void TryThrow(
     /// </summary>
     /// <param name="uid">The entity being thrown.</param>
     /// <param name="direction">A vector pointing from the entity to its destination.</param>
-    /// <param name="strength">How much the direction vector should be multiplied for velocity.</param>
+    /// <param name="baseThrowSpeed">Throw velocity. Gets modified if compensateFriction is true.</param>
     /// <param name="pushbackRatio">The ratio of impulse applied to the thrower - defaults to 10 because otherwise it's not enough to properly recover from getting spaced</param>
+    /// <param name="friction">friction value used for the distance calculation. If set to null this defaults to the standard tile values</param>
+    /// <param name="compensateFriction">True will adjust the throw so the item stops at the target coordinates. False means it will land at the target and keep sliding.</param>
     /// <param name="doSpin">Whether spin will be applied to the thrown entity.</param>
     public void TryThrow(EntityUid uid,
         Vector2 direction,
-        float strength = 1.0f,
+        float baseThrowSpeed = 10.0f,
         EntityUid? user = null,
         float pushbackRatio = PushbackDefault,
+        float? friction = null,
+        bool compensateFriction = false,
         bool recoil = true,
         bool animated = true,
         bool playSound = true,
@@ -91,9 +102,10 @@ public void TryThrow(EntityUid uid,
             physics,
             Transform(uid),
             projectileQuery,
-            strength,
+            baseThrowSpeed,
             user,
-            pushbackRatio, recoil: recoil, animated: animated, playSound: playSound, doSpin: doSpin);
+            pushbackRatio,
+            friction, compensateFriction: compensateFriction, recoil: recoil, animated: animated, playSound: playSound, doSpin: doSpin);
     }
 
     /// <summary>
@@ -101,23 +113,27 @@ public void TryThrow(EntityUid uid,
     /// </summary>
     /// <param name="uid">The entity being thrown.</param>
     /// <param name="direction">A vector pointing from the entity to its destination.</param>
-    /// <param name="strength">How much the direction vector should be multiplied for velocity.</param>
+    /// <param name="baseThrowSpeed">Throw velocity. Gets modified if compensateFriction is true.</param>
     /// <param name="pushbackRatio">The ratio of impulse applied to the thrower - defaults to 10 because otherwise it's not enough to properly recover from getting spaced</param>
+    /// <param name="friction">friction value used for the distance calculation. If set to null this defaults to the standard tile values</param>
+    /// <param name="compensateFriction">True will adjust the throw so the item stops at the target coordinates. False means it will land at the target and keep sliding.</param>
     /// <param name="doSpin">Whether spin will be applied to the thrown entity.</param>
     public void TryThrow(EntityUid uid,
         Vector2 direction,
         PhysicsComponent physics,
         TransformComponent transform,
         EntityQuery<ProjectileComponent> projectileQuery,
-        float strength = 1.0f,
+        float baseThrowSpeed = 10.0f,
         EntityUid? user = null,
         float pushbackRatio = PushbackDefault,
+        float? friction = null,
+        bool compensateFriction = false,
         bool recoil = true,
         bool animated = true,
         bool playSound = true,
         bool doSpin = true)
     {
-        if (strength <= 0 || direction == Vector2Helpers.Infinity || direction == Vector2Helpers.NaN || direction == Vector2.Zero)
+        if (baseThrowSpeed <= 0 || direction == Vector2Helpers.Infinity || direction == Vector2Helpers.NaN || direction == Vector2.Zero || friction < 0)
             return;
 
         if ((physics.BodyType & (BodyType.Dynamic | BodyType.KinematicController)) == 0x0)
@@ -136,16 +152,19 @@ public void TryThrow(EntityUid uid,
             Animate = animated,
         };
 
-        // Estimate time to arrival so we can apply OnGround status and slow it much faster.
-        var time = direction.Length() / strength;
+        // if not given, get the default friction value for distance calculation
+        var tileFriction = friction ?? _frictionModifier * TileFrictionController.DefaultFriction;
+
+        if (tileFriction == 0f)
+            compensateFriction = false; // cannot calculate this if there is no friction
+
+        // Set the time the item is supposed to be in the air so we can apply OnGround status.
+        // This is a free parameter, but we should set it to something reasonable.
+        var flyTime = direction.Length() / baseThrowSpeed;
+        if (compensateFriction)
+            flyTime *= FlyTimePercentage;
         comp.ThrownTime = _gameTiming.CurTime;
-        // TODO: This is a bandaid, don't do this.
-        // if you want to force landtime have the caller handle it or add a new method.
-        // did we launch this with something stronger than our hands?
-        if (TryComp<HandsComponent>(comp.Thrower, out var hands) && strength > hands.ThrowForceMultiplier)
-            comp.LandTime = comp.ThrownTime + TimeSpan.FromSeconds(time);
-        else
-            comp.LandTime = time < FlyTime ? default : comp.ThrownTime + TimeSpan.FromSeconds(time - FlyTime);
+        comp.LandTime = comp.ThrownTime + TimeSpan.FromSeconds(flyTime);
         comp.PlayLandSound = playSound;
         AddComp(uid, comp, true);
 
@@ -173,7 +192,12 @@ public void TryThrow(EntityUid uid,
         if (user != null)
             _adminLogger.Add(LogType.Throw, LogImpact.Low, $"{ToPrettyString(user.Value):user} threw {ToPrettyString(uid):entity}");
 
-        var impulseVector = direction.Normalized() * strength * physics.Mass;
+        // if compensateFriction==true compensate for the distance the item will slide over the floor after landing by reducing the throw speed accordingly.
+        // else let the item land on the cursor and from where it slides a little further.
+        // This is an exact formula we get from exponentially decaying velocity after landing.
+        // If someone changes how tile friction works at some point, this will have to be adjusted.
+        var throwSpeed = compensateFriction ? direction.Length() / (flyTime + 1 / tileFriction) : baseThrowSpeed;
+        var impulseVector = direction.Normalized() * throwSpeed * physics.Mass;
         _physics.ApplyLinearImpulse(uid, impulseVector, body: physics);
 
         if (comp.LandTime == null || comp.LandTime <= TimeSpan.Zero)
diff --git a/Content.Shared/Throwing/ThrownItemSystem.cs b/Content.Shared/Throwing/ThrownItemSystem.cs
index ef28db26727..6b6f321e127 100644
--- a/Content.Shared/Throwing/ThrownItemSystem.cs
+++ b/Content.Shared/Throwing/ThrownItemSystem.cs
@@ -156,7 +156,7 @@ public override void Update(float frameTime)
                     LandComponent(uid, thrown, physics, thrown.PlayLandSound);
                 }
 
-                var stopThrowTime = (thrown.LandTime ?? thrown.ThrownTime) + TimeSpan.FromSeconds(ThrowingSystem.FlyTime);
+                var stopThrowTime = thrown.LandTime ?? thrown.ThrownTime;
                 if (stopThrowTime <= _gameTiming.CurTime)
                 {
                     StopThrow(uid, thrown);
diff --git a/Content.Shared/Tiles/FloorTileSystem.cs b/Content.Shared/Tiles/FloorTileSystem.cs
index 0d368495f18..f031292f231 100644
--- a/Content.Shared/Tiles/FloorTileSystem.cs
+++ b/Content.Shared/Tiles/FloorTileSystem.cs
@@ -124,7 +124,7 @@ private void OnAfterInteract(EntityUid uid, FloorTileComponent component, AfterI
 
             if (mapGrid != null)
             {
-                var gridUid = mapGrid.Owner;
+                var gridUid = location.EntityId;
 
                 if (!CanPlaceTile(gridUid, mapGrid, out var reason))
                 {
@@ -154,12 +154,11 @@ private void OnAfterInteract(EntityUid uid, FloorTileComponent component, AfterI
                 if (_netManager.IsClient)
                     return;
 
-                mapGrid = _mapManager.CreateGrid(locationMap.MapId);
-                var gridUid = mapGrid.Owner;
-                var gridXform = Transform(gridUid);
-                _transform.SetWorldPosition(gridXform, locationMap.Position);
-                location = new EntityCoordinates(gridUid, Vector2.Zero);
-                PlaceAt(args.User, gridUid, mapGrid, location, _tileDefinitionManager[component.OutputTiles[0]].TileId, component.PlaceTileSound, mapGrid.TileSize / 2f);
+                var grid = _mapManager.CreateGridEntity(locationMap.MapId);
+                var gridXform = Transform(grid);
+                _transform.SetWorldPosition((grid, gridXform), locationMap.Position);
+                location = new EntityCoordinates(grid, Vector2.Zero);
+                PlaceAt(args.User, grid, grid.Comp, location, _tileDefinitionManager[component.OutputTiles[0]].TileId, component.PlaceTileSound, grid.Comp.TileSize / 2f);
                 return;
             }
         }
diff --git a/Content.Shared/Tiles/ReplaceFloorOnSpawnComponent.cs b/Content.Shared/Tiles/ReplaceFloorOnSpawnComponent.cs
new file mode 100644
index 00000000000..1b87082defa
--- /dev/null
+++ b/Content.Shared/Tiles/ReplaceFloorOnSpawnComponent.cs
@@ -0,0 +1,36 @@
+using Content.Shared.Maps;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Tiles;
+
+/// <summary>
+/// Replaces floor tiles around this entity when it spawns
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(ReplaceFloorOnSpawnSystem))]
+public sealed partial class ReplaceFloorOnSpawnComponent : Component
+{
+    /// <summary>
+    /// The floor tiles that will be replaced. If null, will replace all.
+    /// </summary>
+    [DataField]
+    public List<ProtoId<ContentTileDefinition>>? ReplaceableTiles = new();
+
+    /// <summary>
+    /// The tiles that it will replace. Randomly picked from the list.
+    /// </summary>
+    [DataField]
+    public List<ProtoId<ContentTileDefinition>> ReplacementTiles = new();
+
+    /// <summary>
+    /// Whether or not there has to be a tile in the location to be replaced.
+    /// </summary>
+    [DataField]
+    public bool ReplaceSpace = true;
+
+    /// <summary>
+    /// List of offsets from the base tile, used to determine which tiles will be replaced.
+    /// </summary>
+    [DataField]
+    public List<Vector2i> Offsets = new() { Vector2i.Up, Vector2i.Down, Vector2i.Left, Vector2i.Right, Vector2i.Zero };
+}
diff --git a/Content.Shared/Tiles/ReplaceFloorOnSpawnSystem.cs b/Content.Shared/Tiles/ReplaceFloorOnSpawnSystem.cs
new file mode 100644
index 00000000000..818991f823d
--- /dev/null
+++ b/Content.Shared/Tiles/ReplaceFloorOnSpawnSystem.cs
@@ -0,0 +1,48 @@
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Shared.Tiles;
+
+public sealed class ReplaceFloorOnSpawnSystem : EntitySystem
+{
+    [Dependency] private readonly ITileDefinitionManager _tile = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedMapSystem _map = default!;
+
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<ReplaceFloorOnSpawnComponent, MapInitEvent>(OnMapInit);
+    }
+
+    private void OnMapInit(Entity<ReplaceFloorOnSpawnComponent> ent, ref MapInitEvent args)
+    {
+        var xform = Transform(ent);
+        if (xform.GridUid is not { } grid || !TryComp<MapGridComponent>(grid, out var gridComp))
+            return;
+
+        if (ent.Comp.ReplaceableTiles != null && ent.Comp.ReplaceableTiles.Count == 0)
+            return;
+
+        var tileIndices = _map.LocalToTile(grid, gridComp, xform.Coordinates);
+
+        foreach (var offset in ent.Comp.Offsets)
+        {
+            var actualIndices = tileIndices + offset;
+
+            if (!_map.TryGetTileRef(grid, gridComp, actualIndices, out var tile))
+                continue;
+
+            if (ent.Comp.ReplaceableTiles != null &&
+                !tile.Tile.IsEmpty &&
+                !ent.Comp.ReplaceableTiles.Contains(_tile[tile.Tile.TypeId].ID))
+                continue;
+
+            var tileToSet = _random.Pick(ent.Comp.ReplacementTiles);
+            _map.SetTile(grid, gridComp, tile.GridIndices, new Tile(_prototype.Index(tileToSet).TileId));
+        }
+    }
+}
diff --git a/Content.Shared/Toggleable/ToggleActionEvent.cs b/Content.Shared/Toggleable/ToggleActionEvent.cs
index 1283b6699bf..f28e62e7dd1 100644
--- a/Content.Shared/Toggleable/ToggleActionEvent.cs
+++ b/Content.Shared/Toggleable/ToggleActionEvent.cs
@@ -4,9 +4,12 @@
 namespace Content.Shared.Toggleable;
 
 /// <summary>
-///     Generic action-event for toggle-able components.
+/// Generic action-event for toggle-able components.
 /// </summary>
-public sealed partial class ToggleActionEvent : InstantActionEvent { }
+/// <remarks>
+/// If you are using <c>ItemToggleComponent</c> subscribe to <c>ItemToggledEvent</c> instead.
+/// </remarks>
+public sealed partial class ToggleActionEvent : InstantActionEvent;
 
 /// <summary>
 ///     Generic enum keys for toggle-visualizer appearance data & sprite layers.
diff --git a/Content.Shared/Tools/Components/ToolOpenableComponent.cs b/Content.Shared/Tools/Components/ToolOpenableComponent.cs
new file mode 100644
index 00000000000..82cdf611da9
--- /dev/null
+++ b/Content.Shared/Tools/Components/ToolOpenableComponent.cs
@@ -0,0 +1,84 @@
+using Robust.Shared.Prototypes;
+using Robust.Shared.GameStates;
+using Content.Shared.DoAfter;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Tools.Components
+{
+    /// <summary>
+    ///     Logic for using tools (Or verbs) to open / close something on an entity.
+    /// </summary>
+    [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+    public sealed partial class ToolOpenableComponent : Component
+    {
+        /// <summary>
+        ///     Is the openable part open or closed?
+        /// </summary>
+        [DataField, AutoNetworkedField]
+        public bool IsOpen = false;
+
+        /// <summary>
+        ///     If a tool is needed to open the entity, this time will be used.
+        /// </summary>
+        [DataField]
+        public float OpenTime = 1f;
+
+        /// <summary>
+        ///     If a tool is needed to close the entity, this time will be used.
+        /// </summary>
+        [DataField]
+        public float CloseTime = 1f;
+
+        /// <summary>
+        ///     What type of tool quality is needed to open this?
+        ///     If null, the it will only be openable by a verb.
+        /// </summary>
+        [DataField]
+        public ProtoId<ToolQualityPrototype>? OpenToolQualityNeeded;
+
+        /// <summary>
+        ///     What type of tool quality is needed to close this.
+        ///     If null, this will only be closable by a verb.
+        /// </summary>
+        [DataField]
+        public ProtoId<ToolQualityPrototype>? CloseToolQualityNeeded;
+
+        /// <summary>
+        ///     If true, verbs will appear to help interact with opening / closing.
+        /// </summary>
+        [DataField, AutoNetworkedField]
+        public bool HasVerbs = true;
+
+        /// <summary>
+        ///     The name of what is being open and closed.
+        ///     E.g toilet lid, pannel, compartment.
+        /// </summary>
+        [DataField, AutoNetworkedField]
+        public string? Name;
+
+    }
+
+    /// <summary>
+    ///     Simple do after event for opening or closing.
+    /// </summary>
+    [Serializable, NetSerializable]
+    public sealed partial class ToolOpenableDoAfterEventToggleOpen : SimpleDoAfterEvent
+    {
+    }
+
+    /// <summary>
+    ///     Visualizers for handling stash open closed state if stash has door.
+    /// </summary>
+    [Serializable, NetSerializable]
+    public enum ToolOpenableVisuals : byte
+    {
+        ToolOpenableVisualState,
+    }
+
+    [Serializable, NetSerializable]
+    public enum ToolOpenableVisualState : byte
+    {
+        Open,
+        Closed
+    }
+}
diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.cs b/Content.Shared/Tools/Systems/SharedToolSystem.cs
index 56ce81413fb..201eb19a88b 100644
--- a/Content.Shared/Tools/Systems/SharedToolSystem.cs
+++ b/Content.Shared/Tools/Systems/SharedToolSystem.cs
@@ -24,7 +24,7 @@ public abstract partial class SharedToolSystem : EntitySystem
     [Dependency] private   readonly SharedAudioSystem _audioSystem = default!;
     [Dependency] private   readonly SharedDoAfterSystem _doAfterSystem = default!;
     [Dependency] protected readonly SharedInteractionSystem InteractionSystem = default!;
-    [Dependency] protected readonly SharedItemToggleSystem ItemToggle = default!;
+    [Dependency] protected readonly ItemToggleSystem ItemToggle = default!;
     [Dependency] private   readonly SharedMapSystem _maps = default!;
     [Dependency] private   readonly SharedPopupSystem _popup = default!;
     [Dependency] protected readonly SharedSolutionContainerSystem SolutionContainerSystem = default!;
diff --git a/Content.Shared/Tools/Systems/ToolOpenableSystem.cs b/Content.Shared/Tools/Systems/ToolOpenableSystem.cs
new file mode 100644
index 00000000000..4951040350a
--- /dev/null
+++ b/Content.Shared/Tools/Systems/ToolOpenableSystem.cs
@@ -0,0 +1,171 @@
+using Content.Shared.IdentityManagement;
+using Content.Shared.Tools.Components;
+using Content.Shared.Tools.Systems;
+using Content.Shared.Interaction;
+using Content.Shared.Examine;
+using Content.Shared.Verbs;
+
+namespace Content.Shared.Tools.EntitySystems;
+
+public sealed class ToolOpenableSystem : EntitySystem
+{
+    [Dependency] private readonly SharedToolSystem _tool = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<ToolOpenableComponent, ComponentInit>(OnInit);
+        SubscribeLocalEvent<ToolOpenableComponent, ToolOpenableDoAfterEventToggleOpen>(OnOpenableStateToggled);
+        SubscribeLocalEvent<ToolOpenableComponent, InteractUsingEvent>(OnInteractUsing);
+        SubscribeLocalEvent<ToolOpenableComponent, ExaminedEvent>(OnExamine);
+        SubscribeLocalEvent<ToolOpenableComponent, GetVerbsEvent<InteractionVerb>>(OnGetVerb);
+    }
+
+    private void OnInit(Entity<ToolOpenableComponent> entity, ref ComponentInit args)
+    {
+        UpdateAppearance(entity);
+        Dirty(entity);
+    }
+
+    private void OnInteractUsing(Entity<ToolOpenableComponent> entity, ref InteractUsingEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        if (TryOpenClose(entity, args.Used, args.User))
+            args.Handled = true;
+    }
+
+    /// <summary>
+    ///     Try to open or close what is openable.
+    /// </summary>
+    /// <returns> Returns false if you can't interact with the openable thing with the given item. </returns>
+    private bool TryOpenClose(Entity<ToolOpenableComponent> entity, EntityUid? toolToToggle, EntityUid user)
+    {
+        var neededToolQuantity = entity.Comp.IsOpen ? entity.Comp.CloseToolQualityNeeded : entity.Comp.OpenToolQualityNeeded;
+        var time = entity.Comp.IsOpen ? entity.Comp.CloseTime : entity.Comp.OpenTime;
+        var evt = new ToolOpenableDoAfterEventToggleOpen();
+
+        // If neededToolQuantity is null it can only be open be opened with the verbs.
+        if (toolToToggle == null || neededToolQuantity == null)
+            return false;
+
+        return _tool.UseTool(toolToToggle.Value, user, entity, time, neededToolQuantity, evt);
+    }
+
+    private void OnOpenableStateToggled(Entity<ToolOpenableComponent> entity, ref ToolOpenableDoAfterEventToggleOpen args)
+    {
+        if (args.Cancelled)
+            return;
+
+        ToggleState(entity);
+    }
+
+    /// <summary>
+    ///     Toggle the state and update appearance.
+    /// </summary>
+    private void ToggleState(Entity<ToolOpenableComponent> entity)
+    {
+        entity.Comp.IsOpen = !entity.Comp.IsOpen;
+        UpdateAppearance(entity);
+        Dirty(entity);
+    }
+
+    #region Helper functions
+
+    private string GetName(Entity<ToolOpenableComponent> entity)
+    {
+        if (entity.Comp.Name == null)
+            return Identity.Name(entity, EntityManager);
+        return Loc.GetString(entity.Comp.Name);
+    }
+
+    public bool IsOpen(EntityUid uid, ToolOpenableComponent? component = null)
+    {
+        if (!Resolve(uid, ref component, false))
+            return true;
+
+        return component.IsOpen;
+    }
+
+    private void UpdateAppearance(Entity<ToolOpenableComponent> entity)
+    {
+        _appearance.SetData(entity, ToolOpenableVisuals.ToolOpenableVisualState, entity.Comp.IsOpen ? ToolOpenableVisualState.Open : ToolOpenableVisualState.Closed);
+    }
+
+    #endregion
+
+    #region User interface functions
+
+    private void OnExamine(Entity<ToolOpenableComponent> entity, ref ExaminedEvent args)
+    {
+        if (!args.IsInDetailsRange)
+            return;
+
+        string msg;
+        var name = GetName(entity);
+        if (entity.Comp.IsOpen)
+            msg = Loc.GetString("tool-openable-component-examine-opened", ("name", name));
+        else
+            msg = Loc.GetString("tool-openable-component-examine-closed", ("name", name));
+
+        args.PushMarkup(msg);
+    }
+
+    private void OnGetVerb(Entity<ToolOpenableComponent> entity, ref GetVerbsEvent<InteractionVerb> args)
+    {
+        if (!args.CanInteract || !args.CanAccess || !entity.Comp.HasVerbs)
+            return;
+
+        var user = args.User;
+        var item = args.Using;
+        var name = GetName(entity);
+
+        var toggleVerb = new InteractionVerb
+        {
+            IconEntity = GetNetEntity(item)
+        };
+
+        if (entity.Comp.IsOpen)
+        {
+            toggleVerb.Text = toggleVerb.Message = Loc.GetString("tool-openable-component-verb-close");
+            var neededQual = entity.Comp.CloseToolQualityNeeded;
+
+            // If neededQual is null you don't need a tool to open / close.
+            if (neededQual != null &&
+                (item == null || !_tool.HasQuality(item.Value, neededQual)))
+            {
+                toggleVerb.Disabled = true;
+                toggleVerb.Message = Loc.GetString("tool-openable-component-verb-cant-close", ("name", name));
+            }
+
+            if (neededQual == null)
+                toggleVerb.Act = () => ToggleState(entity);
+            else
+                toggleVerb.Act = () => TryOpenClose(entity, item, user);
+
+            args.Verbs.Add(toggleVerb);
+        }
+        else
+        {
+            // The open verb should only appear when holding the correct tool or if no tool is needed.
+
+            toggleVerb.Text = toggleVerb.Message = Loc.GetString("tool-openable-component-verb-open");
+            var neededQual = entity.Comp.OpenToolQualityNeeded;
+
+            if (neededQual == null)
+            {
+                toggleVerb.Act = () => ToggleState(entity);
+                args.Verbs.Add(toggleVerb);
+            }
+            else if (item != null && _tool.HasQuality(item.Value, neededQual))
+            {
+                toggleVerb.Act = () => TryOpenClose(entity, item, user);
+                args.Verbs.Add(toggleVerb);
+            }
+        }
+    }
+
+    #endregion
+}
diff --git a/Content.Shared/UserInterface/ActivatableUISystem.Power.cs b/Content.Shared/UserInterface/ActivatableUISystem.Power.cs
index b8a815c7a81..e494253c832 100644
--- a/Content.Shared/UserInterface/ActivatableUISystem.Power.cs
+++ b/Content.Shared/UserInterface/ActivatableUISystem.Power.cs
@@ -1,3 +1,5 @@
+using Content.Shared.Item.ItemToggle;
+using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.PowerCell;
 using Robust.Shared.Containers;
 
@@ -5,6 +7,7 @@ namespace Content.Shared.UserInterface;
 
 public sealed partial class ActivatableUISystem
 {
+    [Dependency] private readonly ItemToggleSystem _toggle = default!;
     [Dependency] private readonly SharedPowerCellSystem _cell = default!;
 
     private void InitializePower()
@@ -12,27 +15,22 @@ private void InitializePower()
         SubscribeLocalEvent<ActivatableUIRequiresPowerCellComponent, ActivatableUIOpenAttemptEvent>(OnBatteryOpenAttempt);
         SubscribeLocalEvent<ActivatableUIRequiresPowerCellComponent, BoundUIOpenedEvent>(OnBatteryOpened);
         SubscribeLocalEvent<ActivatableUIRequiresPowerCellComponent, BoundUIClosedEvent>(OnBatteryClosed);
-
-        SubscribeLocalEvent<PowerCellDrawComponent, EntRemovedFromContainerMessage>(OnPowerCellRemoved);
+        SubscribeLocalEvent<ActivatableUIRequiresPowerCellComponent, ItemToggledEvent>(OnToggled);
     }
 
-    private void OnPowerCellRemoved(EntityUid uid, PowerCellDrawComponent component, EntRemovedFromContainerMessage args)
+    private void OnToggled(Entity<ActivatableUIRequiresPowerCellComponent> ent, ref ItemToggledEvent args)
     {
-        _cell.SetPowerCellDrawEnabled(uid, false);
-
-        if (!HasComp<ActivatableUIRequiresPowerCellComponent>(uid) ||
-            !TryComp(uid, out ActivatableUIComponent? activatable))
-        {
+        // only close ui when losing power
+        if (!TryComp<ActivatableUIComponent>(ent, out var activatable) || args.Activated)
             return;
-        }
 
         if (activatable.Key == null)
         {
-            Log.Error($"Encountered null key in activatable ui on entity {ToPrettyString(uid)}");
+            Log.Error($"Encountered null key in activatable ui on entity {ToPrettyString(ent)}");
             return;
         }
 
-        _uiSystem.CloseUi(uid, activatable.Key);
+        _uiSystem.CloseUi(ent.Owner, activatable.Key);
     }
 
     private void OnBatteryOpened(EntityUid uid, ActivatableUIRequiresPowerCellComponent component, BoundUIOpenedEvent args)
@@ -42,7 +40,7 @@ private void OnBatteryOpened(EntityUid uid, ActivatableUIRequiresPowerCellCompon
         if (!args.UiKey.Equals(activatable.Key))
             return;
 
-        _cell.SetPowerCellDrawEnabled(uid, true);
+        _toggle.TryActivate(uid);
     }
 
     private void OnBatteryClosed(EntityUid uid, ActivatableUIRequiresPowerCellComponent component, BoundUIClosedEvent args)
@@ -54,7 +52,7 @@ private void OnBatteryClosed(EntityUid uid, ActivatableUIRequiresPowerCellCompon
 
         // Stop drawing power if this was the last person with the UI open.
         if (!_uiSystem.IsUiOpen(uid, activatable.Key))
-            _cell.SetPowerCellDrawEnabled(uid, false);
+            _toggle.TryDeactivate(uid);
     }
 
     /// <summary>
diff --git a/Content.Shared/VendingMachines/SharedVendingMachineSystem.Restock.cs b/Content.Shared/VendingMachines/SharedVendingMachineSystem.Restock.cs
index 6aef4d0949a..f8d00f56f03 100644
--- a/Content.Shared/VendingMachines/SharedVendingMachineSystem.Restock.cs
+++ b/Content.Shared/VendingMachines/SharedVendingMachineSystem.Restock.cs
@@ -72,7 +72,7 @@ private void OnAfterInteract(EntityUid uid, VendingMachineRestockComponent compo
         {
             BreakOnMove = true,
             BreakOnDamage = true,
-            NeedHand = true
+            NeedHand = true,
         };
 
         if (!_doAfter.TryStartDoAfter(doAfterArgs))
diff --git a/Content.Shared/Weapons/Melee/Events/AttemptMeleeEvent.cs b/Content.Shared/Weapons/Melee/Events/AttemptMeleeEvent.cs
index 2800e3b34da..cbcadcd19f9 100644
--- a/Content.Shared/Weapons/Melee/Events/AttemptMeleeEvent.cs
+++ b/Content.Shared/Weapons/Melee/Events/AttemptMeleeEvent.cs
@@ -4,4 +4,4 @@ namespace Content.Shared.Weapons.Melee.Events;
 /// Raised directed on a weapon when attempt a melee attack.
 /// </summary>
 [ByRefEvent]
-public record struct AttemptMeleeEvent(bool Cancelled, string? Message);
+public record struct AttemptMeleeEvent(EntityUid User, bool Cancelled = false, string? Message = null);
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index b67acdea4f9..ae0ebfe74ca 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -12,7 +12,7 @@
 using Content.Shared.Hands.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Inventory;
-using Content.Shared.Item;
+using Content.Shared.Inventory.VirtualItem;
 using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.Physics;
 using Content.Shared.Popups;
@@ -27,7 +27,6 @@
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
-using Robust.Shared.Toolshed.Syntax;
 using ItemToggleMeleeWeaponComponent = Content.Shared.Item.ItemToggle.Components.ItemToggleMeleeWeaponComponent;
 
 namespace Content.Shared.Weapons.Melee;
@@ -276,7 +275,8 @@ public bool TryGetWeapon(EntityUid entity, out EntityUid weaponUid, [NotNullWhen
                 return true;
             }
 
-            return false;
+            if (!HasComp<VirtualItemComponent>(held))
+                return false;
         }
 
         // Use hands clothing if applicable.
@@ -485,7 +485,7 @@ protected virtual void DoLightAttack(EntityUid user, LightAttackEvent ev, Entity
 
         var weapon = GetEntity(ev.Weapon);
 
-        Interaction.DoContactInteraction(weapon, target);
+        // We skip weapon -> target interaction, as forensics system applies DNA on hit
         Interaction.DoContactInteraction(user, weapon);
 
         // If the user is using a long-range weapon, this probably shouldn't be happening? But I'll interpret melee as a
@@ -616,7 +616,7 @@ private bool DoHeavyAttack(EntityUid user, HeavyAttackEvent ev, EntityUid meleeU
         // For stuff that cares about it being attacked.
         foreach (var target in targets)
         {
-            Interaction.DoContactInteraction(weapon, target);
+            // We skip weapon -> target interaction, as forensics system applies DNA on hit
 
             // If the user is using a long-range weapon, this probably shouldn't be happening? But I'll interpret melee as a
             // somewhat messy scuffle. See also, light attacks.
@@ -625,14 +625,18 @@ private bool DoHeavyAttack(EntityUid user, HeavyAttackEvent ev, EntityUid meleeU
 
         var appliedDamage = new DamageSpecifier();
 
-        foreach (var entity in targets)
+        for (var i = targets.Count - 1; i >= 0; i--)
         {
+            var entity = targets[i];
             // We raise an attack attempt here as well,
             // primarily because this was an untargeted wideswing: if a subscriber to that event cared about
             // the potential target (such as for pacifism), they need to be made aware of the target here.
             // In that case, just continue.
             if (!Blocker.CanAttack(user, entity, (weapon, component)))
+            {
+                targets.RemoveAt(i);
                 continue;
+            }
 
             var attackedEvent = new AttackedEvent(meleeUid, user, GetCoordinates(ev.Coordinates));
             RaiseLocalEvent(entity, attackedEvent);
diff --git a/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs b/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs
index 6feffffbe31..75d5300fdb1 100644
--- a/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs
+++ b/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs
@@ -31,8 +31,6 @@ public abstract class SharedGrapplingGunSystem : EntitySystem
 
     public const string GrapplingJoint = "grappling";
 
-    public const float ReelRate = 2.5f;
-
     public override void Initialize()
     {
         base.Initialize();
@@ -187,7 +185,7 @@ public override void Update(float frameTime)
             }
 
             // TODO: This should be on engine.
-            distance.MaxLength = MathF.Max(distance.MinLength, distance.MaxLength - ReelRate * frameTime);
+            distance.MaxLength = MathF.Max(distance.MinLength, distance.MaxLength - grappling.ReelRate * frameTime);
             distance.Length = MathF.Min(distance.MaxLength, distance.Length);
 
             _physics.WakeBody(joint.BodyAUid);
diff --git a/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs b/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs
index 62af124252b..3e1111a97d1 100644
--- a/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs
@@ -30,18 +30,6 @@ public sealed partial class CartridgeAmmoComponent : AmmoComponent
     [AutoNetworkedField]
     public bool Spent = false;
 
-    /// <summary>
-    /// How much the ammo spreads when shot, in degrees. Does nothing if count is 0.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("spread")]
-    public Angle Spread = Angle.FromDegrees(5);
-
-    /// <summary>
-    /// How many prototypes are spawned when shot.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("count")]
-    public int Count = 1;
-
     /// <summary>
     /// Caseless ammunition.
     /// </summary>
diff --git a/Content.Shared/Weapons/Ranged/Components/BallisticAmmoProviderComponent.cs b/Content.Shared/Weapons/Ranged/Components/BallisticAmmoProviderComponent.cs
index eb04d3227db..f825f10550d 100644
--- a/Content.Shared/Weapons/Ranged/Components/BallisticAmmoProviderComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/BallisticAmmoProviderComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Weapons.Ranged.Systems;
 using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
@@ -6,7 +7,7 @@
 
 namespace Content.Shared.Weapons.Ranged.Components;
 
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SharedGunSystem))]
 public sealed partial class BallisticAmmoProviderComponent : Component
 {
     [ViewVariables(VVAccess.ReadWrite), DataField]
@@ -32,6 +33,7 @@ public sealed partial class BallisticAmmoProviderComponent : Component
     public Container Container = default!;
 
     // TODO: Make this use stacks when the typeserializer is done.
+    // Realistically just point to the container.
     [DataField, AutoNetworkedField]
     public List<EntityUid> Entities = new();
 
diff --git a/Content.Shared/Weapons/Ranged/Components/ChamberMagazineAmmoProviderComponent.cs b/Content.Shared/Weapons/Ranged/Components/ChamberMagazineAmmoProviderComponent.cs
index e64ec0d68de..37517c13711 100644
--- a/Content.Shared/Weapons/Ranged/Components/ChamberMagazineAmmoProviderComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/ChamberMagazineAmmoProviderComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Weapons.Ranged.Systems;
 using Robust.Shared.Audio;
 
 namespace Content.Shared.Weapons.Ranged.Components;
@@ -6,6 +7,7 @@ namespace Content.Shared.Weapons.Ranged.Components;
 /// Chamber + mags in one package. If you need just magazine then use <see cref="MagazineAmmoProviderComponent"/>
 /// </summary>
 [RegisterComponent, AutoGenerateComponentState]
+[Access(typeof(SharedGunSystem))]
 public sealed partial class ChamberMagazineAmmoProviderComponent : MagazineAmmoProviderComponent
 {
     /// <summary>
diff --git a/Content.Shared/Weapons/Ranged/Components/ContainerAmmoProviderComponent.cs b/Content.Shared/Weapons/Ranged/Components/ContainerAmmoProviderComponent.cs
index 0f2884bf58a..f49cc812c24 100644
--- a/Content.Shared/Weapons/Ranged/Components/ContainerAmmoProviderComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/ContainerAmmoProviderComponent.cs
@@ -1,4 +1,5 @@
-using Robust.Shared.GameStates;
+using Content.Shared.Weapons.Ranged.Systems;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Weapons.Ranged.Components;
 
@@ -6,6 +7,7 @@ namespace Content.Shared.Weapons.Ranged.Components;
 ///     Handles pulling entities from the given container to use as ammunition.
 /// </summary>
 [RegisterComponent]
+[Access(typeof(SharedGunSystem))]
 public sealed partial class ContainerAmmoProviderComponent : AmmoProviderComponent
 {
     [DataField("container", required: true)]
diff --git a/Content.Shared/Weapons/Ranged/Components/GrapplingGunComponent.cs b/Content.Shared/Weapons/Ranged/Components/GrapplingGunComponent.cs
index d0af3e8b36d..553f0c10f32 100644
--- a/Content.Shared/Weapons/Ranged/Components/GrapplingGunComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/GrapplingGunComponent.cs
@@ -8,6 +8,12 @@ namespace Content.Shared.Weapons.Ranged.Components;
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class GrapplingGunComponent : Component
 {
+    /// <summary>
+    /// Hook's reeling force and speed - the higher the number, the faster the hook rewinds.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float ReelRate = 2.5f;
+
     [DataField("jointId"), AutoNetworkedField]
     public string Joint = string.Empty;
 
diff --git a/Content.Shared/Weapons/Ranged/Components/GunRequiresWieldComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunRequiresWieldComponent.cs
index fa3732209f5..2016459b9d5 100644
--- a/Content.Shared/Weapons/Ranged/Components/GunRequiresWieldComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/GunRequiresWieldComponent.cs
@@ -15,4 +15,7 @@ public sealed partial class GunRequiresWieldComponent : Component
 
     [DataField, AutoNetworkedField]
     public TimeSpan PopupCooldown = TimeSpan.FromSeconds(1);
+
+    [DataField]
+    public LocId? WieldRequiresExamineMessage  = "gunrequireswield-component-examine";
 }
diff --git a/Content.Shared/Weapons/Ranged/Components/MagazineAmmoProviderComponent.cs b/Content.Shared/Weapons/Ranged/Components/MagazineAmmoProviderComponent.cs
index 9aff60fd3ae..56d09ceaa5d 100644
--- a/Content.Shared/Weapons/Ranged/Components/MagazineAmmoProviderComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/MagazineAmmoProviderComponent.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Weapons.Ranged.Components;
+using Content.Shared.Weapons.Ranged.Systems;
 using Robust.Shared.Audio;
 
 namespace Content.Shared.Weapons.Ranged;
@@ -7,6 +8,7 @@ namespace Content.Shared.Weapons.Ranged;
 /// Wrapper around a magazine (handled via ItemSlot). Passes all AmmoProvider logic onto it.
 /// </summary>
 [RegisterComponent, Virtual]
+[Access(typeof(SharedGunSystem))]
 public partial class MagazineAmmoProviderComponent : AmmoProviderComponent
 {
     [ViewVariables(VVAccess.ReadWrite), DataField("soundAutoEject")]
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
index 9123661c8e9..9ef5cbd7028 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
@@ -76,16 +76,20 @@ private void OnBallisticAfterInteract(EntityUid uid, BallisticAmmoProviderCompon
 
         args.Handled = true;
 
+        // Continuous loading
         _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, component.FillDelay, new AmmoFillDoAfterEvent(), used: uid, target: args.Target, eventTarget: uid)
         {
             BreakOnMove = true,
             BreakOnDamage = false,
-            NeedHand = true
+            NeedHand = true,
         });
     }
 
     private void OnBallisticAmmoFillDoAfter(EntityUid uid, BallisticAmmoProviderComponent component, AmmoFillDoAfterEvent args)
     {
+        if (args.Handled || args.Cancelled)
+            return;
+
         if (Deleted(args.Target) ||
             !TryComp<BallisticAmmoProviderComponent>(args.Target, out var target) ||
             target.Whitelist == null)
@@ -273,6 +277,17 @@ public void UpdateBallisticAppearance(EntityUid uid, BallisticAmmoProviderCompon
         Appearance.SetData(uid, AmmoVisuals.AmmoCount, GetBallisticShots(component), appearance);
         Appearance.SetData(uid, AmmoVisuals.AmmoMax, component.Capacity, appearance);
     }
+
+    public void SetBallisticUnspawned(Entity<BallisticAmmoProviderComponent> entity, int count)
+    {
+        if (entity.Comp.UnspawnedCount == count)
+            return;
+
+        entity.Comp.UnspawnedCount = count;
+        UpdateBallisticAppearance(entity.Owner, entity.Comp);
+        UpdateAmmoCount(entity.Owner);
+        Dirty(entity);
+    }
 }
 
 /// <summary>
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
index adae26a223a..d6f45ba77df 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
@@ -108,7 +108,7 @@ private void UseChambered(EntityUid uid, ChamberMagazineAmmoProviderComponent co
             else
             {
                 // Similar to below just due to prediction.
-                TransformSystem.DetachParentToNull(chamberEnt.Value, Transform(chamberEnt.Value));
+                TransformSystem.DetachEntity(chamberEnt.Value, Transform(chamberEnt.Value));
             }
         }
 
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs
index d4aa024f4c8..7ef57df5391 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs
@@ -33,7 +33,7 @@ private bool TryGetClothingSlotEntity(EntityUid uid, ClothingSlotAmmoProviderCom
     {
         slotEntity = null;
 
-        if (!Containers.TryGetContainingContainer(uid, out var container))
+        if (!Containers.TryGetContainingContainer((uid, null, null), out var container))
             return false;
         var user = container.Owner;
 
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs
index 14aaff5bf70..2c0204d9463 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs
@@ -9,6 +9,8 @@
 using System;
 using System.Linq;
 using Content.Shared.Interaction.Events;
+using Content.Shared.Wieldable;
+using Content.Shared.Wieldable.Components;
 using JetBrains.Annotations;
 
 namespace Content.Shared.Weapons.Ranged.Systems;
@@ -31,9 +33,14 @@ protected virtual void InitializeRevolver()
 
     private void OnRevolverUse(EntityUid uid, RevolverAmmoProviderComponent component, UseInHandEvent args)
     {
+        if (args.Handled)
+            return;
+
         if (!_useDelay.TryResetDelay(uid))
             return;
 
+        args.Handled = true;
+
         Cycle(component);
         UpdateAmmoCount(uid, prediction: false);
         Dirty(uid, component);
@@ -393,10 +400,14 @@ private void OnRevolverTakeAmmo(EntityUid uid, RevolverAmmoProviderComponent com
                 args.Ammo.Add((spawned, EnsureComp<AmmoComponent>(spawned)));
 
                 if (cartridge.DeleteOnSpawn)
+                {
+                    component.AmmoSlots[index] = null;
                     component.Chambers[index] = null;
+                }
             }
             else
             {
+                component.AmmoSlots[index] = null;
                 component.Chambers[index] = null;
                 args.Ammo.Add((ent.Value, EnsureComp<AmmoComponent>(ent.Value)));
             }
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index 57fe6efda6c..248fe0a2cd5 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -478,7 +478,7 @@ protected void MuzzleFlash(EntityUid gun, AmmoComponent component, Angle worldAn
             return;
 
         var ev = new MuzzleFlashEvent(GetNetEntity(gun), sprite, worldAngle);
-        CreateEffect(gun, ev, user);
+        CreateEffect(gun, ev, gun);
     }
 
     public void CauseImpulse(EntityCoordinates fromCoordinates, EntityCoordinates toCoordinates, EntityUid user, PhysicsComponent userPhysics)
diff --git a/Content.Shared/Weapons/Reflect/ReflectComponent.cs b/Content.Shared/Weapons/Reflect/ReflectComponent.cs
index 8e7b8975d9d..8418c1f3efb 100644
--- a/Content.Shared/Weapons/Reflect/ReflectComponent.cs
+++ b/Content.Shared/Weapons/Reflect/ReflectComponent.cs
@@ -5,16 +5,11 @@ namespace Content.Shared.Weapons.Reflect;
 
 /// <summary>
 /// Entities with this component have a chance to reflect projectiles and hitscan shots
+/// Uses <c>ItemToggleComponent</c> to control reflection.
 /// </summary>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class ReflectComponent : Component
 {
-    /// <summary>
-    /// Can only reflect when enabled
-    /// </summary>
-    [DataField("enabled"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
-    public bool Enabled = true;
-
     /// <summary>
     /// What we reflect.
     /// </summary>
diff --git a/Content.Shared/Weapons/Reflect/ReflectSystem.cs b/Content.Shared/Weapons/Reflect/ReflectSystem.cs
index 7a2e733bf7c..881b547f27f 100644
--- a/Content.Shared/Weapons/Reflect/ReflectSystem.cs
+++ b/Content.Shared/Weapons/Reflect/ReflectSystem.cs
@@ -7,6 +7,7 @@
 using Content.Shared.Hands;
 using Content.Shared.Inventory;
 using Content.Shared.Inventory.Events;
+using Content.Shared.Item.ItemToggle;
 using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.Popups;
 using Content.Shared.Projectiles;
@@ -27,10 +28,11 @@ namespace Content.Shared.Weapons.Reflect;
 /// </summary>
 public sealed class ReflectSystem : EntitySystem
 {
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly INetManager _netManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly ItemToggleSystem _toggle = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
@@ -93,7 +95,7 @@ private void OnReflectCollide(EntityUid uid, ReflectComponent component, ref Pro
     private bool TryReflectProjectile(EntityUid user, EntityUid reflector, EntityUid projectile, ProjectileComponent? projectileComp = null, ReflectComponent? reflect = null)
     {
         if (!Resolve(reflector, ref reflect, false) ||
-            !reflect.Enabled ||
+            !_toggle.IsActivated(reflector) ||
             !TryComp<ReflectiveComponent>(projectile, out var reflective) ||
             (reflect.Reflects & reflective.Reflective) == 0x0 ||
             !_random.Prob(reflect.ReflectProb) ||
@@ -162,7 +164,7 @@ private bool TryReflectHitscan(
         [NotNullWhen(true)] out Vector2? newDirection)
     {
         if (!TryComp<ReflectComponent>(reflector, out var reflect) ||
-            !reflect.Enabled ||
+            !_toggle.IsActivated(reflector) ||
             !_random.Prob(reflect.ReflectProb))
         {
             newDirection = null;
@@ -214,8 +216,8 @@ private void OnReflectHandUnequipped(EntityUid uid, ReflectComponent component,
 
     private void OnToggleReflect(EntityUid uid, ReflectComponent comp, ref ItemToggledEvent args)
     {
-        comp.Enabled = args.Activated;
-        Dirty(uid, comp);
+        if (args.User is {} user)
+            RefreshReflectUser(user);
     }
 
     /// <summary>
@@ -225,7 +227,7 @@ private void RefreshReflectUser(EntityUid user)
     {
         foreach (var ent in _inventorySystem.GetHandOrInventoryEntities(user, SlotFlags.All & ~SlotFlags.POCKET))
         {
-            if (!HasComp<ReflectComponent>(ent))
+            if (!HasComp<ReflectComponent>(ent) || !_toggle.IsActivated(ent))
                 continue;
 
             EnsureComp<ReflectUserComponent>(user);
diff --git a/Content.Shared/Whitelist/EntityWhitelistSystem.cs b/Content.Shared/Whitelist/EntityWhitelistSystem.cs
index f311946cf98..57fdb523dd4 100644
--- a/Content.Shared/Whitelist/EntityWhitelistSystem.cs
+++ b/Content.Shared/Whitelist/EntityWhitelistSystem.cs
@@ -23,6 +23,23 @@ public bool IsValid(EntityWhitelist list, [NotNullWhen(true)] EntityUid? uid)
         return uid != null && IsValid(list, uid.Value);
     }
 
+    /// <summary>
+    /// Checks whether a given entity is allowed by a whitelist and not blocked by a blacklist.
+    /// If a blacklist is provided and it matches then this returns false.
+    /// If a whitelist is provided and it does not match then this returns false.
+    /// If either list is null it does not get checked.
+    /// </summary>
+    public bool CheckBoth([NotNullWhen(true)] EntityUid? uid, EntityWhitelist? blacklist = null, EntityWhitelist? whitelist = null)
+    {
+        if (uid == null)
+            return false;
+
+        if (blacklist != null && IsValid(blacklist, uid))
+            return false;
+
+        return whitelist == null || IsValid(whitelist, uid);
+    }
+
     /// <summary>
     /// Checks whether a given entity satisfies a whitelist.
     /// </summary>
diff --git a/Content.Shared/Wieldable/WieldableSystem.cs b/Content.Shared/Wieldable/WieldableSystem.cs
index a0c9d04ff7b..d76876c0cff 100644
--- a/Content.Shared/Wieldable/WieldableSystem.cs
+++ b/Content.Shared/Wieldable/WieldableSystem.cs
@@ -47,6 +47,7 @@ public override void Initialize()
         SubscribeLocalEvent<WieldableComponent, HandDeselectedEvent>(OnDeselectWieldable);
 
         SubscribeLocalEvent<MeleeRequiresWieldComponent, AttemptMeleeEvent>(OnMeleeAttempt);
+        SubscribeLocalEvent<GunRequiresWieldComponent, ExaminedEvent>(OnExamineRequires);
         SubscribeLocalEvent<GunRequiresWieldComponent, ShotAttemptedEvent>(OnShootAttempt);
         SubscribeLocalEvent<GunWieldBonusComponent, ItemWieldedEvent>(OnGunWielded);
         SubscribeLocalEvent<GunWieldBonusComponent, ItemUnwieldedEvent>(OnGunUnwielded);
@@ -116,8 +117,17 @@ private void OnGunRefreshModifiers(Entity<GunWieldBonusComponent> bonus, ref Gun
         }
     }
 
+    private void OnExamineRequires(Entity<GunRequiresWieldComponent> entity, ref ExaminedEvent args)
+    {
+        if(entity.Comp.WieldRequiresExamineMessage != null)
+            args.PushText(Loc.GetString(entity.Comp.WieldRequiresExamineMessage));
+    }
+
     private void OnExamine(EntityUid uid, GunWieldBonusComponent component, ref ExaminedEvent args)
     {
+        if (HasComp<GunRequiresWieldComponent>(uid)) 
+            return;
+
         if (component.WieldBonusExamineMessage != null)
             args.PushText(Loc.GetString(component.WieldBonusExamineMessage));
     }
diff --git a/Content.Shared/Wires/SharedWiresSystem.cs b/Content.Shared/Wires/SharedWiresSystem.cs
index d84766a5fc6..7032293eaf6 100644
--- a/Content.Shared/Wires/SharedWiresSystem.cs
+++ b/Content.Shared/Wires/SharedWiresSystem.cs
@@ -20,6 +20,7 @@ public override void Initialize()
     {
         base.Initialize();
 
+        SubscribeLocalEvent<WiresPanelComponent, ComponentStartup>(OnStartup);
         SubscribeLocalEvent<WiresPanelComponent, WirePanelDoAfterEvent>(OnPanelDoAfter);
         SubscribeLocalEvent<WiresPanelComponent, InteractUsingEvent>(OnInteractUsing);
         SubscribeLocalEvent<WiresPanelComponent, ExaminedEvent>(OnExamine);
@@ -28,6 +29,11 @@ public override void Initialize()
         SubscribeLocalEvent<ActivatableUIRequiresPanelComponent, PanelChangedEvent>(OnActivatableUIPanelChanged);
     }
 
+    private void OnStartup(Entity<WiresPanelComponent> ent, ref ComponentStartup args)
+    {
+        UpdateAppearance(ent, ent);
+    }
+
     private void OnPanelDoAfter(EntityUid uid, WiresPanelComponent panel, WirePanelDoAfterEvent args)
     {
         if (args.Cancelled)
diff --git a/Content.Shared/Zombies/InitialInfectedComponent.cs b/Content.Shared/Zombies/InitialInfectedComponent.cs
index 3149de63bdd..b69d1515f26 100644
--- a/Content.Shared/Zombies/InitialInfectedComponent.cs
+++ b/Content.Shared/Zombies/InitialInfectedComponent.cs
@@ -8,5 +8,5 @@ namespace Content.Shared.Zombies;
 public sealed partial class InitialInfectedComponent : Component
 {
     [DataField]
-    public ProtoId<StatusIconPrototype> StatusIcon = "InitialInfectedFaction";
+    public ProtoId<FactionIconPrototype> StatusIcon = "InitialInfectedFaction";
 }
diff --git a/Content.Shared/Zombies/ZombieComponent.cs b/Content.Shared/Zombies/ZombieComponent.cs
index f510d65d6dc..94e1e5afec4 100644
--- a/Content.Shared/Zombies/ZombieComponent.cs
+++ b/Content.Shared/Zombies/ZombieComponent.cs
@@ -89,7 +89,7 @@ public sealed partial class ZombieComponent : Component
     public TimeSpan NextTick;
 
     [DataField("zombieStatusIcon")]
-    public ProtoId<StatusIconPrototype> StatusIcon { get; set; } = "ZombieFaction";
+    public ProtoId<FactionIconPrototype> StatusIcon { get; set; } = "ZombieFaction";
 
     /// <summary>
     /// Healing each second
diff --git a/Resources/Audio/Items/attributions.yml b/Resources/Audio/Items/attributions.yml
index b3ae4f611f9..6a2d579b700 100644
--- a/Resources/Audio/Items/attributions.yml
+++ b/Resources/Audio/Items/attributions.yml
@@ -134,3 +134,8 @@
   license: "CC-BY-SA-3.0"
   copyright: "Taken from tgstation."
   source: "https://github.com/tgstation/tgstation/blob/a7f525bce9a359ab5282fc754078cd4b5678a006/sound/items"
+
+- files: ["pen_click.ogg"]
+  license: "CC0-1.0"
+  copyright: "Created by dslrguide, converted to ogg and mono by Themias"
+  source: "https://freesound.org/people/dslrguide/sounds/321484"
\ No newline at end of file
diff --git a/Resources/Audio/Items/pen_click.ogg b/Resources/Audio/Items/pen_click.ogg
new file mode 100644
index 00000000000..621b88c4f84
Binary files /dev/null and b/Resources/Audio/Items/pen_click.ogg differ
diff --git a/Resources/Audio/Machines/attributions.yml b/Resources/Audio/Machines/attributions.yml
index 38267ebd694..83725f2b809 100644
--- a/Resources/Audio/Machines/attributions.yml
+++ b/Resources/Audio/Machines/attributions.yml
@@ -161,3 +161,8 @@
   license: "CC-BY-SA-3.0"
   copyright: "Taken from TG station."
   source: "https://github.com/tgstation/tgstation/tree/d4f678a1772007ff8d7eddd21cf7218c8e07bfc0"
+
+- files: ["cutter.ogg"]
+  license: "CC0-1.0"
+  copyright: "by Ko4erga"
+  source: "https://github.com/space-wizards/space-station-14/pull/30431"
diff --git a/Resources/Audio/Machines/cutter.ogg b/Resources/Audio/Machines/cutter.ogg
new file mode 100644
index 00000000000..60f6df04f32
Binary files /dev/null and b/Resources/Audio/Machines/cutter.ogg differ
diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index cd1f29adbfa..899ff5c958e 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -359,5 +359,109 @@ Entries:
   id: 44
   time: '2024-06-30T12:26:41.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/29582
+- author: Chief-Engineer
+  changes:
+  - message: Baby jail no longer prevents accounts with no prior connections from
+      connecting
+    type: Fix
+  id: 45
+  time: '2024-07-11T05:14:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29896
+- author: Repo
+  changes:
+  - message: Added aHelp player pinning.
+    type: Add
+  - message: Added disconnection, reconnection, banning notice on relay and ahelp.
+    type: Add
+  - message: Fixed search clears on aHelp close.
+    type: Fix
+  id: 46
+  time: '2024-07-30T08:28:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28639
+- author: Repo
+  changes:
+  - message: Fixed Ahelp Sorting
+    type: Fix
+  id: 47
+  time: '2024-07-31T01:58:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30518
+- author: Mervill
+  changes:
+  - message: added a debug command to make you thirsty
+    type: Add
+  id: 48
+  time: '2024-08-02T15:49:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30562
+- author: Repo
+  changes:
+  - message: Players that aHelped in Current round stay at top of bwoink list.
+    type: Fix
+  id: 49
+  time: '2024-08-02T18:58:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30580
+- author: Mervill
+  changes:
+  - message: added a debug command to set either your hunger or thirst value to a
+      given threshold
+    type: Add
+  id: 50
+  time: '2024-08-05T07:36:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30563
+- author: nikthechampiongr
+  changes:
+  - message: The player panel has now been added and can be invoked with the playerpanel
+      command. It will display general information on the selected player, as well
+      as allow for general actions to be performed on them.
+    type: Add
+  id: 51
+  time: '2024-08-09T05:33:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30238
+- author: Repo
+  changes:
+  - message: Accurate Panic bunker and Baby Jail conditions.
+    type: Fix
+  id: 52
+  time: '2024-08-09T05:48:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30581
+- author: Simyon
+  changes:
+  - message: You can now view and edit the laws of silicons. Cyborg/Law bound entity
+      -> Admin -> Manage laws
+    type: Add
+  id: 53
+  time: '2024-08-09T06:16:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28483
+- author: TsjipTsjip
+  changes:
+  - message: Explosion damage dealt to players is now logged again.
+    type: Add
+  id: 54
+  time: '2024-08-09T06:24:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29762
+- author: Repo
+  changes:
+  - message: Admin logs for Cubes and other rehydration.
+    type: Add
+  id: 55
+  time: '2024-08-09T06:24:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30597
+- author: Errant
+  changes:
+  - message: The setgamepreset command now only sets the gamemode for a limited number
+      of rounds, specified by a second parameter. Afterwards it switches back to the
+      server default. Omitting the number parameter sets it for 1 round only. To change
+      the game mode for a longer period, either specify a high number or change the
+      game.fallbackpreset cvar so it will reset to what you want
+    type: Tweak
+  id: 56
+  time: '2024-08-09T07:04:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30756
+- author: Ko4erga
+  changes:
+  - message: Added new markup decals.
+    type: Add
+  id: 57
+  time: '2024-08-09T07:06:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30374
 Name: Admin
 Order: 3
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 8a849d31a6e..05fb4706ab8 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,3826 +1,3797 @@
 Entries:
-- author: Flareguy
+- author: Boaz1111
   changes:
-  - message: Colored jumpsuits, shoes, and (most) colored gloves are now colorized
-      off of one set of greyscale sprites. They should now be more consistent & significantly
-      less ugly.
+  - message: You can now actually spawn as a reporter on Oasis
+    type: Fix
+  - message: Oasis now has roundstart sec radios instead of handheld radios mapped
+      in sec, det now has a criminal records computer on box
     type: Tweak
-  id: 6350
-  time: '2024-04-14T08:41:39.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26943
-- author: BramvanZijp
+  id: 6572
+  time: '2024-05-10T02:15:34.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27564
+- author: notquitehadouken
   changes:
-  - message: Nanotrasen's Small Arms Division has slightly improved the firerate and
-      drastically improved the accuracy on its WT550 SMGs.
+  - message: You can now only use suit storage with hardsuits, softsuits, and armor
+      instead of all outer clothing
     type: Tweak
-  - message: The WT550 and C-20R SMGs can now fire in a 5 round burst-fire mode, making
-      it easier for their users to control the recoil on these weapons.
+  id: 6573
+  time: '2024-05-10T02:19:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27546
+- author: aspiringLich
+  changes:
+  - message: The Chemical, Booze, and Soda Dispensers now have updated UIs.
     type: Add
-  id: 6351
-  time: '2024-04-14T08:51:07.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26886
-- author: Dutch-VanDerLinde
+  id: 6574
+  time: '2024-05-10T02:37:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27831
+- author: Jajsha
   changes:
-  - message: Holoparasites and holoclowns will now phase through projectiles such
-      as bullets, like a holocarp.
+  - message: Emagged cyborgs no longer reveal that they have been emagged by simply
+      examining their internals.
     type: Tweak
-  id: 6352
-  time: '2024-04-14T08:52:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26862
-- author: Tyzemol
+  id: 6575
+  time: '2024-05-10T02:57:34.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27816
+- author: RiceMar
   changes:
-  - message: Board game crate now comes with character sheets
+  - message: Larger guns are now wieldable and suffer an inaccuracy when not wielded.
     type: Add
-  id: 6353
-  time: '2024-04-14T08:54:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26926
-- author: FairlySadPanda
+  id: 6576
+  time: '2024-05-10T02:58:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26970
+- author: Doctor-Cpu
+  changes:
+  - message: Atlas has been reworked.
+    type: Tweak
+  id: 6577
+  time: '2024-05-10T08:12:14.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27702
+- author: TheShuEd
   changes:
-  - message: Clown shoes make you waddle, as God intended.
+  - message: 'New events added to the game: Random ships with new ghost roles can
+      now come to the station.'
     type: Add
-  id: 6354
-  time: '2024-04-14T12:12:54.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26338
-- author: beck-thompson
+  id: 6578
+  time: '2024-05-10T11:35:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24490
+- author: MisterMecky
   changes:
-  - message: Cybersun pen now makes a slashing noise when doing damage.
+  - message: Fland kitchen freezer now starts off cold
     type: Fix
-  id: 6355
-  time: '2024-04-14T20:04:06.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26951
-- author: TokenStyle
+  id: 6579
+  time: '2024-05-10T15:57:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27532
+- author: youtissoum
+  changes:
+  - message: Spiders can now wideswing.
+    type: Tweak
+  - message: Slimes can now wideswing.
+    type: Tweak
+  id: 6580
+  time: '2024-05-10T23:49:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27856
+- author: Dutch-VanDerLinde
   changes:
-  - message: Lockers cannot be deconstructed with a screwdriver when locked now.
+  - message: Fix firesuits, ninja suits, and some armor not allowing suit storage.
     type: Fix
-  id: 6356
-  time: '2024-04-14T22:26:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26961
-- author: pissdemon
+  id: 6581
+  time: '2024-05-11T02:20:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27897
+- author: ike709
+  changes:
+  - message: UIs can now link to a Guidebook entry via a help button in the top right
+      corner.
+    type: Add
+  - message: Added the help button to the reagent dispenser UI.
+    type: Add
+  id: 6582
+  time: '2024-05-11T02:21:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27891
+- author: Vasilis
   changes:
-  - message: Catwalks over lava are slightly less likely to catch you on fire again.
+  - message: NPC's activly being controlled by a player wont return to their AI behevior
+      if the player disconnects.
     type: Fix
-  id: 6357
-  time: '2024-04-15T01:27:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26968
-- author: Velcroboy
+  id: 6583
+  time: '2024-05-11T15:01:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27651
+- author: ShadowCommander
   changes:
-  - message: Fixed sec/lawyer and vault airlocks
+  - message: Fixed screen freeze in some cases when getting gibbed or butchered.
     type: Fix
-  id: 6358
-  time: '2024-04-15T22:22:16.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26980
-- author: tosatur
+  id: 6584
+  time: '2024-05-11T15:03:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27617
+- author: DrSmugleaf
   changes:
-  - message: Made clown snoring quieter
+  - message: Bullets no longer hit mobs that are in crit, unless they are directly
+      clicked on while shooting.
     type: Tweak
-  id: 6359
-  time: '2024-04-16T18:48:38.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27012
-- author: DEATHB4DEFEAT, Dutch-VanDerLinde, metalgearsloth and musicmanvr
+  id: 6585
+  time: '2024-05-11T15:42:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27905
+- author: metalgearsloth
   changes:
-  - message: Added loadouts
+  - message: Add a reset button to character setup.
     type: Add
-  id: 6360
-  time: '2024-04-16T19:57:41.736477+00:00'
-  url: null
-- author: Dutch-VanDerLinde
+  - message: Actually get the import / export character buttons working.
+    type: Add
+  - message: Fix performance drop in the eye color picker.
+    type: Fix
+  - message: Fix instances where role timers don't load properly in character setup.
+    type: Fix
+  id: 6586
+  time: '2024-05-11T23:18:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27576
+- author: nikthechampiongr
   changes:
-  - message: Senior role ID cards now function properly.
+  - message: Fixed records consoles sometimes failing to show crew records.
     type: Fix
-  id: 6361
-  time: '2024-04-16T20:17:06.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27017
-- author: Dutch-VanDerLinde
+  id: 6587
+  time: '2024-05-12T15:07:54.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27883
+- author: ShadowCommander
+  changes:
+  - message: Fixed cyborg laws window and other UIs breaking when the built in light
+      was on.
+    type: Fix
+  id: 6588
+  time: '2024-05-12T22:14:35.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27956
+- author: mirrorcult
   changes:
-  - message: Most job loadouts now have winter clothing available.
+  - message: The open slot storage keybinds (V, shift+V) now close the window if it's
+      already opened
     type: Tweak
-  id: 6362
-  time: '2024-04-17T02:49:53.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27022
-- author: metalgearsloth
+  id: 6589
+  time: '2024-05-13T00:03:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27962
+- author: lzk228
   changes:
-  - message: 'Fix the following in lobby: ShowClothes button not working, Skin Color
-      not updating, Skin Color slider not updating upon closing and re-opening character.'
+  - message: Fixed color jumpskirts female mask.
     type: Fix
-  id: 6363
-  time: '2024-04-17T02:54:54.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27033
-- author: MACMAN2003
+  id: 6590
+  time: '2024-05-13T19:25:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27984
+- author: aspiringLich
   changes:
-  - message: Nuclear operatives now only need 20 players to be readied up again instead
-      of 35.
+  - message: Tweaked the Chemical, Booze, and Soda Dispenser UIs to aid readability.
     type: Tweak
-  id: 6364
-  time: '2024-04-17T03:19:30.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27036
-- author: Bellwether
+  id: 6591
+  time: '2024-05-13T21:46:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27958
+- author: deltanedas
   changes:
-  - message: The nun hood now appears in the Chaplain's loadout.
-    type: Tweak
-  id: 6365
-  time: '2024-04-17T03:36:44.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27025
-- author: iNV3RT3D & metalgearsloth
+  - message: Fixed fire spreading being insane.
+    type: Fix
+  id: 6592
+  time: '2024-05-13T21:49:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27986
+- author: DrSmugleaf
   changes:
-  - message: Added a jukebox.
-    type: Add
-  id: 6366
-  time: '2024-04-17T09:27:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26736
-- author: Vermidia
+  - message: Failing to fire a gun that requires wielding will no longer delay the
+      next shot.
+    type: Tweak
+  id: 6593
+  time: '2024-05-14T04:53:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27973
+- author: lzk228
   changes:
-  - message: Pirate Accent and Mobster accent will respect capitalization better now
+  - message: Grill and hotplate can be anchored on the table.
     type: Fix
-  id: 6367
-  time: '2024-04-17T10:04:24.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26644
-- author: metalgearsloth
+  id: 6594
+  time: '2024-05-14T23:57:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28026
+- author: ShadowCommander
   changes:
-  - message: Fix lobby character preview not updating upon changing characters.
+  - message: Fixed salvage magnet UI opening multiple times when activated.
     type: Fix
-  id: 6368
-  time: '2024-04-17T10:06:10.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27043
-- author: Beck Thompson
+  id: 6595
+  time: '2024-05-14T23:59:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28010
+- author: Vermidia
   changes:
-  - message: You now must equip gloved weapons (E.g boxing gloves) to use them.
+  - message: Shuttle roles get PDAs and headsets now
     type: Fix
-  id: 6369
-  time: '2024-04-17T10:10:04.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26762
-- author: slarticodefast
+  id: 6596
+  time: '2024-05-15T10:30:54.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28045
+- author: EdenTheLiznerd
   changes:
-  - message: The gas analyzer now tells you the volume of scanned objects. Tanks inside
-      canisters now show up as well.
-    type: Add
-  - message: The gas analyzer now shows the amount of moles inside the scanned pipe
-      element instead of the whole pipe network.
+  - message: Removed the throngler from the grand lottery
     type: Tweak
-  id: 6370
-  time: '2024-04-17T17:42:24.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25720
+  id: 6597
+  time: '2024-05-15T21:02:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28060
 - author: deltanedas
   changes:
-  - message: The Chameleon Projector has been added to the uplink for 7 TC, it lets
-      you disguise as anything (within reason).
-    type: Add
-  id: 6371
-  time: '2024-04-17T21:48:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26691
-- author: ShadowCommander
+  - message: Fixed ninja criminal records hack not changing sechud icons.
+    type: Fix
+  id: 6598
+  time: '2024-05-16T20:51:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28021
+- author: EmoGarbage404
   changes:
-  - message: Fixed PDA and ID card name, job, and access not getting set on some jobs.
+  - message: Fixed a bug that would cause items in your inventory to get stuck to
+      your cursor.
     type: Fix
-  id: 6372
-  time: '2024-04-17T22:16:25.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27062
-- author: Krunk
+  id: 6599
+  time: '2024-05-17T07:51:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27960
+- author: lzk228
   changes:
-  - message: Head of Security and Warden now have armored and unarmored variants of
-      their winter coats and the unarmored variants are available in the uniform printer.
-    type: Tweak
-  - message: Head of Security's and Warden's winter coats now provide resistances
-      equal to their non-winter counterparts.
-    type: Tweak
-  id: 6373
-  time: '2024-04-18T00:08:06.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/24865
-- author: icekot8
+  - message: Fixed bug with pathological liar and zombie accents.
+    type: Fix
+  id: 6600
+  time: '2024-05-17T16:33:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28049
+- author: YuNii
   changes:
-  - message: "\u0421argo request console now reports when a request is approved"
+  - message: Added the ability to re-bind the emote menu.
     type: Add
-  id: 6374
-  time: '2024-04-18T00:32:22.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27038
-- author: Bellwether
-  changes:
-  - message: Midround zombie outbreaks are less common and spread more slowly.
-    type: Tweak
-  id: 6375
-  time: '2024-04-18T01:06:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27060
-- author: Flareguy
-  changes:
-  - message: Updated Remote Signaller sprites.
-    type: Tweak
-  id: 6376
-  time: '2024-04-18T01:16:48.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27073
-- author: Dutch-VanDerLinde
+  id: 6601
+  time: '2024-05-17T19:46:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28083
+- author: benjamin-burges
   changes:
-  - message: Grey security jumpsuits are now available in the security officer loadout.
+  - message: Bible summon messages are now only visible to the chaplain using the
+      Bible.
     type: Tweak
-  id: 6377
-  time: '2024-04-18T01:22:09.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27023
-- author: Tayrtahn
-  changes:
-  - message: Sodas and other fizzy drinks can be shaken with the verbs menu to build
-      up fizziness so they spray when opened.
-    type: Add
-  id: 6378
-  time: '2024-04-18T01:49:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25574
-- author: metalgearsloth
+  id: 6602
+  time: '2024-05-18T14:23:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28104
+- author: Aquif
   changes:
-  - message: Fix lobby UI not resetting for character changes.
+  - message: Changing your character's description now properly updates the save button.
     type: Fix
-  id: 6379
-  time: '2024-04-18T03:01:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27075
-- author: TokenStyle
+  - message: The character description editor does not discard your last edit anymore.
+    type: Fix
+  id: 6603
+  time: '2024-05-19T00:23:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28122
+- author: DrSmugleaf
   changes:
-  - message: Benzene is no longer required for the Insuzine recipe.
+  - message: Attempting to dual wield something will now automatically drop the item
+      in your other hand.
     type: Tweak
-  id: 6380
-  time: '2024-04-18T03:03:39.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26829
-- author: Golinth
+  id: 6604
+  time: '2024-05-19T01:35:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27975
+- author: SHOTbyGUN
   changes:
-  - message: The Nukie Agent now comes with a medihud built into their visor!
+  - message: White cane recipe for MedFab
     type: Add
-  id: 6381
-  time: '2024-04-18T03:04:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26218
-- author: Krunk
+  id: 6605
+  time: '2024-05-19T22:22:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28146
+- author: EmoGarbage404
   changes:
-  - message: Cyborgs no longer see criminal status icons.
-    type: Remove
-  id: 6382
-  time: '2024-04-18T03:20:44.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26207
-- author: ArZarLordOfMango
+  - message: Mirrors work again.
+    type: Fix
+  id: 6606
+  time: '2024-05-19T22:35:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28084
+- author: PolterTzi
   changes:
-  - message: Added autolathe recipe for beverage jug.
+  - message: The guidebook now lists the effects reagents have on plants.
     type: Add
-  id: 6383
-  time: '2024-04-18T03:24:15.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25681
-- author: superjj18
+  id: 6607
+  time: '2024-05-19T23:01:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28038
+- author: Tayrtahn
   changes:
-  - message: Emergency lighting now changes based on station alert level!
+  - message: The popup for someone pointing at you is now slightly larger than normal
+      popups.
     type: Tweak
-  id: 6384
-  time: '2024-04-18T10:50:08.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26932
-- author: Dutch-VanDerLinde
-  changes:
-  - message: Chemists now start with chemical analysis goggles.
-    type: Tweak
-  id: 6385
-  time: '2024-04-18T10:52:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27047
-- author: TheShuEd
-  changes:
-  - message: botanist can now mutate blood tomatoes into killer tomatoes! they will
-      be personal pets, aggressively defending the owner from any social interactions.
-    type: Add
-  id: 6386
-  time: '2024-04-18T11:21:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26053
-- author: TheShuEd
+  id: 6608
+  time: '2024-05-20T13:32:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28152
+- author: Tayrtahn
   changes:
-  - message: Now winter around Europa is different every round
-    type: Tweak
-  id: 6387
-  time: '2024-04-18T11:27:54.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26510
-- author: Flareguy
+  - message: '"Warp to most followed" ghost option no longer includes admins and non-ghost
+      followers.'
+    type: Fix
+  id: 6609
+  time: '2024-05-20T14:12:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28120
+- author: Killerqu00
   changes:
-  - message: The Research Director's hardsuit is now 5x5 in the inventory instead
-      of 2x2. You'll need a duffelbag to store it now.
+  - message: Sleeper Agents only appear once per round.
     type: Tweak
-  id: 6388
-  time: '2024-04-18T18:05:45.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27094
-- author: Dutch-VanDerLinde
+  id: 6610
+  time: '2024-05-21T10:16:35.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28160
+- author: TheShuEd
   changes:
-  - message: Roboticist gear in now available in the scientist loadout.
+  - message: Artifact portal lifespan reduced from 120 seconds to 1 second
     type: Tweak
-  id: 6389
-  time: '2024-04-18T23:38:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27045
-- author: Whisper
+  id: 6611
+  time: '2024-05-22T07:52:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28200
+- author: nikthechampiongr
   changes:
-  - message: Raised the difficulty class of RD hardsuit objective, it will be less
-      likely to get it with other hard objectives.
+  - message: Firelocks can now be pried by hand.
     type: Tweak
-  id: 6390
-  time: '2024-04-18T23:41:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27103
-- author: iztokbajcar
-  changes:
-  - message: Glass textures are now less transparent.
+  - message: Firelocks will now not automatically close for 2 seconds after you pry
+      them open.
     type: Tweak
-  id: 6391
-  time: '2024-04-18T23:43:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26948
-- author: SlamBamActionman
-  changes:
-  - message: Snouts and noses no longer disappear with toggled masks.
+  - message: Firelocks are now properly predicted.
     type: Fix
-  id: 6392
-  time: '2024-04-19T05:39:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25716
-- author: shampunj
-  changes:
-  - message: 'Now for crafting stunprod you need: igniter, cable cuffs, small power
-      cell, metal rod.'
-    type: Tweak
-  - message: Stunprod deals 35 stamina damage per hit and 5 shock damage. The battery
-      charge is enough for 3 hits.
-    type: Tweak
-  id: 6393
-  time: '2024-04-19T05:50:10.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25922
-- author: EmoGarbage404
-  changes:
-  - message: Halved passive fuel consumption of welding tools.
-    type: Tweak
-  - message: Completing an action with a welding tool now directly drains the fuel.
-    type: Tweak
-  id: 6394
-  time: '2024-04-19T23:20:30.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27030
-- author: superjj18
-  changes:
-  - message: Pneumatic cannon inventory reduced in size to 2x2, item blacklist removed
-    type: Tweak
-  id: 6395
-  time: '2024-04-19T23:22:37.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26878
-- author: Aquif
+  id: 6612
+  time: '2024-05-22T11:16:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26582
+- author: blueDev2
   changes:
-  - message: The Communication Console will no longer cut off your messages.
+  - message: Watermelon slices are now considered fruit
     type: Fix
-  id: 6396
-  time: '2024-04-20T01:07:10.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27145
-- author: osjarw
+  id: 6613
+  time: '2024-05-23T20:27:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28226
+- author: ElectroJr
   changes:
-  - message: Wallmount substation electronics can now be created at an autolathe.
-    type: Add
-  id: 6397
-  time: '2024-04-20T01:14:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27138
-- author: Gyrandola
+  - message: Ghosts can once again open paper & other UIs
+    type: Fix
+  id: 6614
+  time: '2024-05-24T05:03:03.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27999
+- author: nikthechampiongr
   changes:
-  - message: Pepper sprites are now properly centered!
+  - message: Firelocks will no longer randomly pulse closing lights.
     type: Fix
-  id: 6398
-  time: '2024-04-20T02:06:48.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25971
+  id: 6615
+  time: '2024-05-24T14:44:42.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28227
 - author: ElectroJr
   changes:
-  - message: Fixed a bug causing the emergency shuttle to not spawn
+  - message: Fixed modular grenade visuals getting stuck in an incorrect state.
     type: Fix
-  id: 6399
-  time: '2024-04-20T02:10:19.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27144
-- author: slarticodefast
+  id: 6616
+  time: '2024-05-25T20:03:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28265
+- author: deltanedas
   changes:
-  - message: The internal volume of cryopods has been increased from 101.3 to 1000L.
-      This speeds up cooling patients inside.
-    type: Tweak
-  id: 6400
-  time: '2024-04-20T03:44:39.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27148
-- author: UBlueberry
+  - message: Fixed ID Cards not updating the manifest when changed.
+    type: Fix
+  id: 6617
+  time: '2024-05-25T20:08:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28237
+- author: TheShuEd
   changes:
-  - message: Changed the guidebook entry for the Space Ninja, bringing it up to the
-      same quality as the other antagonist entries.
+  - message: 'Killer tomatoes got a small health and damage buff: 24 -> 35 hp and
+      4->9 brute damage'
     type: Tweak
-  id: 6401
-  time: '2024-04-20T06:10:22.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26650
-- author: Vermidia
-  changes:
-  - message: You can now bless many more containers with a bible.
+  - message: Killer tomatoes now die after 5 minutes of their existence
     type: Tweak
-  id: 6402
-  time: '2024-04-20T06:16:55.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26526
-- author: SoulFN
+  - message: Killer tomatoes can now be profitably sold.
+    type: Add
+  id: 6618
+  time: '2024-05-25T20:18:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28173
+- author: metalgearsloth
+  changes:
+  - message: Fix water shader getting stuck on sometimes.
+    type: Fix
+  id: 6619
+  time: '2024-05-25T20:23:34.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28130
+- author: Errant
   changes:
-  - message: Various types of glass shards now causes diffrent damage
+  - message: Changing hands while wielding an item will now immediately unwield it.
     type: Tweak
-  id: 6403
-  time: '2024-04-20T06:21:13.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26783
-- author: Vermidia
+  id: 6620
+  time: '2024-05-26T01:17:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28161
+- author: ElectroJr
   changes:
-  - message: Most medical roles now can choose to start with nitrile or latex gloves,
-      or a sterile mask in their loadout, Medical Doctors can also start with a nurse
-      hat.
-    type: Add
-  id: 6404
-  time: '2024-04-20T06:22:48.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27029
-- author: MilenVolf
+  - message: Fixed being unable to interact with items via storage UIs
+    type: Fix
+  id: 6621
+  time: '2024-05-26T02:11:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28291
+- author: EmoGarbage404
   changes:
-  - message: Most crates can now go through plastic flaps.
+  - message: Properly fix magic mirrors
     type: Fix
-  id: 6405
-  time: '2024-04-20T06:23:20.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27137
-- author: MilenVolf
+  id: 6622
+  time: '2024-05-26T04:46:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28282
+- author: deltanedas
   changes:
-  - message: Electronics inside windoors now has proper accesses.
+  - message: Fixed being picked for antag roles while in the lobby or not opted in.
     type: Fix
-  id: 6406
-  time: '2024-04-20T06:26:00.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27133
-- author: Bhijn and Myr
+  id: 6623
+  time: '2024-05-26T05:14:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28197
+- author: Dutch-VanDerLinde
   changes:
-  - message: An option to tie your viewport's scaling to your vertical screenspace
-      has been added, enabled by default! In laymen's terms, this means that manual
-      configuration is no longer necessary to avoid letterboxing on aspect ratios
-      tighter than 16:9, as the viewport will now default to cutting off any excess
-      horizontal width instead of letterboxing vertically when the screen is too tight.
-    type: Add
-  id: 6407
-  time: '2024-04-20T06:46:02.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27061
-- author: Whisper
+  - message: Fix hypodarts not injecting into people with outerclothing equipped.
+    type: Fix
+  id: 6624
+  time: '2024-05-26T14:48:34.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28301
+- author: metalgearsloth
+  changes:
+  - message: Selectively revert pulling throwing for the short-term.
+    type: Tweak
+  id: 6625
+  time: '2024-05-27T00:11:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28126
+- author: EmoGarbage404
   changes:
-  - message: All mobs should now properly burn to ash.
+  - message: Multiple pipes facing the same direction can no longer be placed on the
+      same tile. You can still have overlapping straight pipes or corners going in
+      opposite directions.
     type: Fix
-  id: 6408
-  time: '2024-04-20T14:44:10.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27158
-- author: IProduceWidgets
+  id: 6626
+  time: '2024-05-27T22:37:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28308
+- author: Emisse
   changes:
-  - message: New map Oasis.
-    type: Add
-  id: 6409
-  time: '2024-04-21T05:59:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25736
-- author: KittenColony
+  - message: Derotate Train temporarily
+    type: Tweak
+  id: 6627
+  time: '2024-05-27T22:40:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28328
+- author: EmoGarbage404
   changes:
-  - message: Added a new lizard snout, featuring a split muzzle and snoot that can
-      be coloured independently
-    type: Add
-  id: 6410
-  time: '2024-04-21T06:18:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27143
-- author: SpeltIncorrectyl
+  - message: Fixed not enough antags being selected for gamemodes.
+    type: Fix
+  id: 6628
+  time: '2024-05-27T22:43:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28327
+- author: EmoGarbage404
   changes:
-  - message: Security Officers, Head of Security, and Warden can now choose to start
-      with a security webbing instead of a belt in their loadout menu.
-    type: Add
-  id: 6411
-  time: '2024-04-21T06:19:20.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27189
-- author: ElectroJr
+  - message: Removed the fire-fighting remote.
+    type: Remove
+  id: 6629
+  time: '2024-05-28T00:04:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28330
+- author: slarticodefast
   changes:
-  - message: Fixed the nukie station not getting properly initialized.
+  - message: Corrected some cargo bounties.
     type: Fix
-  id: 6412
-  time: '2024-04-21T06:52:45.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27201
-- author: Blackern5000
+  id: 6630
+  time: '2024-05-28T00:51:50.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28255
+- author: Repo
   changes:
-  - message: '"Experienced" passengers can now wear a rainbow jumpsuit using loadouts.'
-    type: Add
-  id: 6413
-  time: '2024-04-21T11:53:08.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27211
-- author: PJB3005
+  - message: NanoMed, wall vends will spawn items the correct direction.
+    type: Fix
+  id: 6631
+  time: '2024-05-28T14:02:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28279
+- author: ShadowCommander
   changes:
-  - message: The item status menu has been moved to the side of the hands. There is
-      now one for each hand.
-    type: Add
-  - message: The item status menu fits with the rest of the HUD theme now.
-    type: Add
-  - message: Improved, fixed and otherwise added a bunch of item status menus.
+  - message: Added pressure and temperature warnings to firelock examine text.
     type: Add
-  id: 6414
-  time: '2024-04-21T13:16:23.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/22986
-- author: FairlySadPanda
-  changes:
-  - message: Xenoarchaeology Traversal Distorters have been rolled into the Artifact
-      Analyzers to make artifact gameplay a bit more controlled.
-    type: Tweak
-  - message: The T2 Abnormal Artifact Manipulation tech has been made cheaper to compensate
-      for losing an unlock.
-    type: Tweak
-  - message: The Xenoarchaeology guidebook entry has been rewritten to be more useful
-      and comprehensive for newbies.
-    type: Tweak
-  id: 6415
-  time: '2024-04-21T16:09:26.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26545
+  id: 6632
+  time: '2024-05-28T14:59:13.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28341
 - author: deltanedas
   changes:
-  - message: Flaming mice no longer completely engulf people they touch.
+  - message: Nukies will have ghost roles opened if not enough people can be picked.
     type: Tweak
-  id: 6416
-  time: '2024-04-22T08:42:26.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27202
-- author: Weax
+  id: 6633
+  time: '2024-05-28T15:35:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28316
+- author: WarMechanic
   changes:
-  - message: The CLF3 reaction now requires heating first before you can engulf chemistry
-      in fiery death.
+  - message: Guns will now cycle when interacting with them in-hand after wielding.
     type: Tweak
-  id: 6417
-  time: '2024-04-22T08:44:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27187
-- author: Potato1234_x
-  changes:
-  - message: Added Psicodine, Mannitol, Lipolicide and Happiness.
-    type: Add
-  id: 6418
-  time: '2024-04-22T08:45:39.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27134
-- author: Terraspark4941
+  id: 6634
+  time: '2024-05-28T18:17:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28002
+- author: lzk228
   changes:
-  - message: Updated the engineering section of the guidebook!
+  - message: Gasp and deathgasp emotes now have a sound.
     type: Tweak
-  id: 6419
-  time: '2024-04-22T08:58:54.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26851
-- author: eclips_e
+  id: 6635
+  time: '2024-05-28T23:56:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27736
+- author: Cojoke-dot
   changes:
-  - message: Slimepeople can now morph into a "geras"--a smaller slime form that can
-      pass under grilles, at the cost of dropping all of their inventory. They can
-      also be picked up with two hands and placed into duffelbags.
-    type: Add
-  - message: Slimepeople now have an internal 2x2 storage that they (and anyone around
-      them) can access. It is not dropped when morphing into a geras!
-    type: Add
-  - message: Slimepeople now have slightly increased regeneration and a slightly meatier
-      punch, but slower attacks.
-    type: Add
-  id: 6420
-  time: '2024-04-22T10:03:03.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/23425
-- author: FungiFellow
+  - message: The syndicate Medical and Sabatour borgs now come with medical and diagnostics
+      HUDs  respectively.
+    type: Tweak
+  id: 6636
+  time: '2024-05-29T00:16:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27875
+- author: ShadowCommander
   changes:
-  - message: Syndi-Cats are now 6TC, Insulated, Available to Syndies, Can Move in
-      Space, Open Doors, and Hit Harder
+  - message: Popups with the same message now stack together and append a x# to the
+      end.
     type: Tweak
-  id: 6421
-  time: '2024-04-22T12:18:28.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27222
-- author: Tayrtahn
+  id: 6637
+  time: '2024-05-29T04:05:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27978
+- author: notafet
   changes:
-  - message: Ghosts can no longer trigger artifacts by examining them.
+  - message: Slightly increase spacing speed to fix under-pressure lockout.
+    type: Tweak
+  - message: Fix vent under-pressure lockout.
     type: Fix
-  id: 6422
-  time: '2024-04-22T22:46:22.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27249
-- author: Tyzemol
+  id: 6638
+  time: '2024-05-29T05:21:48.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28370
+- author: lzk228
   changes:
-  - message: Slimes no longer absorb all items used on them
-    type: Fix
-  id: 6423
-  time: '2024-04-23T08:48:26.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27260
-- author: Rainbeon
+  - message: Salvage access has been replaced with Cargo for the artifact container.
+    type: Tweak
+  id: 6639
+  time: '2024-05-29T16:46:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28386
+- author: notafet
   changes:
-  - message: Suit sensor vitals now function again.
+  - message: Fix passive gate flow rate display.
     type: Fix
-  id: 6424
-  time: '2024-04-23T08:57:09.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27259
-- author: Ghagliiarghii
+  id: 6640
+  time: '2024-05-30T00:34:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28372
+- author: Lamrr
   changes:
-  - message: Security can now find replacements for their trusty Combat Knife in the
-      SecVend, or craft them with the Sec Lathe.
+  - message: Candle boxes can now only hold candles.
     type: Tweak
-  id: 6425
-  time: '2024-04-23T11:24:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27224
-- author: Whisper
+  id: 6641
+  time: '2024-05-30T04:15:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28314
+- author: blueDev2
   changes:
-  - message: Fire stack limit reduced from 20 to 10. Fire transfers will be less effective,
-      and fires will not last as long.
-    type: Tweak
-  id: 6426
-  time: '2024-04-23T11:30:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27159
-- author: brainfood1183
-  changes:
-  - message: Directional Exit signs for maints!
-    type: Add
-  id: 6427
-  time: '2024-04-23T11:31:48.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26831
-- author: pigeonpeas
-  changes:
-  - message: Adds the ability to purchase emitters in cargo.
-    type: Add
-  id: 6428
-  time: '2024-04-23T11:34:09.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27229
-- author: EmoGarbage404
-  changes:
-  - message: Fixed cargo telepads not teleporting in orders from linked consoles.
+  - message: Epipens can be disposed
     type: Fix
-  id: 6429
-  time: '2024-04-23T12:07:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27255
-- author: Plykiya
-  changes:
-  - message: Do-after bars of other players are now shaded and harder to see in the
-      dark.
-    type: Tweak
-  id: 6430
-  time: '2024-04-24T02:42:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27273
-- author: Blackern5000
-  changes:
-  - message: The cargo telepad is now tier 2 technology rather than tier 3.
-    type: Tweak
-  id: 6431
-  time: '2024-04-24T13:21:29.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26270
-- author: FungiFellow
+  id: 6642
+  time: '2024-05-30T04:18:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28317
+- author: metalgearsloth
   changes:
-  - message: Truncheon now fits in SecBelt
+  - message: Predict opening even more interfaces.
     type: Tweak
-  id: 6432
-  time: '2024-04-24T13:43:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27281
-- author: pigeonpeas
-  changes:
-  - message: Adds a trash bag to the advanced cleaning module.
-    type: Add
-  id: 6433
-  time: '2024-04-24T21:27:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27226
-- author: Beck Thompson
+  id: 6643
+  time: '2024-05-30T07:32:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28405
+- author: ShadowCommander
   changes:
-  - message: Radio jammer now has 3 selectable power operating levels and a battery
-      level led indicator!
-    type: Tweak
-  id: 6434
-  time: '2024-04-25T02:19:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25912
-- author: cooldolphin
+  - message: Fixed firelocks with warnings enabled opening immediately for characters
+      without engineering access.
+    type: Fix
+  id: 6644
+  time: '2024-05-30T17:25:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28415
+- author: moonheart08
   changes:
-  - message: Three variants of glasses are now available in the loadout menu.
-    type: Add
-  id: 6435
-  time: '2024-04-25T23:18:39.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27286
-- author: EmoGarbage404
+  - message: The hand teleporter can no longer create portal links between grids.
+    type: Remove
+  id: 6645
+  time: '2024-05-30T20:45:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28423
+- author: Ghagliiarghii
   changes:
-  - message: Traitors now have the correct number of objectives.
-    type: Fix
-  - message: Declaring war now gives TC again.
-    type: Fix
-  - message: Latejoining antagonists will now properly exclude command and security
-      staff.
+  - message: Cargo Sale Computer now correctly uses its own computer board
     type: Fix
-  id: 6436
-  time: '2024-04-26T00:25:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27319
-- author: Tayrtahn
+  id: 6646
+  time: '2024-05-31T00:28:12.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28425
+- author: metalgearsloth
   changes:
-  - message: Fixed Bibles not healing.
-    type: Fix
-  - message: Fixed quick insert and area insert not working on ore/plant/trash bags.
+  - message: Fix verb categories shuffling around.
     type: Fix
-  id: 6437
-  time: '2024-04-26T02:25:52.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27234
-- author: SkaldetSkaeg
-  changes:
-  - message: The handheld radio no longer plays a message spoken into it.
-    type: Tweak
-  id: 6438
-  time: '2024-04-26T07:34:20.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27046
-- author: FungiFellow
+  id: 6647
+  time: '2024-05-31T01:55:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28368
+- author: ShadowCommander
   changes:
-  - message: Added SecBelt whitelist to Sec webbing
-    type: Tweak
-  - message: Added more Ammo holders to SecBelt whitelist
+  - message: Tweaked the player tab column widths so that usernames and character
+      names are more visible.
     type: Tweak
-  id: 6439
-  time: '2024-04-26T07:44:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27303
-- author: IlyaElDunaev
-  changes:
-  - message: Ammonia heal blood loss in the Rat King
-    type: Add
-  id: 6440
-  time: '2024-04-26T07:47:02.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26887
-- author: FungiFellow
+  id: 6648
+  time: '2024-05-31T01:59:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28029
+- author: EmoGarbage404
   changes:
-  - message: Added Quiver Recipe, go wild Robin Hood.
-    type: Add
-  id: 6441
-  time: '2024-04-26T07:48:15.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27198
-- author: Boaz1111
+  - message: Fixed latejoin antagonists not respecting antag preferences (for real
+      this time)
+    type: Fix
+  id: 6649
+  time: '2024-05-31T02:06:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28430
+- author: Ubaser
   changes:
-  - message: Refactored Cluster's medbay, including cryo in the bottom left room
+  - message: Botanists now spawn with a plant clipper.
     type: Tweak
-  id: 6442
-  time: '2024-04-26T08:01:21.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27293
-- author: metalgearsloth
-  changes:
-  - message: Add predicted UI opening for storage and PDAs.
-    type: Add
-  id: 6443
-  time: '2024-04-26T08:16:24.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27214
-- author: DrSmugleaf
+  id: 6650
+  time: '2024-05-31T07:37:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28439
+- author: Ubaser
   changes:
-  - message: Fixed mobs that are able to pry doors not being able to do so by just
-      left clicking on them.
-    type: Fix
-  id: 6444
-  time: '2024-04-26T12:17:25.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27349
-- author: WarMechanic
+  - message: Janitors now spawn with a light replacer.
+    type: Tweak
+  id: 6651
+  time: '2024-05-31T08:44:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28441
+- author: NazrinNya
   changes:
-  - message: Fixed unwielding overruling gun cycling
+  - message: Disposal pipes are now blocked from constructing underneath impassable
+      objects.
     type: Fix
-  id: 6445
-  time: '2024-04-26T12:31:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27307
-- author: wafehling
+  id: 6652
+  time: '2024-05-31T14:49:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28447
+- author: ShadowCommander
   changes:
-  - message: You can now reopen the end of round summary window with F9.
+  - message: Opening a firelock when temperature or pressure warnings are active,
+      now always shows the warning popup.
     type: Tweak
-  id: 6446
-  time: '2024-04-26T12:39:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25884
-- author: DrSmugleaf
+  id: 6653
+  time: '2024-05-31T14:56:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28420
+- author: ElectroJr
   changes:
-  - message: Fixed the game never starting again if it fails to start once.
+  - message: Hugging a player no longer briefly opens the mugging UI
     type: Fix
-  id: 6447
-  time: '2024-04-26T13:02:08.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27359
-- author: Dutch-VanDerLinde
+  id: 6654
+  time: '2024-05-31T17:25:03.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28432
+- author: aspiringLich
   changes:
-  - message: Monkey reinforcement teleporters can now select between kobold and monkey
-      operative with a verb.
-    type: Tweak
-  - message: Monkey reinforcement teleporters have been renamed to "genetic ancestor
-      reinforcement teleporter".
+  - message: Some chemicals have been made more colorful and child-friendly.
     type: Tweak
-  id: 6448
-  time: '2024-04-26T13:06:44.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25982
-- author: fujiwaranao
-  changes:
-  - message: Players may now select the Creepy Long hairstyle and an appropriately
-      creepy dress to go with it can be found in theatrical performances crates.
-    type: Add
-  id: 6449
-  time: '2024-04-26T18:51:26.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27333
-- author: Pgriha
+  id: 6655
+  time: '2024-05-31T19:44:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28367
+- author: Vermidia
   changes:
-  - message: Increase limit of characters 10 -> 30.
+  - message: Many more ghost roles have a random appearance, including ERT and shuttle
+      roles.
     type: Tweak
-  id: 6450
-  time: '2024-04-26T22:58:26.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27361
-- author: AllenTheGreat
-  changes:
-  - message: The Agent ID card will no longer reset the selected job icon between
-      UI loads
-    type: Fix
-  id: 6451
-  time: '2024-04-27T05:13:13.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27379
-- author: Slava0135
-  changes:
-  - message: added cancer mouse! (for real this time)
-    type: Add
-  id: 6452
-  time: '2024-04-27T05:46:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26768
-- author: EmoGarbage404
+  id: 6656
+  time: '2024-06-01T04:51:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27997
+- author: Cojoke-dot
   changes:
-  - message: Added the welding gas mask to salvage equipment research.
+  - message: Medical Borgs now have medical huds
     type: Add
-  id: 6453
-  time: '2024-04-27T05:47:38.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27108
-- author: VigersRay
-  changes:
-  - message: Angered NPC now can unbuckle, unpull and escape from containers.
-    type: Fix
-  id: 6454
-  time: '2024-04-27T05:58:10.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26868
-- author: Lukasz825700516
+  id: 6657
+  time: '2024-06-01T04:54:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28391
+- author: beck-thompson
   changes:
-  - message: Fixed undeconstructable objects showing deconstruct verb.
+  - message: You can now remove evidence from containers using the verb menu.
     type: Fix
-  id: 6455
-  time: '2024-04-27T06:30:30.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27387
-- author: ps3moira
+  id: 6658
+  time: '2024-06-01T04:58:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28101
+- author: notafet
   changes:
-  - message: Added Canes to the CuraDrobe and Cane Blades for Syndicate Librarians
-    type: Add
-  id: 6456
-  time: '2024-04-27T10:22:10.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25873
-- author: Lukasz825700516
+  - message: Increase power output from Tesla coils.
+    type: Tweak
+  id: 6659
+  time: '2024-06-01T05:51:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28424
+- author: Beck Thompson
   changes:
-  - message: Fixed books containing localization keys.
+  - message: ID computer will now select passenger as the default id icon instead
+      of atmospheric technician.
     type: Fix
-  id: 6457
-  time: '2024-04-27T10:23:55.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27390
-- author: Errant
-  changes:
-  - message: Vox now take significant damage over time while inhaling oxygen.
-    type: Tweak
-  id: 6458
-  time: '2024-04-27T10:33:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26705
-- author: TheShuEd
+  id: 6660
+  time: '2024-06-01T17:29:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28462
+- author: AJCM-git
   changes:
-  - message: Added tomato killers in floral anomaly berries
-    type: Add
-  - message: tweak size and damage of killer tomatoes
+  - message: Machine parts are now stackable
     type: Tweak
-  id: 6459
-  time: '2024-04-27T10:35:13.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27265
-- author: Plykiya
+  id: 6661
+  time: '2024-06-01T17:49:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28434
+- author: DrSmugleaf
   changes:
-  - message: You can no longer print singular bullets at the security techfab.
-    type: Remove
-  - message: The security techfab now has recipes for ammunition boxes and pre-filled
-      magazines of every type of ammo.
-    type: Add
-  - message: You can now print empty magazines at the security techfab.
-    type: Add
-  - message: Material costs for printing all ammo and mags were rebalanced.
+  - message: Disabled the seeing rainbows screen effect when reduced motion is enabled
+      in the options menu.
     type: Tweak
-  id: 6460
-  time: '2024-04-27T10:38:59.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26178
-- author: Ramlik
+  id: 6662
+  time: '2024-06-02T01:41:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28496
+- author: Cojoke-dot
   changes:
-  - message: Added security walkie talkies to the vendor.
-    type: Add
-  id: 6461
-  time: '2024-04-27T13:27:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25913
-- author: brainfood1183
+  - message: Lasers now pass through Glass External Airlocks and Glass Shuttle Airlocks
+    type: Fix
+  id: 6663
+  time: '2024-06-02T04:13:12.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28065
+- author: slarticodefast
   changes:
-  - message: Centcom advises all crewmembers to please stop putting rodents in the
-      fax machines (rodents can now be inserted into fax machine).
-    type: Add
-  id: 6462
-  time: '2024-04-27T13:50:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/21461
-- author: MilenVolf
+  - message: Fixed the flash effect getting darker with each appearence.
+    type: Fix
+  - message: Fixed short-sightedness making you immune to flashes.
+    type: Fix
+  id: 6664
+  time: '2024-06-02T04:17:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27369
+- author: AJCM-git
   changes:
-  - message: Glass Box now can be constructed and deconstructed!
-    type: Add
-  - message: Glass Box now makes an alarm sound on destruction.
-    type: Tweak
-  - message: Now Antique Laser can be put back in the Glass Box.
+  - message: Midround antags work again
     type: Fix
-  id: 6463
-  time: '2024-04-27T13:53:16.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25365
-- author: metalgearsloth
+  id: 6665
+  time: '2024-06-02T16:52:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28523
+- author: Errant-4
   changes:
-  - message: Fix a lot of UI bugs.
+  - message: Map labels no longer suddenly disappear for the rest of the round.
     type: Fix
-  id: 6464
-  time: '2024-04-27T16:32:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27401
-- author: RiceMar1244
+  id: 6666
+  time: '2024-06-02T17:30:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28518
+- author: Whisper
   changes:
-  - message: Resprited the captain's antique laser pistol.
+  - message: Renamed the player-obtainable "admin cloak" to "weh cloak".
     type: Tweak
-  id: 6465
-  time: '2024-04-27T19:08:38.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27037
-- author: SlamBamActionman
+  id: 6667
+  time: '2024-06-03T02:18:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28540
+- author: Vermidia
   changes:
-  - message: Hardsuits and other helmets/hoods should no longer make you bald after
-      toggling.
+  - message: Glass shards are no longer weldable with an unlit welder.
     type: Fix
-  id: 6466
-  time: '2024-04-27T19:10:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27404
-- author: Plykiya
+  id: 6668
+  time: '2024-06-03T03:28:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27959
+- author: AJCM-git
   changes:
-  - message: Max amount of traitors dropped from 12 to 8.
+  - message: Biomass reclaimers no longer act as a void to any unfortunate belongings
+      a corpse may be wearing
     type: Tweak
-  id: 6467
-  time: '2024-04-28T02:25:19.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27415
-- author: Plykiya
-  changes:
-  - message: The emagged autolathe now has recipes for ammunition boxes and pre-filled
-      magazines of every type of ammo.
-    type: Add
-  - message: You can now print empty magazines at the emagged autolathe.
-    type: Add
-  id: 6468
-  time: '2024-04-28T03:02:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27396
-- author: icekot8
-  changes:
-  - message: T3 Portable Microfusion Weaponry research now have a portable charger
-    type: Add
-  id: 6469
-  time: '2024-04-28T03:19:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26655
-- author: osjarw
+  id: 6669
+  time: '2024-06-03T03:30:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28544
+- author: Laneron
   changes:
-  - message: Putting a hand labeler in a belt is now predicted correctly.
+  - message: Jetpack UI window now has correctly displayed header
     type: Fix
-  id: 6470
-  time: '2024-04-28T04:19:30.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26660
-- author: Dezzzix
-  changes:
-  - message: Added bar spoon, jigger and ice bucket
-    type: Add
-  - message: Bartender tools added in boozeomat
-    type: Add
-  - message: Jigger added in Bartender guidebook
-    type: Add
-  id: 6471
-  time: '2024-04-28T04:40:07.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27406
-- author: KrasnoshchekovPavel
+  id: 6670
+  time: '2024-06-03T03:33:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28545
+- author: Vermidia
   changes:
-  - message: Included damage type/group, metabolism type/group localization for weapon
-      damage examination and guidebook reagent effects
-    type: Fix
-  id: 6472
-  time: '2024-04-28T04:48:20.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27368
-- author: Keer-Sar
+  - message: SyndiCats now spawn from a radio like other reinforcements.
+    type: Tweak
+  id: 6671
+  time: '2024-06-03T11:54:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28492
+- author: Cojoke-dot
   changes:
-  - message: Medal Cases now only hold medals
+  - message: Medibots will now occasionally talk
     type: Tweak
-  id: 6473
-  time: '2024-04-28T05:04:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27428
-- author: EmoGarbage404
+  id: 6672
+  time: '2024-06-03T12:05:14.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28543
+- author: Cojoke-dot
   changes:
-  - message: Lockers can now be deconstructed again.
-    type: Fix
-  id: 6474
-  time: '2024-04-28T05:26:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27431
-- author: SlamBamActionman
-  changes:
-  - message: "Removed Exterminators pending redesign. \U0001F525\U0001F44D\U0001F525"
-    type: Remove
-  id: 6475
-  time: '2024-04-28T05:45:54.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26978
-- author: Boaz1111
-  changes:
-  - message: Circuit imprinter recipes now cost less glass
+  - message: The player can now use the gasping emote
     type: Tweak
-  id: 6476
-  time: '2024-04-28T05:46:53.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27310
-- author: Piksqu & Boaz1111
-  changes:
-  - message: Added the hyperconvection circuit imprinter
-    type: Add
-  id: 6477
-  time: '2024-04-28T05:49:03.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27283
-- author: exincore
-  changes:
-  - message: Fax machines now copy the labels attached to papers.
-    type: Add
-  - message: Fax machine "Print File" functionality now applies the first line of
-      the file as a label when it begins with `#`.
-    type: Add
-  id: 6478
-  time: '2024-04-28T06:12:45.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25979
-- author: Plykiya
+  id: 6673
+  time: '2024-06-03T12:10:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28466
+- author: Cojoke-dot
   changes:
-  - message: Hardsuits, EVA suits, firesuits and other things now protect your feet
-      from dangerous glass shards.
+  - message: Bullets no longer hit crates unless directly clicked on while shooting.
     type: Tweak
-  id: 6479
-  time: '2024-04-28T07:11:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26764
-- author: FungiFellow
-  changes:
-  - message: Bows now fit in Exosuit slot.
+  - message: Bullets now pass over mobs that are lying down unless directly clicked
+      on while shooting.
     type: Tweak
-  id: 6480
-  time: '2024-04-28T08:23:28.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27433
-- author: osjarw
+  id: 6674
+  time: '2024-06-03T13:04:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28072
+- author: AJCM-git
   changes:
-  - message: Fixed some anomaly behaviours pulsing at wrong rates.
+  - message: Ninja stealth mode, stealth boxes and everything with stealth won't show
+      up in equipment HUDs like the medical or security HUD anymore.
     type: Fix
-  id: 6481
-  time: '2024-04-28T09:28:16.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27435
-- author: Ubaser
+  id: 6675
+  time: '2024-06-03T16:12:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28270
+- author: TheShuEd
   changes:
-  - message: Pyrotton can now be mutated from cotton.
+  - message: Added italian and cowboy accents
     type: Add
-  id: 6482
-  time: '2024-04-28T11:07:37.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27200
-- author: Plykiya
+  - message: Now you can't choose all the accents at once.
+    type: Fix
+  id: 6676
+  time: '2024-06-03T18:47:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28046
+- author: RenQ
   changes:
-  - message: You can now pick up Smile and put them in your bag.
+  - message: The moths now have their own "death grasp"
     type: Add
-  id: 6483
-  time: '2024-04-29T02:44:54.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27458
-- author: Beck Thompson, CoffeePoweredPHD
-  changes:
-  - message: Fixed infinite reagent duplication glitch with toilets and drains.
-    type: Fix
-  - message: Dirty water toilets now function correctly as toilets.
-    type: Fix
-  id: 6484
-  time: '2024-04-29T03:08:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27446
-- author: Nopey
+  id: 6677
+  time: '2024-06-03T18:48:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28409
+- author: lzk228
   changes:
-  - message: Many more items can now be recycled, including mops, medkits, and stun
-      batons.
+  - message: Borgs ID now will be shown in LogProbe instead of Unknown.
     type: Tweak
-  id: 6485
-  time: '2024-04-29T03:36:11.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/24435
-- author: Hanzdegloker
+  id: 6678
+  time: '2024-06-03T18:48:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27788
+- author: FairlySadPanda
   changes:
-  - message: '"Denied" and "Approved" stamps are now guaranteed to appear in the lockers
-      of the HoP and QM.'
+  - message: Stacking multiple deflecting items at once has been removed; now only
+      your best item is used.
     type: Tweak
-  id: 6486
-  time: '2024-04-29T03:38:45.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25604
-- author: Potato1234_x
-  changes:
-  - message: Added rainbow weed. It is obtained by mutating regular weed.
-    type: Add
-  id: 6487
-  time: '2024-04-29T04:06:27.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25759
-- author: Gotimanga
-  changes:
-  - message: Chemists can now create opporozidone, which reverses the effects of rotting
-      in deceased patients while in cryo.
-    type: Add
-  id: 6488
-  time: '2024-04-29T04:13:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/24074
-- author: Mangohydra
+  id: 6679
+  time: '2024-06-04T13:26:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28539
+- author: moonheart08
   changes:
-  - message: Added a new syndicate cyborg module that contains a very dangerous explosive
-      as a 4tc purchase.
-    type: Add
-  id: 6489
-  time: '2024-04-29T04:16:04.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25815
-- author: Morb0
+  - message: AME power output is no longer super-buffed. Larger stations will now
+      require multiple engines to stay powered.
+    type: Tweak
+  id: 6680
+  time: '2024-06-04T15:59:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28419
+- author: blueDev2
   changes:
-  - message: Added emote panel (by default Y)
-    type: Add
-  id: 6490
-  time: '2024-04-29T04:38:23.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26702
-- author: MilenVolf
+  - message: Fixed microwave recipes that use stacked materials
+    type: Fix
+  id: 6681
+  time: '2024-06-04T17:12:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28225
+- author: Tayrtahn
   changes:
-  - message: Borgs now have brand new voice and walking sounds.
-    type: Add
-  - message: Syndicate assault borgs now have new feature to scare - manic laugher.
+  - message: Mops and rags now show the liquids they soak up.
     type: Add
-  id: 6491
-  time: '2024-04-29T04:38:31.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27205
-- author: KrasnoshchekovPavel
-  changes:
-  - message: Fixed formatting of floating point numbers during localization
-    type: Fix
-  id: 6492
-  time: '2024-04-29T04:52:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27441
-- author: mirrorcult
+  id: 6682
+  time: '2024-06-04T18:48:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28590
+- author: Boaz1111
   changes:
-  - message: Random events should now occur much more frequently
+  - message: Revamped Cluster's Head Offices
     type: Tweak
-  id: 6493
-  time: '2024-04-29T06:38:15.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27469
+  id: 6683
+  time: '2024-06-05T17:50:38.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28627
 - author: Plykiya
   changes:
-  - message: Latejoin players now have a chance to roll thief.
-    type: Add
-  id: 6494
-  time: '2024-04-29T06:38:38.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27466
-- author: ElectroJr
+  - message: Handcuff range is buffed to one tile of distance.
+    type: Tweak
+  id: 6684
+  time: '2024-06-05T20:14:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28576
+- author: Cojoke-dot
   changes:
-  - message: Fixed actions sometimes disappearing from the hotbar when double clicking
-    type: Fix
-  id: 6495
-  time: '2024-04-29T08:36:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27468
-- author: DrSmugleaf
+  - message: A variety of objects around the station now need to be clicked on in
+      order for bullets to hit them.
+    type: Tweak
+  id: 6685
+  time: '2024-06-05T20:47:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28571
+- author: ps3moira
   changes:
-  - message: Fixed bullets not going exactly where you click when moving.
+  - message: Lit cigars inhand sprites are now visible.
     type: Fix
-  id: 6496
-  time: '2024-04-29T13:12:30.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27484
-- author: FungiFellow
+  id: 6686
+  time: '2024-06-05T21:16:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28641
+- author: Tayrtahn
   changes:
-  - message: Syndi-Cats now have a Wideswing, 80% Explosion Resist, 6/6/15 Pierce/Slash/Structural
-      and step over glass shards with trained feline agility.
+  - message: Slimes, diona, and kudzu are less dramatically affected by having certain
+      chemicals splashed on them.
     type: Tweak
-  id: 6497
-  time: '2024-04-29T17:09:30.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27408
-- author: ShadowCommander
-  changes:
-  - message: Fixed microwave construction not creating a microwave on completion.
-    type: Fix
-  id: 6498
-  time: '2024-04-30T00:19:08.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27500
-- author: lzk228
+  id: 6687
+  time: '2024-06-05T22:08:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28591
+- author: Plykiya
   changes:
-  - message: Barozine is removed from hydroponics mutatuions.
-    type: Remove
-  id: 6499
-  time: '2024-04-30T03:01:38.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27512
-- author: DogZeroX
+  - message: Internals are no longer toggled off if you take your helmet off but still
+      have a gas mask on and vice versa.
+    type: Tweak
+  id: 6688
+  time: '2024-06-06T07:01:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28595
+- author: Cojoke-dot
   changes:
-  - message: Changed the announcement of the immovable rod event.
+  - message: Bots now have Insulation and NoSlip
     type: Tweak
-  id: 6500
-  time: '2024-04-30T04:05:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27515
-- author: DogZeroX
+  id: 6689
+  time: '2024-06-06T09:32:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28621
+- author: Flareguy
   changes:
-  - message: Flares looped sound no longer have a massive range, and are much quieter.
-    type: Fix
-  id: 6501
-  time: '2024-04-30T06:49:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27521
-- author: ERORR404V1
+  - message: Nerfed the explosive power of fuel tanks.
+    type: Tweak
+  id: 6690
+  time: '2024-06-06T10:08:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28650
+- author: ElectroJr
   changes:
-  - message: Added chameleon projector in thief toolbox!
+  - message: The job/antag preferences window now has some buttons that link to relevant
+      guidebook entries
     type: Add
-  id: 6502
-  time: '2024-04-30T12:14:06.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27491
-- author: DamnFeds
+  id: 6691
+  time: '2024-06-06T12:05:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28614
+- author: Aeshus
   changes:
-  - message: honkbot now uses a happy honk meal instead of box of hugs and clown's
-      rubber stamp. Honk!
-    type: Tweak
-  id: 6503
-  time: '2024-05-01T03:27:21.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27535
-- author: Plykiya
+  - message: Space Law gives security exception for syndicate communication equipment.
+    type: Fix
+  id: 6692
+  time: '2024-06-06T19:24:13.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28668
+- author: Dutch-VanDerLinde
   changes:
-  - message: Inserting telecrystals no longer announces to everyone around you that
-      you inserted it.
-    type: Tweak
-  id: 6504
-  time: '2024-05-01T15:17:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27585
-- author: Dezzzix
+  - message: Fixed janitors not spawning with a survival box in their bag
+    type: Fix
+  id: 6693
+  time: '2024-06-06T22:26:13.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28669
+- author: blueDev2
   changes:
-  - message: Goldschlager empty bottle renamed to Gildlager empty bottle
+  - message: Rebalanced medicated suture and regen mesh to only require 1 brute pack/ointment
+      respectively
     type: Tweak
-  id: 6505
-  time: '2024-05-01T15:24:05.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27581
-- author: FungiFellow
+  id: 6694
+  time: '2024-06-07T01:24:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28679
+- author: AJCM-git
   changes:
-  - message: Grilles now take Structural Damage
-    type: Tweak
-  id: 6506
-  time: '2024-05-01T22:23:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27596
-- author: lzk228
+  - message: Guidebook no longer lists every single rule
+    type: Fix
+  id: 6695
+  time: '2024-06-07T11:28:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28680
+- author: Plykiya
   changes:
-  - message: Immovable rod announce now happens at the end of event.
-    type: Tweak
-  id: 6507
-  time: '2024-05-01T22:26:22.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27587
-- author: metalgearsloth
+  - message: You can now place construction ghosts without getting blocked by things
+      like grilles or windows.
+    type: Fix
+  id: 6696
+  time: '2024-06-08T00:57:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28706
+- author: Lyndomen
   changes:
-  - message: Fix server performance dropping significantly.
+  - message: Space Dragons will drop bodies upon being gibbed/butchered
     type: Fix
-  id: 6508
-  time: '2024-05-02T00:18:38.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27528
+  id: 6697
+  time: '2024-06-08T05:49:42.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28709
 - author: metalgearsloth
   changes:
-  - message: Fix muzzle flash rotations.
-    type: Fix
-  - message: Fix large client performance drop.
+  - message: Fix some loadout groups not getting validated properly.
     type: Fix
-  id: 6509
-  time: '2024-05-02T02:40:07.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27533
+  id: 6698
+  time: '2024-06-08T10:03:54.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28731
 - author: ElectroJr
   changes:
-  - message: Fix gas analyzers not opening their UI when used in-hand.
+  - message: Fixed RGB lights & eswords sometimes not working and showing up as black.
     type: Fix
-  id: 6510
-  time: '2024-05-02T06:00:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27610
-- author: Plykiya
-  changes:
-  - message: Disarming a player now causes them to throw the disarmed item away from
-      them.
-    type: Tweak
-  id: 6511
-  time: '2024-05-02T12:32:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27589
-- author: fujiwaranao
+  id: 6699
+  time: '2024-06-08T10:27:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28741
+- author: Whisper, DrSmugleaf
   changes:
-  - message: Renault now has additional fox noises.
+  - message: Players can now add ' to their character names. Please ensure your character
+      names still follow server naming conventions.
     type: Add
-  id: 6512
-  time: '2024-05-02T12:35:11.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27578
-- author: Doc-Michael
-  changes:
-  - message: CMO's Lab coat is now more resistant to chemical spills and minor cuts
-    type: Tweak
-  id: 6513
-  time: '2024-05-02T12:37:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27551
-- author: Vasilis
-  changes:
-  - message: Removed airtight flaps from the construction menu.
-    type: Remove
-  id: 6514
-  time: '2024-05-02T14:49:54.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27619
-- author: Lamrr
+  id: 6700
+  time: '2024-06-08T10:37:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28652
+- author: EmoGarbage404
   changes:
-  - message: Wine and beer bottles can now be inserted into the booze dispenser.
+  - message: Fixed singularity decay being underpowered, leading to continuous growth
+      on higher PA strengths.
     type: Fix
-  id: 6515
-  time: '2024-05-02T16:17:36.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27626
-- author: deltanedas
-  changes:
-  - message: "Ducky slippers now make you waddle. \U0001F986\U0001F986"
-    type: Tweak
-  id: 6516
-  time: '2024-05-02T17:09:38.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27628
-- author: ElectroJr
+  id: 6701
+  time: '2024-06-08T14:36:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28743
+- author: metalgearsloth
   changes:
-  - message: Fixed various interactions not prioritizing opening a UI. No more trying
-      to eat mission critical faxes.
+  - message: Fix sometimes spawning without bags.
     type: Fix
-  id: 6517
-  time: '2024-05-02T23:37:21.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27631
-- author: Plykiya
+  id: 6702
+  time: '2024-06-08T18:48:09.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28734
+- author: UBlueberry
   changes:
-  - message: Blast grenades have had their manufacturing cost tripled.
-    type: Tweak
-  - message: Blast grenades are now part of the Basic Shuttle Armament research and
-      can be printed at the secfab.
+  - message: The guidebook has been heavily reorganized to improve convenience for
+      all types of users.
     type: Tweak
-  id: 6518
-  time: '2024-05-03T00:03:52.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27580
-- author: Vasilis, Dutch-VanDerLinde
+  id: 6703
+  time: '2024-06-08T23:00:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28603
+- author: Psychpsyo
   changes:
-  - message: A new event has been added, syndicate sleeper agents, which raises the
-      alert level and selects 1-2 players to be traitors rarely throughout the round.
+  - message: New lobby background art!
     type: Add
-  id: 6519
-  time: '2024-05-03T00:13:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27501
-- author: Errant
+  id: 6704
+  time: '2024-06-08T23:29:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28724
+- author: AJCM-git
   changes:
-  - message: Space Ninjas now automatically turn their internals on when they spawn.
+  - message: When people with less than an hour playing join the game, the guidebook
+      is automatically opened for them.
     type: Tweak
-  id: 6520
-  time: '2024-05-03T01:24:22.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25083
-- author: Hanzdegloker
+  id: 6705
+  time: '2024-06-09T16:26:48.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28774
+- author: Aeshus
   changes:
-  - message: Added 6 new energy drink based mixed drinks.
-    type: Add
-  - message: Added Red Bool energy drink back to the soda dispenser and gave it a
-      new canned sprite.
+  - message: Salvage has a comprehensive guide.
     type: Add
-  id: 6521
-  time: '2024-05-03T06:57:37.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27597
-- author: DuskyJay
-  changes:
-  - message: Allowed EMP implants to be used while stunned or cuffed.
-    type: Tweak
-  id: 6522
-  time: '2024-05-03T07:51:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27644
-- author: Just-a-Unity-Dev
-  changes:
-  - message: Fixed Geras not having their speed buff.
-    type: Fix
-  - message: Geras are no longer immune to other AI mobs.
-    type: Fix
-  - message: Slimes can no longer morph into a Geras when zombified.
-    type: Fix
-  - message: Lowered the Geras death threshold.
+  - message: Cargo's guide is up-to-date.
     type: Tweak
-  id: 6523
-  time: '2024-05-03T17:26:09.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27308
-- author: nikthechampiongr
+  id: 6706
+  time: '2024-06-09T18:28:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28775
+- author: Zonespace27
   changes:
-  - message: Ninjas will no longer be pointed to random wreckage in space.
+  - message: Fixed a typo under the "Cargonia" header in the glossary.
     type: Fix
-  id: 6524
-  time: '2024-05-03T20:23:43.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27552
-- author: Dutch-VanDerLinde
+  id: 6707
+  time: '2024-06-10T13:19:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28818
+- author: EmoGarbage404
   changes:
-  - message: Fixed nuclear operatives, zombies, and head revolutionary round end summaries
-      not showing.
+  - message: Fixed drinks page not having a search bar.
     type: Fix
-  id: 6525
-  time: '2024-05-04T00:03:52.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27654
-- author: TheShuEd
-  changes:
-  - message: Added Train station!
-    type: Add
-  id: 6526
-  time: '2024-05-04T11:10:08.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27534
-- author: TheShuEd
-  changes:
-  - message: "Added Pathological Liar trait accent. The accent has a 15% chance of\
-      \ inverting your message to the opposite. Replacing \u201CYes\u201D with \u201C\
-      No\u201D, \u201CCan\u201D with \u201Ccan't\u201D and so on."
-    type: Add
-  id: 6527
-  time: '2024-05-04T11:11:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27618
-- author: Tyzemol
+  id: 6708
+  time: '2024-06-10T13:20:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28815
+- author: Aquif
   changes:
-  - message: Fixed NPCs being able to see and attack you hiding in closed lockers
-      and crates
+  - message: It is now possible to save after chaining you job unavailable preference.
     type: Fix
-  id: 6528
-  time: '2024-05-04T19:57:59.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27677
-- author: Blackern5000
-  changes:
-  - message: Security belts can now hold more items that security commonly uses.
-    type: Tweak
-  id: 6529
-  time: '2024-05-04T20:00:22.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27674
-- author: Blackern5000
-  changes:
-  - message: Floodlights now use medium power cells instead of small ones.
-    type: Tweak
-  id: 6530
-  time: '2024-05-04T20:06:16.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27672
+  id: 6709
+  time: '2024-06-11T02:48:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28839
 - author: lzk228
   changes:
-  - message: Grey whistle added to arcade machine prizes.
-    type: Add
-  id: 6531
-  time: '2024-05-05T14:42:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27676
-- author: Killerqu00
-  changes:
-  - message: Welding masks can now be put on utility belts.
+  - message: Added reward info in cargo bounty label.
     type: Tweak
-  id: 6532
-  time: '2024-05-05T23:30:06.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27694
-- author: Dutch-VanDerLinde
+  id: 6710
+  time: '2024-06-11T09:33:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28853
+- author: Tayrtahn
   changes:
-  - message: Chemical analysis goggles now show the scanned solution's temperature.
-    type: Tweak
-  id: 6533
-  time: '2024-05-05T23:32:44.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27693
-- author: Allen
+  - message: Announcements for the location of the evac shuttle, the armed nuke, and
+      more will no longer send you in the opposite direction.
+    type: Fix
+  id: 6711
+  time: '2024-06-11T22:18:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28869
+- author: Boaz1111
   changes:
-  - message: Added new icons for the emote wheel
-    type: Add
-  id: 6534
-  time: '2024-05-06T01:12:30.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27541
-- author: DogZeroX
+  - message: Refactors Cluster's Armoury
+    type: Tweak
+  id: 6712
+  time: '2024-06-12T01:07:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28854
+- author: Deserty0
   changes:
-  - message: 'Added a new salvage song: Deadline by Bolgarich'
-    type: Add
-  id: 6535
-  time: '2024-05-06T03:51:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27707
-- author: '0x6273'
+  - message: '"no materials loaded" messege now appears in lathes!'
+    type: Fix
+  id: 6713
+  time: '2024-06-12T10:32:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28885
+- author: robertGN
   changes:
-  - message: Shuttle docks now have a "dock status" device link port
-    type: Add
-  id: 6536
-  time: '2024-05-06T03:59:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27646
-- author: DogZeroX
+  - message: Syndicate communications consoles can no longer recall the emergency
+      shuttle.
+    type: Fix
+  id: 6714
+  time: '2024-06-12T13:32:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28803
+- author: deltanedas
   changes:
-  - message: 'Added new lobby art: Just a week away by Fern'
-    type: Add
-  id: 6537
-  time: '2024-05-06T08:17:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27717
-- author: mirrorcult
+  - message: Fixed opening the PDA UI sometimes breaking.
+    type: Fix
+  id: 6715
+  time: '2024-06-12T18:10:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28896
+- author: notafet
   changes:
-  - message: Event weights have been tweaked across the board, and some events removed
-      (such as false alarm) to hopefully allow for a more interesting and varied slate
-      of random occurrences per round.
-    type: Add
-  id: 6538
-  time: '2024-05-06T10:10:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27721
-- author: mirrorcult
+  - message: The singularity is now safe to operate up to PA level 3.
+    type: Fix
+  id: 6716
+  time: '2024-06-12T22:56:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28906
+- author: stalengd
   changes:
-  - message: Tile weighting for many events and variation rules (messes, dragons,
-      revenants, kudzu, gasleak, rods, etc) has been fixed. They will now no longer
-      spawn disproportionately often on smaller grids.
-    type: Add
-  id: 6539
-  time: '2024-05-06T11:25:11.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27724
-- author: Blackern5000
+  - message: Players can now correctly toggle internals on pets.
+    type: Fix
+  id: 6717
+  time: '2024-06-13T02:17:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28904
+- author: Cojoke-dot
   changes:
-  - message: Burn damage is now half as effective at cauterizing wounds as it was
-      previously
+  - message: Tranquilizer Shotguns shells now have a unique sprite
     type: Tweak
-  id: 6540
-  time: '2024-05-06T20:19:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27726
-- author: Blackern5000
-  changes:
-  - message: Active lights now deal significantly less burn damage when touched.
+  - message: You now print boxes of Tranquilizer Boxes rather than a single shell
     type: Tweak
-  id: 6541
-  time: '2024-05-06T20:20:19.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27728
-- author: pissdemon
+  id: 6718
+  time: '2024-06-13T02:17:35.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28903
+- author: Plykiya
   changes:
-  - message: Special ghost roles are now raffled, instead of being given out to the
-      first player requesting them.
-    type: Add
-  id: 6542
-  time: '2024-05-07T01:48:16.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26629
-- author: mirrorcult
+  - message: Gauze continues to heal even when you stop someone's bleeding.
+    type: Fix
+  id: 6719
+  time: '2024-06-13T02:19:10.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28844
+- author: Doomsdrayk
   changes:
-  - message: Less ratkings should spawn during the mouse migration event now
-    type: Tweak
-  id: 6543
-  time: '2024-05-07T03:23:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27760
-- author: PJB3005
+  - message: Fixed guns appearing to cycle their bolt when wielded.
+    type: Fix
+  id: 6720
+  time: '2024-06-13T06:30:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28756
+- author: Doomsdrayk
   changes:
-  - message: Fixed preferences not loading sometimes if you had a loadout item with
-      playtime requirement selected in a character profile.
+  - message: The Drozd and C-20r do not unwield on use again.
     type: Fix
-  id: 6544
-  time: '2024-05-07T04:21:03.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27742
-- author: lzk228
+  id: 6721
+  time: '2024-06-13T18:10:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28728
+- author: EmoGarbage404
   changes:
-  - message: Morgue now can be anchored and unanchored.
-    type: Tweak
-  - message: Changed morgue's collision layer, so items now can go through it.
-    type: Tweak
-  id: 6545
-  time: '2024-05-07T07:26:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27750
-- author: mirrorcult
+  - message: Fixed constructed items rotating strangely.
+    type: Fix
+  id: 6722
+  time: '2024-06-13T18:21:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28427
+- author: lzk228
   changes:
-  - message: Events that run now get logged to admin alert chat
+  - message: Added order quantity to cargo invoice label.
     type: Tweak
-  id: 6546
-  time: '2024-05-07T15:13:29.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27761
-- author: cooldolphin
+  id: 6723
+  time: '2024-06-13T18:36:38.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28821
+- author: osjarw
   changes:
-  - message: Cigarettes in the loadout menu.
+  - message: Added context menu action for scanning artifacts.
     type: Add
-  id: 6547
-  time: '2024-05-07T15:55:03.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27292
-- author: FairlySadPanda
-  changes:
-  - message: Weapons that deflect shots, like the e-sword, now are most effective
-      at doing so when standing still, with moving or sprinting making the deflection
-      chance worse.
-    type: Tweak
-  id: 6548
-  time: '2024-05-07T18:14:59.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27219
-- author: deltanedas
+  id: 6724
+  time: '2024-06-14T02:01:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26873
+- author: Cojoke-dot
   changes:
-  - message: Lathes can now be sped up by using Space Lube.
+  - message: Lasers now pass over things unless clicked like projectiles
     type: Tweak
-  id: 6549
-  time: '2024-05-07T18:20:44.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25515
-- author: OnsenCapy
+  id: 6725
+  time: '2024-06-14T02:04:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28768
+- author: Boaz1111
   changes:
-  - message: Combat gloves now have their own unique sprite.
-    type: Tweak
-  - message: Combat gloves now have heat resistance to match their fireproof description.
+  - message: The PKA can now mine rocks in one hit again.
     type: Tweak
-  id: 6550
-  time: '2024-05-08T00:19:55.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27373
-- author: deltanedas
+  id: 6726
+  time: '2024-06-14T02:40:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27476
+- author: KyuPolaris
   changes:
-  - message: Dragons can now breathe fire.
+  - message: Chickens now make a clucking sound when they speak.
     type: Add
-  id: 6551
-  time: '2024-05-08T00:25:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26746
-- author: Cojoke-dot
+  id: 6727
+  time: '2024-06-14T02:43:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28948
+- author: Killerqu00
   changes:
-  - message: You can now shoot over racks
+  - message: Time between uncuff attempts is now 30 seconds instead of 6.
     type: Tweak
-  id: 6552
-  time: '2024-05-08T06:46:04.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27797
-- author: ShadowCommander
-  changes:
-  - message: Lizards now stop tail pulling when they are downed.
-    type: Fix
-  id: 6553
-  time: '2024-05-08T06:49:28.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27796
-- author: Plykiya
+  id: 6728
+  time: '2024-06-14T06:19:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28095
+- author: Moomoobeef
   changes:
-  - message: Re-added supplybots.
+  - message: Fax machines can now be purchased at cargo, for when you need more paper
+      pushing on your station!
     type: Add
-  id: 6554
-  time: '2024-05-08T07:30:04.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27769
-- author: Hobbitmax
-  changes:
-  - message: Replaced Syndicate Jaws Of Life with a Pyjama bundle on the Train map.
-    type: Tweak
-  id: 6555
-  time: '2024-05-08T07:30:53.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27734
-- author: Plykiya
+  id: 6729
+  time: '2024-06-14T06:24:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28968
+- author: Zonespace27
   changes:
-  - message: The ninja's katana dash is now more reliable.
+  - message: Non-uplink PDAs can no longer have telecrystals inserted into them.
     type: Fix
-  id: 6556
-  time: '2024-05-08T10:21:59.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27793
-- author: K-Dynamic
+  id: 6730
+  time: '2024-06-14T15:24:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28985
+- author: Aquif
   changes:
-  - message: Bike Horns, Suspenders and the Clown Recorder are now available from
-      the Theatrical Performances Crate
+  - message: '"Space Drugs" have been renamed to "Space Mirage"'
+    type: Tweak
+  - message: '"Stimulants" have been renamed to "Hyperzine"'
     type: Tweak
-  id: 6557
-  time: '2024-05-08T12:30:43.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27668
-- author: Riolume
+  id: 6731
+  time: '2024-06-14T16:53:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28989
+- author: PJB3005
   changes:
-  - message: Added ability to drink from spray bottles
+  - message: Added pride month.
     type: Add
-  - message: Can now see the amount of liquid in spray bottles
+  - message: Made the nuke gay.
     type: Add
-  id: 6558
-  time: '2024-05-09T05:56:13.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27815
-- author: Blackern5000
+  id: 6732
+  time: '2024-06-14T17:22:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28992
+- author: Aeshus
   changes:
-  - message: Atmos metal pipes now deal blunt damage.
-    type: Add
-  id: 6559
-  time: '2024-05-09T06:00:48.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27673
-- author: Plykiya
+  - message: Loadouts now display all requirements.
+    type: Fix
+  id: 6733
+  time: '2024-06-14T20:32:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28994
+- author: Vermidia
   changes:
-  - message: The emagged protolathe can now print truncheons and the new T3 portable
-      recharger.
-    type: Add
-  - message: The emagged circuit printer can now print ship guns.
-    type: Add
-  - message: Autolathe emagged recipes that are research gated have been moved over
-      to the protolathe.
+  - message: allies callable by radio in the uplink now have unique icons
     type: Tweak
-  id: 6560
-  time: '2024-05-09T06:03:45.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27575
-- author: deltanedas
-  changes:
-  - message: Ninja can now hack criminal records consoles to make everyone wanted.
-    type: Add
-  id: 6561
-  time: '2024-05-09T06:35:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/24982
-- author: deltanedas
+  id: 6734
+  time: '2024-06-14T21:44:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28954
+- author: K-Dynamic
   changes:
-  - message: Added the robotics console for remotely looking at, disabling or destroying
-      cyborgs!
+  - message: Added witch robes and witch hat to the AutoDrobe.
     type: Add
-  id: 6562
-  time: '2024-05-09T06:36:07.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/24855
-- author: Killerqu00
+  id: 6735
+  time: '2024-06-15T02:19:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28965
+- author: Plykiya
   changes:
-  - message: Revolutionaries can now cuff command members in order to seize control
-      of the station.
+  - message: You can no longer insert duplicates of the same module into a cyborg.
     type: Tweak
-  id: 6563
-  time: '2024-05-09T06:48:32.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27627
-- author: vorkathbruh
+  id: 6736
+  time: '2024-06-15T02:58:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28943
+- author: Vermidia
   changes:
-  - message: Nuclear operative agents now require time in Chemistry rather than time
-      in the Medical department.
+  - message: Nukie planet now has an improved Donk co. microwave, which cooks twice
+      as fast but is more likely to explode. It can't handle id cards without exploding.
+    type: Add
+  - message: Made microwave explosions destroy the machine board and spit out the
+      machine parts.
     type: Tweak
-  id: 6564
-  time: '2024-05-09T06:48:53.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27098
-- author: deltanedas
+  id: 6737
+  time: '2024-06-15T03:00:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28951
+- author: robertGN
   changes:
-  - message: Firesuits and hardsuits now protect your skin from fire, you will instead
-      die of heatstroke.
-    type: Tweak
-  id: 6565
-  time: '2024-05-09T07:12:48.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27161
-- author: Dutch-VanDerLinde
-  changes:
-  - message: Fixed non-inital infected getting the succumb to zombie action.
+  - message: Using a welder on vending machines now correctly repairs the vending
+      machine.
     type: Fix
-  id: 6566
-  time: '2024-05-09T21:45:23.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27820
-- author: Hanzdegloker
+  id: 6738
+  time: '2024-06-15T03:13:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28920
+- author: Brandon-Huu
+  changes:
+  - message: Removed the six Handheld GPS devices from the syndicate deathrattle implant
+      box.
+    type: Remove
+  id: 6739
+  time: '2024-06-15T03:23:42.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28999
+- author: EmoGarbage404
   changes:
-  - message: Added CMO turtleneck jumpsuit/jumpskirt.
+  - message: Revamped meteors. Meteors now crash through several walls before exploding.
+      They can still come in a weaker "space dust" form where they don't break through
+      structures.
     type: Add
-  - message: Added a head mirror which may spawn in medical doctor's lockers
+  - message: Meteor and space dust events now occur on regular intervals during a
+      round rather than being tied to station events. Expect to see more of them during
+      a round.
     type: Add
-  id: 6567
-  time: '2024-05-09T21:53:55.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26153
-- author: PrPleGoo
-  changes:
-  - message: The crafted medsec hud now displays health icons too.
-    type: Tweak
-  - message: The health status icon now goes on the left for all types of med HUD.
-    type: Tweak
-  id: 6568
-  time: '2024-05-10T01:35:29.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27483
-- author: Moomoobeef
+  id: 6740
+  time: '2024-06-15T03:38:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28974
+- author: EmoGarbage404
   changes:
-  - message: CentCom has now started hiring crew who are short-sighted.
+  - message: Added Moon Boots! This science research item allows you to move like
+      you're in zero-gravity.
     type: Add
-  id: 6569
-  time: '2024-05-10T01:40:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26037
-- author: whateverusername0
+  id: 6741
+  time: '2024-06-15T03:43:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29009
+- author: EmoGarbage404
   changes:
-  - message: Traitors now know their employers.
+  - message: Attempting to uncuff oneself while being pulled will now take twice as
+      long.
     type: Tweak
-  id: 6570
-  time: '2024-05-10T02:01:02.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27855
-- author: Boaz1111
+  - message: Reduced cooldown after attempting to uncuff oneself back to previous
+      values.
+    type: Tweak
+  id: 6742
+  time: '2024-06-15T04:01:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29008
+- author: EmoGarbage404
   changes:
-  - message: Loneops now has a functioning ghost role raffle.
+  - message: Fixed bottles, when used inhand, not being drank from but instead repeatedly
+      opening and closing.
     type: Fix
-  id: 6571
-  time: '2024-05-10T02:01:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27841
-- author: Boaz1111
+  id: 6743
+  time: '2024-06-15T05:20:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29010
+- author: Flareguy
   changes:
-  - message: You can now actually spawn as a reporter on Oasis
+  - message: Replaced RelayStation with a more fair ruin.
+    type: Remove
+  id: 6744
+  time: '2024-06-15T06:02:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28971
+- author: metalgearsloth
+  changes:
+  - message: Fix the character profile sometimes thinking there's changes to save
+      even if the loadouts haven't changed.
     type: Fix
-  - message: Oasis now has roundstart sec radios instead of handheld radios mapped
-      in sec, det now has a criminal records computer on box
-    type: Tweak
-  id: 6572
-  time: '2024-05-10T02:15:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27564
-- author: notquitehadouken
+  id: 6745
+  time: '2024-06-15T06:52:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28737
+- author: EmoGarbage404
   changes:
-  - message: You can now only use suit storage with hardsuits, softsuits, and armor
-      instead of all outer clothing
-    type: Tweak
-  id: 6573
-  time: '2024-05-10T02:19:08.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27546
-- author: aspiringLich
+  - message: Fixed borgs and other non-humans getting deleted by salvage magnet wrecks
+      disappearing.
+    type: Fix
+  id: 6746
+  time: '2024-06-15T13:19:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29006
+- author: ShadowCommander
   changes:
-  - message: The Chemical, Booze, and Soda Dispensers now have updated UIs.
+  - message: Added a red light to firelocks when their warning lights are active.
     type: Add
-  id: 6574
-  time: '2024-05-10T02:37:04.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27831
-- author: Jajsha
-  changes:
-  - message: Emagged cyborgs no longer reveal that they have been emagged by simply
-      examining their internals.
+  - message: Firelocks no longer require power to show warning lights.
     type: Tweak
-  id: 6575
-  time: '2024-05-10T02:57:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27816
-- author: RiceMar
+  id: 6747
+  time: '2024-06-15T15:17:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29024
+- author: Ian321
   changes:
-  - message: Larger guns are now wieldable and suffer an inaccuracy when not wielded.
+  - message: Donk co. microwaves now have their own machine board.
+    type: Fix
+  id: 6748
+  time: '2024-06-15T15:44:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29037
+- author: BombasterDS
+  changes:
+  - message: Added craftable mannequin that you can hang clothing on!
     type: Add
-  id: 6576
-  time: '2024-05-10T02:58:15.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26970
-- author: Doctor-Cpu
+  id: 6749
+  time: '2024-06-15T17:50:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29004
+- author: notafet
   changes:
-  - message: Atlas has been reworked.
+  - message: The TEG must now be operated at higher temperatures to generate power.
     type: Tweak
-  id: 6577
-  time: '2024-05-10T08:12:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27702
-- author: TheShuEd
-  changes:
-  - message: 'New events added to the game: Random ships with new ghost roles can
-      now come to the station.'
-    type: Add
-  id: 6578
-  time: '2024-05-10T11:35:59.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/24490
-- author: MisterMecky
+  id: 6750
+  time: '2024-06-15T21:05:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29050
+- author: lzk228
   changes:
-  - message: Fland kitchen freezer now starts off cold
+  - message: Fixed ability for mime to not choose any mask.
     type: Fix
-  id: 6579
-  time: '2024-05-10T15:57:21.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27532
-- author: youtissoum
-  changes:
-  - message: Spiders can now wideswing.
-    type: Tweak
-  - message: Slimes can now wideswing.
-    type: Tweak
-  id: 6580
-  time: '2024-05-10T23:49:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27856
-- author: Dutch-VanDerLinde
+  id: 6751
+  time: '2024-06-15T21:32:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29056
+- author: FunTust
   changes:
-  - message: Fix firesuits, ninja suits, and some armor not allowing suit storage.
+  - message: Fixed hair disappearing when hats are tucked away in a pocket.
     type: Fix
-  id: 6581
-  time: '2024-05-11T02:20:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27897
-- author: ike709
+  id: 6752
+  time: '2024-06-15T21:42:13.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28949
+- author: Cojoke-dot
   changes:
-  - message: UIs can now link to a Guidebook entry via a help button in the top right
-      corner.
-    type: Add
-  - message: Added the help button to the reagent dispenser UI.
+  - message: You can now find Jackboots in the security load-outs
     type: Add
-  id: 6582
-  time: '2024-05-11T02:21:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27891
-- author: Vasilis
+  - message: The Sec drobe no longer has a Cowboy hat or boots
+    type: Remove
+  id: 6753
+  time: '2024-06-15T22:38:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29018
+- author: Keer-Sar
   changes:
-  - message: NPC's activly being controlled by a player wont return to their AI behevior
-      if the player disconnects.
+  - message: Fixed a spelling error in the cargo bounty for lungs.
     type: Fix
-  id: 6583
-  time: '2024-05-11T15:01:29.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27651
-- author: ShadowCommander
+  id: 6754
+  time: '2024-06-16T00:24:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29064
+- author: Keer-Sar
   changes:
-  - message: Fixed screen freeze in some cases when getting gibbed or butchered.
+  - message: Non-humanoids' names are now capitalized when inserting materials into
+      machines.
     type: Fix
-  id: 6584
-  time: '2024-05-11T15:03:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27617
-- author: DrSmugleaf
+  id: 6755
+  time: '2024-06-16T02:06:12.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29071
+- author: EmoGarbage404
   changes:
-  - message: Bullets no longer hit mobs that are in crit, unless they are directly
-      clicked on while shooting.
+  - message: Magboots no longer work when off-grid.
+    type: Fix
+  id: 6756
+  time: '2024-06-16T03:38:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29034
+- author: deltanedas
+  changes:
+  - message: Tarantulas now use Mechanotoxin, a venom that slows you down over time.
     type: Tweak
-  id: 6585
-  time: '2024-05-11T15:42:11.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27905
-- author: metalgearsloth
+  id: 6757
+  time: '2024-06-16T11:26:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29066
+- author: Cojoke-dot
   changes:
-  - message: Add a reset button to character setup.
-    type: Add
-  - message: Actually get the import / export character buttons working.
+  - message: Musicians can now select instruments in their loadout
     type: Add
-  - message: Fix performance drop in the eye color picker.
-    type: Fix
-  - message: Fix instances where role timers don't load properly in character setup.
-    type: Fix
-  id: 6586
-  time: '2024-05-11T23:18:21.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27576
-- author: nikthechampiongr
+  id: 6758
+  time: '2024-06-16T11:27:35.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29059
+- author: ElectroJr
   changes:
-  - message: Fixed records consoles sometimes failing to show crew records.
+  - message: Fixed pianos, office chairs & other objects not rotating while being
+      pulled.
     type: Fix
-  id: 6587
-  time: '2024-05-12T15:07:54.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27883
-- author: ShadowCommander
+  id: 6759
+  time: '2024-06-16T11:30:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29032
+- author: deltanedas
   changes:
-  - message: Fixed cyborg laws window and other UIs breaking when the built in light
-      was on.
-    type: Fix
-  id: 6588
-  time: '2024-05-12T22:14:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27956
-- author: mirrorcult
-  changes:
-  - message: The open slot storage keybinds (V, shift+V) now close the window if it's
-      already opened
-    type: Tweak
-  id: 6589
-  time: '2024-05-13T00:03:07.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27962
-- author: lzk228
-  changes:
-  - message: Fixed color jumpskirts female mask.
-    type: Fix
-  id: 6590
-  time: '2024-05-13T19:25:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27984
-- author: aspiringLich
-  changes:
-  - message: Tweaked the Chemical, Booze, and Soda Dispenser UIs to aid readability.
-    type: Tweak
-  id: 6591
-  time: '2024-05-13T21:46:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27958
-- author: deltanedas
-  changes:
-  - message: Fixed fire spreading being insane.
-    type: Fix
-  id: 6592
-  time: '2024-05-13T21:49:44.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27986
-- author: DrSmugleaf
-  changes:
-  - message: Failing to fire a gun that requires wielding will no longer delay the
-      next shot.
-    type: Tweak
-  id: 6593
-  time: '2024-05-14T04:53:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27973
-- author: lzk228
-  changes:
-  - message: Grill and hotplate can be anchored on the table.
-    type: Fix
-  id: 6594
-  time: '2024-05-14T23:57:23.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28026
-- author: ShadowCommander
-  changes:
-  - message: Fixed salvage magnet UI opening multiple times when activated.
-    type: Fix
-  id: 6595
-  time: '2024-05-14T23:59:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28010
-- author: Vermidia
+  - message: Added the Carp Hardsuit to the uplink which is spaceproof and makes carp
+      think you are one of them.
+    type: Add
+  id: 6760
+  time: '2024-06-16T11:57:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25155
+- author: Futuristic
   changes:
-  - message: Shuttle roles get PDAs and headsets now
-    type: Fix
-  id: 6596
-  time: '2024-05-15T10:30:54.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28045
-- author: EdenTheLiznerd
+  - message: RandomSentience event was removed
+    type: Remove
+  id: 6761
+  time: '2024-06-16T23:24:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28982
+- author: notafet
   changes:
-  - message: Removed the throngler from the grand lottery
+  - message: Adjust TEG power generation levels.
     type: Tweak
-  id: 6597
-  time: '2024-05-15T21:02:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28060
-- author: deltanedas
-  changes:
-  - message: Fixed ninja criminal records hack not changing sechud icons.
-    type: Fix
-  id: 6598
-  time: '2024-05-16T20:51:06.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28021
-- author: EmoGarbage404
-  changes:
-  - message: Fixed a bug that would cause items in your inventory to get stuck to
-      your cursor.
-    type: Fix
-  id: 6599
-  time: '2024-05-17T07:51:28.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27960
-- author: lzk228
-  changes:
-  - message: Fixed bug with pathological liar and zombie accents.
-    type: Fix
-  id: 6600
-  time: '2024-05-17T16:33:22.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28049
-- author: YuNii
+  id: 6762
+  time: '2024-06-17T01:13:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29112
+- author: Cojoke-dot, AJCM-git
   changes:
-  - message: Added the ability to re-bind the emote menu.
+  - message: You can now flip your eyepatches to the other eye! Yarrrrr!
     type: Add
-  id: 6601
-  time: '2024-05-17T19:46:45.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28083
-- author: benjamin-burges
+  id: 6763
+  time: '2024-06-17T03:21:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26277
+- author: deltanedas
   changes:
-  - message: Bible summon messages are now only visible to the chaplain using the
-      Bible.
+  - message: Borgs now have a 10 second beeping timer that paralyzes them when being
+      exploded with the robotics console and a 5 second delay when being disabled
+      with it.
     type: Tweak
-  id: 6602
-  time: '2024-05-18T14:23:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28104
-- author: Aquif
-  changes:
-  - message: Changing your character's description now properly updates the save button.
-    type: Fix
-  - message: The character description editor does not discard your last edit anymore.
-    type: Fix
-  id: 6603
-  time: '2024-05-19T00:23:45.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28122
-- author: DrSmugleaf
+  id: 6764
+  time: '2024-06-17T03:30:10.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27876
+- author: EmoGarbage404
   changes:
-  - message: Attempting to dual wield something will now automatically drop the item
-      in your other hand.
+  - message: Changed meteor swarm spawning to be less clumped up and favor hitting
+      multiple areas more.
     type: Tweak
-  id: 6604
-  time: '2024-05-19T01:35:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27975
-- author: SHOTbyGUN
+  id: 6765
+  time: '2024-06-17T05:20:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29057
+- author: Ubaser
   changes:
-  - message: White cane recipe for MedFab
+  - message: Added new reptilian horns, "Demonic".
     type: Add
-  id: 6605
-  time: '2024-05-19T22:22:45.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28146
-- author: EmoGarbage404
+  id: 6766
+  time: '2024-06-17T10:53:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29022
+- author: Tayrtahn
   changes:
-  - message: Mirrors work again.
+  - message: Chemical jugs no longer spawn with two labels.
     type: Fix
-  id: 6606
-  time: '2024-05-19T22:35:55.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28084
-- author: PolterTzi
-  changes:
-  - message: The guidebook now lists the effects reagents have on plants.
-    type: Add
-  id: 6607
-  time: '2024-05-19T23:01:44.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28038
+  id: 6767
+  time: '2024-06-17T23:09:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29137
 - author: Tayrtahn
   changes:
-  - message: The popup for someone pointing at you is now slightly larger than normal
-      popups.
-    type: Tweak
-  id: 6608
-  time: '2024-05-20T13:32:25.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28152
-- author: Tayrtahn
+  - message: Mice and hamsters inside chef's hats can now steer the hat's wearer.
+    type: Add
+  id: 6768
+  time: '2024-06-18T10:59:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25950
+- author: metalgearsloth
   changes:
-  - message: '"Warp to most followed" ghost option no longer includes admins and non-ghost
-      followers.'
+  - message: Fix conveyors mispredicting movement.
     type: Fix
-  id: 6609
-  time: '2024-05-20T14:12:05.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28120
-- author: Killerqu00
-  changes:
-  - message: Sleeper Agents only appear once per round.
-    type: Tweak
-  id: 6610
-  time: '2024-05-21T10:16:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28160
-- author: TheShuEd
+  id: 6769
+  time: '2024-06-18T12:11:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28157
+- author: lzk228
   changes:
-  - message: Artifact portal lifespan reduced from 120 seconds to 1 second
-    type: Tweak
-  id: 6611
-  time: '2024-05-22T07:52:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28200
-- author: nikthechampiongr
+  - message: Warning cones added to the Engivend.
+    type: Add
+  id: 6770
+  time: '2024-06-18T14:02:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29085
+- author: Errant
   changes:
-  - message: Firelocks can now be pried by hand.
-    type: Tweak
-  - message: Firelocks will now not automatically close for 2 seconds after you pry
-      them open.
+  - message: The strip interface layout of arachnids is now consistent with other
+      species.
     type: Tweak
-  - message: Firelocks are now properly predicted.
-    type: Fix
-  id: 6612
-  time: '2024-05-22T11:16:20.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26582
-- author: blueDev2
-  changes:
-  - message: Watermelon slices are now considered fruit
-    type: Fix
-  id: 6613
-  time: '2024-05-23T20:27:45.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28226
-- author: ElectroJr
-  changes:
-  - message: Ghosts can once again open paper & other UIs
-    type: Fix
-  id: 6614
-  time: '2024-05-24T05:03:03.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27999
-- author: nikthechampiongr
-  changes:
-  - message: Firelocks will no longer randomly pulse closing lights.
-    type: Fix
-  id: 6615
-  time: '2024-05-24T14:44:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28227
-- author: ElectroJr
-  changes:
-  - message: Fixed modular grenade visuals getting stuck in an incorrect state.
-    type: Fix
-  id: 6616
-  time: '2024-05-25T20:03:05.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28265
-- author: deltanedas
-  changes:
-  - message: Fixed ID Cards not updating the manifest when changed.
-    type: Fix
-  id: 6617
-  time: '2024-05-25T20:08:16.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28237
-- author: TheShuEd
+  id: 6771
+  time: '2024-06-18T14:10:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29165
+- author: IProduceWidgets
   changes:
-  - message: 'Killer tomatoes got a small health and damage buff: 24 -> 35 hp and
-      4->9 brute damage'
-    type: Tweak
-  - message: Killer tomatoes now die after 5 minutes of their existence
-    type: Tweak
-  - message: Killer tomatoes can now be profitably sold.
+  - message: Foam Force rifle to cargo lottery!
     type: Add
-  id: 6618
-  time: '2024-05-25T20:18:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28173
+  - message: Foam darts now stick to things they hit!
+    type: Tweak
+  id: 6772
+  time: '2024-06-18T15:04:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29103
 - author: metalgearsloth
   changes:
-  - message: Fix water shader getting stuck on sometimes.
+  - message: Fix lathe materials sometimes flickering.
     type: Fix
-  id: 6619
-  time: '2024-05-25T20:23:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28130
-- author: Errant
-  changes:
-  - message: Changing hands while wielding an item will now immediately unwield it.
-    type: Tweak
-  id: 6620
-  time: '2024-05-26T01:17:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28161
-- author: ElectroJr
+  id: 6773
+  time: '2024-06-18T21:47:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29167
+- author: osjarw
   changes:
-  - message: Fixed being unable to interact with items via storage UIs
+  - message: Fix air alarms not alarming air.
     type: Fix
-  id: 6621
-  time: '2024-05-26T02:11:37.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28291
+  id: 6774
+  time: '2024-06-19T00:20:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29172
 - author: EmoGarbage404
   changes:
-  - message: Properly fix magic mirrors
-    type: Fix
-  id: 6622
-  time: '2024-05-26T04:46:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28282
-- author: deltanedas
-  changes:
-  - message: Fixed being picked for antag roles while in the lobby or not opted in.
-    type: Fix
-  id: 6623
-  time: '2024-05-26T05:14:29.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28197
-- author: Dutch-VanDerLinde
-  changes:
-  - message: Fix hypodarts not injecting into people with outerclothing equipped.
-    type: Fix
-  id: 6624
-  time: '2024-05-26T14:48:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28301
-- author: metalgearsloth
+  - message: Slightly decreased meteor frequency.
+    type: Tweak
+  id: 6775
+  time: '2024-06-19T01:57:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29194
+- author: Flareguy
   changes:
-  - message: Selectively revert pulling throwing for the short-term.
+  - message: Resprited most of Security's basic attire.
     type: Tweak
-  id: 6625
-  time: '2024-05-27T00:11:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28126
-- author: EmoGarbage404
+  id: 6776
+  time: '2024-06-19T02:04:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29082
+- author: Beck Thompson, UbaserB
   changes:
-  - message: Multiple pipes facing the same direction can no longer be placed on the
-      same tile. You can still have overlapping straight pipes or corners going in
-      opposite directions.
-    type: Fix
-  id: 6626
-  time: '2024-05-27T22:37:27.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28308
-- author: Emisse
+  - message: Added some happier messages for the medibot!
+    type: Add
+  id: 6777
+  time: '2024-06-19T02:28:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29147
+- author: HolySSSS
   changes:
-  - message: Derotate Train temporarily
+  - message: Short Raffle is now much shorter.
     type: Tweak
-  id: 6627
-  time: '2024-05-27T22:40:00.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28328
-- author: EmoGarbage404
+  id: 6778
+  time: '2024-06-19T02:41:42.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28685
+- author: Truoizys
   changes:
-  - message: Fixed not enough antags being selected for gamemodes.
+  - message: PDA cartridges can no longer be installed more than once.
     type: Fix
-  id: 6628
-  time: '2024-05-27T22:43:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28327
-- author: EmoGarbage404
+  id: 6779
+  time: '2024-06-19T13:21:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29187
+- author: Just_Art
   changes:
-  - message: Removed the fire-fighting remote.
-    type: Remove
-  id: 6629
-  time: '2024-05-28T00:04:32.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28330
-- author: slarticodefast
+  - message: Musician's jumpskirt added to loadouts.
+    type: Add
+  id: 6780
+  time: '2024-06-19T14:06:03.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29203
+- author: Flareguy
   changes:
-  - message: Corrected some cargo bounties.
-    type: Fix
-  id: 6630
-  time: '2024-05-28T00:51:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28255
-- author: Repo
+  - message: Made the HOS's cap look significantly better.
+    type: Tweak
+  id: 6781
+  time: '2024-06-19T14:49:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29208
+- author: Flareguy
   changes:
-  - message: NanoMed, wall vends will spawn items the correct direction.
-    type: Fix
-  id: 6631
-  time: '2024-05-28T14:02:15.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28279
-- author: ShadowCommander
+  - message: Emergency Toolboxes now have a different fill that contains more utility
+      items then before.
+    type: Tweak
+  - message: Added the pocket fire extinguisher. You can currently only find them
+      in the emergency toolbox.
+    type: Add
+  id: 6782
+  time: '2024-06-19T18:13:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29202
+- author: lzk228
   changes:
-  - message: Added pressure and temperature warnings to firelock examine text.
+  - message: Warning cone and wet floor sign recipes added to the autolathe.
     type: Add
-  id: 6632
-  time: '2024-05-28T14:59:13.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28341
-- author: deltanedas
+  id: 6783
+  time: '2024-06-19T18:13:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29205
+- author: arimah
   changes:
-  - message: Nukies will have ghost roles opened if not enough people can be picked.
+  - message: Containment field generators can no longer be powered by an emitter bolt
+      flying past them. The bolt must hit them directly.
+    type: Fix
+  id: 6784
+  time: '2024-06-19T23:51:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29225
+- author: Dutch-VanDerLinde
+  changes:
+  - message: Lizard frills and moth antenna are now hidden by hardsuit helmets.
     type: Tweak
-  id: 6633
-  time: '2024-05-28T15:35:08.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28316
-- author: WarMechanic
+  id: 6785
+  time: '2024-06-20T00:09:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29214
+- author: metalgearsloth
   changes:
-  - message: Guns will now cycle when interacting with them in-hand after wielding.
+  - message: Fix entities getting stuck red after getting hit.
+    type: Fix
+  id: 6786
+  time: '2024-06-20T07:15:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28981
+- author: Dutch-VanDerLinde
+  changes:
+  - message: Syndicate sleeper agents are now opt-in. You can opt-in with the antagonist
+      preferences menu.
     type: Tweak
-  id: 6634
-  time: '2024-05-28T18:17:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28002
+  - message: ERT are no longer able to become sleeper agents.
+    type: Fix
+  id: 6787
+  time: '2024-06-20T11:12:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27817
+- author: neutrino-laser
+  changes:
+  - message: Syndicate smokes pack now has 10 cigarettes as intended.
+    type: Fix
+  id: 6788
+  time: '2024-06-20T11:16:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28371
 - author: lzk228
   changes:
-  - message: Gasp and deathgasp emotes now have a sound.
+  - message: Cube boxes buffed 6 -> 8 cubes.
     type: Tweak
-  id: 6635
-  time: '2024-05-28T23:56:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27736
-- author: Cojoke-dot
+  id: 6789
+  time: '2024-06-20T11:58:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29251
+- author: Boaz1111
   changes:
-  - message: The syndicate Medical and Sabatour borgs now come with medical and diagnostics
-      HUDs  respectively.
+  - message: Explosive technology has been moved to T1 arsenal
     type: Tweak
-  id: 6636
-  time: '2024-05-29T00:16:43.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27875
-- author: ShadowCommander
+  id: 6790
+  time: '2024-06-20T12:22:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29227
+- author: Redfire1331
   changes:
-  - message: Popups with the same message now stack together and append a x# to the
-      end.
+  - message: You can now eat cup ramen with chopsticks.
     type: Tweak
-  id: 6637
-  time: '2024-05-29T04:05:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27978
-- author: notafet
+  id: 6791
+  time: '2024-06-20T12:34:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27826
+- author: Errant
   changes:
-  - message: Slightly increase spacing speed to fix under-pressure lockout.
+  - message: Slimepeople crewmembers now spawn with survival boxes that contain emergency
+      nitrogen tanks.
     type: Tweak
-  - message: Fix vent under-pressure lockout.
-    type: Fix
-  id: 6638
-  time: '2024-05-29T05:21:48.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28370
-- author: lzk228
+  id: 6792
+  time: '2024-06-20T14:05:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29131
+- author: PJB3005
   changes:
-  - message: Salvage access has been replaced with Cargo for the artifact container.
+  - message: You can now pry multiple tiles at once.
     type: Tweak
-  id: 6639
-  time: '2024-05-29T16:46:23.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28386
-- author: notafet
+  id: 6793
+  time: '2024-06-20T14:05:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29231
+- author: MilenVolf
   changes:
-  - message: Fix passive gate flow rate display.
+  - message: Jaws of life, xeno and spiders now use proper prying speed that will
+      lead into a faster prying.
     type: Fix
-  id: 6640
-  time: '2024-05-30T00:34:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28372
-- author: Lamrr
+  - message: Jaws of life now pries tiles much faster.
+    type: Tweak
+  id: 6794
+  time: '2024-06-20T14:19:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29210
+- author: MilenVolf
   changes:
-  - message: Candle boxes can now only hold candles.
+  - message: Stasis bed can be toggled on or off!
     type: Tweak
-  id: 6641
-  time: '2024-05-30T04:15:31.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28314
-- author: blueDev2
+  id: 6795
+  time: '2024-06-21T03:02:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29268
+- author: slarticodefast
   changes:
-  - message: Epipens can be disposed
+  - message: Fixed initial infected status icons not showing up.
     type: Fix
-  id: 6642
-  time: '2024-05-30T04:18:07.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28317
-- author: metalgearsloth
+  - message: Added an antagonist message to the character menu for initial infected
+      and zombies.
+    type: Add
+  id: 6796
+  time: '2024-06-21T05:42:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29259
+- author: Chief_Engineer and TsjipTsjip
   changes:
-  - message: Predict opening even more interfaces.
+  - message: All ghostroles now have their role type, as defined in the rules, defined
+      in their ghostrole request box.
     type: Tweak
-  id: 6643
-  time: '2024-05-30T07:32:16.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28405
-- author: ShadowCommander
+  id: 6797
+  time: '2024-06-21T09:41:54.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29249
+- author: ElectroJr
   changes:
-  - message: Fixed firelocks with warnings enabled opening immediately for characters
-      without engineering access.
+  - message: Fixed not being able to pick up folded rollerbeds.
     type: Fix
-  id: 6644
-  time: '2024-05-30T17:25:07.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28415
-- author: moonheart08
-  changes:
-  - message: The hand teleporter can no longer create portal links between grids.
-    type: Remove
-  id: 6645
-  time: '2024-05-30T20:45:16.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28423
-- author: Ghagliiarghii
-  changes:
-  - message: Cargo Sale Computer now correctly uses its own computer board
+  - message: Fixed not being able to unbuckle entities by clicking on them.
     type: Fix
-  id: 6646
-  time: '2024-05-31T00:28:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28425
-- author: metalgearsloth
+  id: 6798
+  time: '2024-06-21T10:50:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29293
+- author: Macoron
   changes:
-  - message: Fix verb categories shuffling around.
+  - message: Fixed SSD indicator for dwarfs.
     type: Fix
-  id: 6647
-  time: '2024-05-31T01:55:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28368
-- author: ShadowCommander
-  changes:
-  - message: Tweaked the player tab column widths so that usernames and character
-      names are more visible.
-    type: Tweak
-  id: 6648
-  time: '2024-05-31T01:59:25.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28029
+  id: 6799
+  time: '2024-06-22T01:11:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29310
 - author: EmoGarbage404
   changes:
-  - message: Fixed latejoin antagonists not respecting antag preferences (for real
-      this time)
+  - message: Deconstructing a damaged AME core now yields steel instead of a full
+      AME flatpack.
+    type: Tweak
+  id: 6800
+  time: '2024-06-22T04:15:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29317
+- author: Errant
+  changes:
+  - message: Items should no longer be missing from backpacks at spawn.
     type: Fix
-  id: 6649
-  time: '2024-05-31T02:06:21.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28430
-- author: Ubaser
+  id: 6801
+  time: '2024-06-22T10:43:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29336
+- author: Donchan, marboww
   changes:
-  - message: Botanists now spawn with a plant clipper.
-    type: Tweak
-  id: 6650
-  time: '2024-05-31T07:37:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28439
-- author: Ubaser
+  - message: New Nuke Detonation Song "Sound Station 14"
+    type: Add
+  id: 6802
+  time: '2024-06-22T15:09:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29345
+- author: deltanedas
   changes:
-  - message: Janitors now spawn with a light replacer.
+  - message: Doors access logging can now be disabled by snipping or pulsing a LOG
+      wire.
     type: Tweak
-  id: 6651
-  time: '2024-05-31T08:44:21.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28441
-- author: NazrinNya
-  changes:
-  - message: Disposal pipes are now blocked from constructing underneath impassable
-      objects.
-    type: Fix
-  id: 6652
-  time: '2024-05-31T14:49:00.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28447
-- author: ShadowCommander
+  id: 6803
+  time: '2024-06-22T15:12:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29094
+- author: notafet
   changes:
-  - message: Opening a firelock when temperature or pressure warnings are active,
-      now always shows the warning popup.
+  - message: Reduce air alarm sensitivity to plasma, tritium, and carbon dioxide.
     type: Tweak
-  id: 6653
-  time: '2024-05-31T14:56:21.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28420
-- author: ElectroJr
+  id: 6804
+  time: '2024-06-22T15:22:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29331
+- author: Damn Feds
   changes:
-  - message: Hugging a player no longer briefly opens the mugging UI
-    type: Fix
-  id: 6654
-  time: '2024-05-31T17:25:03.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28432
-- author: aspiringLich
+  - message: thief toolbox kits now better describe contents
+    type: Tweak
+  id: 6805
+  time: '2024-06-22T15:44:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27771
+- author: lzk228
   changes:
-  - message: Some chemicals have been made more colorful and child-friendly.
+  - message: Prying reinforced tile now will give you back metal rod
     type: Tweak
-  id: 6655
-  time: '2024-05-31T19:44:23.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28367
-- author: Vermidia
+  id: 6806
+  time: '2024-06-22T15:47:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29084
+- author: nikthechampiongr
   changes:
-  - message: Many more ghost roles have a random appearance, including ERT and shuttle
-      roles.
+  - message: Locked firelocks can no longer be pried by hand when powered.
     type: Tweak
-  id: 6656
-  time: '2024-06-01T04:51:07.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27997
+  id: 6807
+  time: '2024-06-22T17:49:50.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29221
+- author: Floofi
+  changes:
+  - message: Added lemon juice to the Boozemat!
+    type: Add
+  id: 6808
+  time: '2024-06-22T23:46:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27465
 - author: Cojoke-dot
   changes:
-  - message: Medical Borgs now have medical huds
+  - message: You can now put hats on Medibots
     type: Add
-  id: 6657
-  time: '2024-06-01T04:54:24.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28391
-- author: beck-thompson
+  id: 6809
+  time: '2024-06-23T00:28:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28584
+- author: WarMechanic
   changes:
-  - message: You can now remove evidence from containers using the verb menu.
-    type: Fix
-  id: 6658
-  time: '2024-06-01T04:58:07.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28101
-- author: notafet
+  - message: The TEG now powers itself once started.
+    type: Tweak
+  id: 6810
+  time: '2024-06-23T01:46:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29072
+- author: eoineoineoin
   changes:
-  - message: Increase power output from Tesla coils.
+  - message: Hand labelers can now apply labels to buttons, switches, and levers
     type: Tweak
-  id: 6659
-  time: '2024-06-01T05:51:16.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28424
-- author: Beck Thompson
+  id: 6811
+  time: '2024-06-23T14:52:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29378
+- author: Tayrtahn
   changes:
-  - message: ID computer will now select passenger as the default id icon instead
-      of atmospheric technician.
+  - message: Jugs in the ChemVend are labeled again.
     type: Fix
-  id: 6660
-  time: '2024-06-01T17:29:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28462
-- author: AJCM-git
+  id: 6812
+  time: '2024-06-23T17:31:34.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29178
+- author: DrEnzyme
   changes:
-  - message: Machine parts are now stackable
+  - message: Add bagels and poppy seed bagels.
+    type: Add
+  id: 6813
+  time: '2024-06-23T19:33:12.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24799
+- author: PJB3005
+  changes:
+  - message: Ghosts can now examine details on objects from any range.
     type: Tweak
-  id: 6661
-  time: '2024-06-01T17:49:28.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28434
-- author: DrSmugleaf
+  id: 6814
+  time: '2024-06-24T15:36:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29404
+- author: Emisse
   changes:
-  - message: Disabled the seeing rainbows screen effect when reduced motion is enabled
-      in the options menu.
+  - message: atmos, elite syndie, and deathsquad hardsuits are now the only fireproof
+      suits
     type: Tweak
-  id: 6662
-  time: '2024-06-02T01:41:06.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28496
-- author: Cojoke-dot
+  id: 6815
+  time: '2024-06-24T22:03:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29416
+- author: Bhijn and Myr
   changes:
-  - message: Lasers now pass through Glass External Airlocks and Glass Shuttle Airlocks
+  - message: The colors of the LEDs on the heater and freezer thermomachines has been
+      changed from red/green (respectively) to orange/cyan (respectively). In laymen's
+      terms, this makes thermomachines far more reasonably differentiable for those
+      with colorblindness.
+    type: Tweak
+  id: 6816
+  time: '2024-06-24T22:40:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29397
+- author: Elysium206
+  changes:
+  - message: Increased Security Riot shields durability significantly and makes actively
+      blocking better
+    type: Tweak
+  id: 6817
+  time: '2024-06-25T03:56:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29239
+- author: Tayrtahn
+  changes:
+  - message: Fixed space ninja's starting with their internals disabled.
     type: Fix
-  id: 6663
-  time: '2024-06-02T04:13:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28065
-- author: slarticodefast
+  id: 6818
+  time: '2024-06-25T06:28:48.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29213
+- author: PJB3005
   changes:
-  - message: Fixed the flash effect getting darker with each appearence.
+  - message: Low pressure damage now does only 1/4th as much damage. This is a band-aid
+      until better mechanics exists for the crew to deal with breaches of various
+      kinds.
+    type: Remove
+  id: 6819
+  time: '2024-06-26T00:48:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29478
+- author: lzk228
+  changes:
+  - message: Blood now has less satiation.
+    type: Tweak
+  id: 6820
+  time: '2024-06-26T02:27:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29433
+- author: Veritable-Calamity
+  changes:
+  - message: Moldy food can now be collected in the Janitors' trash bags.
     type: Fix
-  - message: Fixed short-sightedness making you immune to flashes.
+  id: 6821
+  time: '2024-06-26T03:26:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29380
+- author: Plykiya
+  changes:
+  - message: You can now interact with magic mirrors.
     type: Fix
-  id: 6664
-  time: '2024-06-02T04:17:53.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27369
-- author: AJCM-git
+  id: 6822
+  time: '2024-06-26T14:25:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29491
+- author: Doomsdrayk
   changes:
-  - message: Midround antags work again
+  - message: Disposal units no longer protect their contents from nuclear explosions.
     type: Fix
-  id: 6665
-  time: '2024-06-02T16:52:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28523
-- author: Errant-4
+  id: 6823
+  time: '2024-06-26T14:25:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29438
+- author: Tayrtahn
   changes:
-  - message: Map labels no longer suddenly disappear for the rest of the round.
+  - message: Pills and pill canisters no longer have two labels.
     type: Fix
-  id: 6666
-  time: '2024-06-02T17:30:27.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28518
-- author: Whisper
+  id: 6824
+  time: '2024-06-27T02:08:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29499
+- author: PJB3005
+  changes:
+  - message: You can no longer place items onto tabletop games. The feature could
+      be easily abused to crash the server.
+    type: Remove
+  id: 6825
+  time: '2024-06-27T14:57:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29513
+- author: KonstantinAngelov
   changes:
-  - message: Renamed the player-obtainable "admin cloak" to "weh cloak".
+  - message: Chef's Cookbook has a more IC name.
     type: Tweak
-  id: 6667
-  time: '2024-06-03T02:18:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28540
-- author: Vermidia
+  id: 6826
+  time: '2024-06-27T15:11:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29467
+- author: metalgearsloth
   changes:
-  - message: Glass shards are no longer weldable with an unlit welder.
-    type: Fix
-  id: 6668
-  time: '2024-06-03T03:28:53.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27959
-- author: AJCM-git
+  - message: Ushanka no longer applies an accent to your name.
+    type: Tweak
+  id: 6827
+  time: '2024-06-28T00:08:09.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29524
+- author: JIPDawg
   changes:
-  - message: Biomass reclaimers no longer act as a void to any unfortunate belongings
-      a corpse may be wearing
+  - message: Changed the sound of pulling back the foam crossbow from the sound of
+      a Flash to just pulling back a bow.
     type: Tweak
-  id: 6669
-  time: '2024-06-03T03:30:00.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28544
-- author: Laneron
+  id: 6828
+  time: '2024-06-28T00:23:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29508
+- author: Plykiya
   changes:
-  - message: Jetpack UI window now has correctly displayed header
-    type: Fix
-  id: 6670
-  time: '2024-06-03T03:33:31.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28545
-- author: Vermidia
+  - message: Do-after bars performed inside containers are hidden from view.
+    type: Add
+  id: 6829
+  time: '2024-06-28T03:34:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29487
+- author: slarticodefast
   changes:
-  - message: SyndiCats now spawn from a radio like other reinforcements.
-    type: Tweak
-  id: 6671
-  time: '2024-06-03T11:54:32.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28492
-- author: Cojoke-dot
+  - message: Passive vents now have the correct sprite.
+    type: Fix
+  id: 6830
+  time: '2024-06-28T12:33:03.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29536
+- author: Plykiya
   changes:
-  - message: Medibots will now occasionally talk
-    type: Tweak
-  id: 6672
-  time: '2024-06-03T12:05:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28543
-- author: Cojoke-dot
+  - message: Icons in the chameleon menu now appear correctly.
+    type: Fix
+  id: 6831
+  time: '2024-06-28T21:21:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29539
+- author: DogZeroX
   changes:
-  - message: The player can now use the gasping emote
-    type: Tweak
-  id: 6673
-  time: '2024-06-03T12:10:25.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28466
-- author: Cojoke-dot
+  - message: Bananium no longer emit rads
+    type: Remove
+  id: 6832
+  time: '2024-06-28T23:28:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29545
+- author: TokenStyle
   changes:
-  - message: Bullets no longer hit crates unless directly clicked on while shooting.
-    type: Tweak
-  - message: Bullets now pass over mobs that are lying down unless directly clicked
-      on while shooting.
+  - message: Mechs can now be destroyed!
     type: Tweak
-  id: 6674
-  time: '2024-06-03T13:04:07.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28072
-- author: AJCM-git
+  id: 6833
+  time: '2024-06-29T03:28:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29338
+- author: metalgearsloth
   changes:
-  - message: Ninja stealth mode, stealth boxes and everything with stealth won't show
-      up in equipment HUDs like the medical or security HUD anymore.
+  - message: Typing indicators are now predicted.
     type: Fix
-  id: 6675
-  time: '2024-06-03T16:12:21.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28270
-- author: TheShuEd
+  id: 6834
+  time: '2024-06-29T03:33:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29551
+- author: Arteben
   changes:
-  - message: Added italian and cowboy accents
+  - message: Added favorite tab for construction!
     type: Add
-  - message: Now you can't choose all the accents at once.
-    type: Fix
-  id: 6676
-  time: '2024-06-03T18:47:06.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28046
-- author: RenQ
+  id: 6835
+  time: '2024-06-29T04:10:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26347
+- author: deltanedas
   changes:
-  - message: The moths now have their own "death grasp"
+  - message: Traitors can now be assigned to deconstruct the station's nuke for its
+      precious plutonium core.
     type: Add
-  id: 6677
-  time: '2024-06-03T18:48:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28409
-- author: lzk228
+  - message: Added the Objectives category in the uplink with a Core Extraction Toolbox
+      for deconstructing said nuke.
+    type: Add
+  id: 6836
+  time: '2024-06-29T04:11:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26786
+- author: slarticodefast
   changes:
-  - message: Borgs ID now will be shown in LogProbe instead of Unknown.
-    type: Tweak
-  id: 6678
-  time: '2024-06-03T18:48:44.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27788
-- author: FairlySadPanda
+  - message: Air vents now have yellow lights if they are in under-pressure lockout.
+    type: Add
+  id: 6837
+  time: '2024-06-29T05:02:48.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29527
+- author: metalgearsloth
   changes:
-  - message: Stacking multiple deflecting items at once has been removed; now only
-      your best item is used.
-    type: Tweak
-  id: 6679
-  time: '2024-06-04T13:26:20.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28539
-- author: moonheart08
+  - message: Fix character traits not being validated.
+    type: Fix
+  id: 6838
+  time: '2024-06-29T05:39:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28730
+- author: PJB3005
   changes:
-  - message: AME power output is no longer super-buffed. Larger stations will now
-      require multiple engines to stay powered.
+  - message: '"Steal plutonium core" traitor objective has been reverted.'
+    type: Remove
+  id: 6839
+  time: '2024-06-29T15:23:03.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29578
+- author: MureixloL
+  changes:
+  - message: Changed some vending machine point lights to match the vendors better.
     type: Tweak
-  id: 6680
-  time: '2024-06-04T15:59:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28419
-- author: blueDev2
+  id: 6840
+  time: '2024-06-30T03:46:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29590
+- author: metalgearsloth
   changes:
-  - message: Fixed microwave recipes that use stacked materials
+  - message: Fix trait categories not respecting unlimited points.
     type: Fix
-  id: 6681
-  time: '2024-06-04T17:12:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28225
-- author: Tayrtahn
+  id: 6841
+  time: '2024-06-30T04:28:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29600
+- author: ShadowCommander
   changes:
-  - message: Mops and rags now show the liquids they soak up.
-    type: Add
-  id: 6682
-  time: '2024-06-04T18:48:24.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28590
-- author: Boaz1111
+  - message: Fixed sprite layers disappearing when inserting or removing an item on
+      entities such as belts, janitor trolley, clipboard, etc.
+    type: Fix
+  id: 6842
+  time: '2024-06-30T04:34:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29461
+- author: Plykiya
   changes:
-  - message: Revamped Cluster's Head Offices
+  - message: Syndicate traitor reinforcements price has been changed from 16 TC to
+      14 TC.
     type: Tweak
-  id: 6683
-  time: '2024-06-05T17:50:38.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28627
+  - message: Nuclear ops reinforcements price has been changed from 16 TC to 35 TC.
+    type: Tweak
+  id: 6843
+  time: '2024-06-30T12:28:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29557
 - author: Plykiya
   changes:
-  - message: Handcuff range is buffed to one tile of distance.
+  - message: Skeletons are now immune to flashes.
+    type: Add
+  id: 6844
+  time: '2024-06-30T13:42:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29604
+- author: Plykiya
+  changes:
+  - message: The lock on emagged borgs no longer breaks, preventing unauthorized access
+      and emag checking.
     type: Tweak
-  id: 6684
-  time: '2024-06-05T20:14:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28576
-- author: Cojoke-dot
+  id: 6845
+  time: '2024-06-30T13:46:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29605
+- author: metalgearsloth
   changes:
-  - message: A variety of objects around the station now need to be clicked on in
-      order for bullets to hit them.
+  - message: Accentless speech now costs 2 trait points.
     type: Tweak
-  id: 6685
-  time: '2024-06-05T20:47:28.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28571
-- author: ps3moira
+  id: 6846
+  time: '2024-06-30T13:47:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29603
+- author: deltanedas
   changes:
-  - message: Lit cigars inhand sprites are now visible.
+  - message: Fixed sleeper agents not showing up in the round end summary.
     type: Fix
-  id: 6686
-  time: '2024-06-05T21:16:32.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28641
-- author: Tayrtahn
+  id: 6847
+  time: '2024-06-30T13:51:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29468
+- author: EmoGarbage404
+  changes:
+  - message: The design on the bar sign can now be changed via a menu.
+    type: Add
+  id: 6848
+  time: '2024-06-30T16:20:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29068
+- author: Hmeister
   changes:
-  - message: Slimes, diona, and kudzu are less dramatically affected by having certain
-      chemicals splashed on them.
+  - message: The CE hardsuit is now fireproof again.
     type: Tweak
-  id: 6687
-  time: '2024-06-05T22:08:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28591
-- author: Plykiya
+  id: 6849
+  time: '2024-06-30T17:56:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29516
+- author: EmoGarbage404
   changes:
-  - message: Internals are no longer toggled off if you take your helmet off but still
-      have a gas mask on and vice versa.
-    type: Tweak
-  id: 6688
-  time: '2024-06-06T07:01:45.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28595
+  - message: Blurry vision no longer causes names to momentarily appear as "???" when
+      examining.
+    type: Remove
+  id: 6850
+  time: '2024-07-01T03:06:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29633
 - author: Cojoke-dot
   changes:
-  - message: Bots now have Insulation and NoSlip
-    type: Tweak
-  id: 6689
-  time: '2024-06-06T09:32:37.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28621
-- author: Flareguy
-  changes:
-  - message: Nerfed the explosive power of fuel tanks.
+  - message: Items that slow down a person when held now slow down when dragged too.
     type: Tweak
-  id: 6690
-  time: '2024-06-06T10:08:25.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28650
-- author: ElectroJr
+  id: 6851
+  time: '2024-07-01T05:33:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29364
+- author: metalgearsloth
   changes:
-  - message: The job/antag preferences window now has some buttons that link to relevant
-      guidebook entries
+  - message: Add effects for when shuttles are arriving.
     type: Add
-  id: 6691
-  time: '2024-06-06T12:05:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28614
-- author: Aeshus
+  id: 6852
+  time: '2024-07-01T06:11:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29402
+- author: Plykiya
   changes:
-  - message: Space Law gives security exception for syndicate communication equipment.
+  - message: Gravity wells, like the supermatter grenade, now function properly again.
     type: Fix
-  id: 6692
-  time: '2024-06-06T19:24:13.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28668
-- author: Dutch-VanDerLinde
+  id: 6853
+  time: '2024-07-01T15:39:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29617
+- author: joelsgp
   changes:
-  - message: Fixed janitors not spawning with a survival box in their bag
+  - message: Fixed login tips
     type: Fix
-  id: 6693
-  time: '2024-06-06T22:26:13.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28669
-- author: blueDev2
+  id: 6854
+  time: '2024-07-01T16:27:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29640
+- author: Cojoke-dot
   changes:
-  - message: Rebalanced medicated suture and regen mesh to only require 1 brute pack/ointment
-      respectively
+  - message: Flares can now light Cigarettes and other similar things
     type: Tweak
-  id: 6694
-  time: '2024-06-07T01:24:08.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28679
-- author: AJCM-git
+  - message: Flares now are no longer hot after burning out
+    type: Tweak
+  id: 6855
+  time: '2024-07-01T21:14:38.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29476
+- author: Tayrtahn
   changes:
-  - message: Guidebook no longer lists every single rule
+  - message: Fixed NukeOps ending prematurely in some situations where operatives
+      were still alive.
     type: Fix
-  id: 6695
-  time: '2024-06-07T11:28:55.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28680
-- author: Plykiya
+  id: 6856
+  time: '2024-07-01T22:23:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29642
+- author: Tayrtahn
   changes:
-  - message: You can now place construction ghosts without getting blocked by things
-      like grilles or windows.
+  - message: Fixed characters thrashing when speaking in beds.
     type: Fix
-  id: 6696
-  time: '2024-06-08T00:57:07.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28706
-- author: Lyndomen
+  id: 6857
+  time: '2024-07-02T03:30:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29653
+- author: slarticodefast
   changes:
-  - message: Space Dragons will drop bodies upon being gibbed/butchered
+  - message: Fixed sprite rotation in harm mode on rotated grids.
     type: Fix
-  id: 6697
-  time: '2024-06-08T05:49:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28709
-- author: metalgearsloth
+  id: 6858
+  time: '2024-07-02T13:04:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29663
+- author: lzk228
   changes:
-  - message: Fix some loadout groups not getting validated properly.
+  - message: Space Law book added to the game.
+    type: Add
+  id: 6859
+  time: '2024-07-02T13:33:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29392
+- author: Ko4erga
+  changes:
+  - message: Dropper can be placed in med belt, plant belt and chemistry bag.
+    type: Tweak
+  - message: Dropper size changed.
+    type: Tweak
+  id: 6860
+  time: '2024-07-02T15:28:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29667
+- author: Plykiya
+  changes:
+  - message: You now see pickup animations when stripping objects off of people.
     type: Fix
-  id: 6698
-  time: '2024-06-08T10:03:54.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28731
-- author: ElectroJr
+  - message: Thieving gloves no longer have a pickup animation when stripping people.
+    type: Fix
+  id: 6861
+  time: '2024-07-03T00:01:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29665
+- author: nikthechampiongr
   changes:
-  - message: Fixed RGB lights & eswords sometimes not working and showing up as black.
+  - message: The Elite Syndicate hardsuit is now slightly slower.
+    type: Tweak
+  - message: The Elite Syndicate hardsuit now costs 12 Telecrystals.
+    type: Tweak
+  id: 6862
+  time: '2024-07-03T00:31:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29429
+- author: eoineoineoin
+  changes:
+  - message: Artifact Analyzer now collides with walls
     type: Fix
-  id: 6699
-  time: '2024-06-08T10:27:21.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28741
-- author: Whisper, DrSmugleaf
+  id: 6863
+  time: '2024-07-03T05:27:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28117
+- author: TheShuEd
   changes:
-  - message: Players can now add ' to their character names. Please ensure your character
-      names still follow server naming conventions.
+  - message: anomalies have the ability to gain invisibility behavior
     type: Add
-  id: 6700
-  time: '2024-06-08T10:37:55.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28652
-- author: EmoGarbage404
+  id: 6864
+  time: '2024-07-03T15:14:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29120
+- author: ArkiveDev
   changes:
-  - message: Fixed singularity decay being underpowered, leading to continuous growth
-      on higher PA strengths.
+  - message: Railings can now be constructed in all 4 orientations.
     type: Fix
-  id: 6701
-  time: '2024-06-08T14:36:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28743
-- author: metalgearsloth
+  id: 6865
+  time: '2024-07-03T16:59:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29687
+- author: Rinary
   changes:
-  - message: Fix sometimes spawning without bags.
+  - message: Fixed radial menus overlapping where there's many icons.
     type: Fix
-  id: 6702
-  time: '2024-06-08T18:48:09.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28734
-- author: UBlueberry
+  id: 6866
+  time: '2024-07-04T01:25:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29678
+- author: Plykiya
   changes:
-  - message: The guidebook has been heavily reorganized to improve convenience for
-      all types of users.
-    type: Tweak
-  id: 6703
-  time: '2024-06-08T23:00:44.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28603
-- author: Psychpsyo
+  - message: An object's physics properly returns to normal after being pulled.
+    type: Fix
+  id: 6867
+  time: '2024-07-04T01:29:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29694
+- author: Plykiya
   changes:
-  - message: New lobby background art!
-    type: Add
-  id: 6704
-  time: '2024-06-08T23:29:51.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28724
-- author: AJCM-git
+  - message: You can now destroy portable flashers.
+    type: Fix
+  id: 6868
+  time: '2024-07-04T01:51:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29564
+- author: EmoGarbage404
   changes:
-  - message: When people with less than an hour playing join the game, the guidebook
-      is automatically opened for them.
+  - message: All nuclear operatives are now humans.
     type: Tweak
-  id: 6705
-  time: '2024-06-09T16:26:48.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28774
-- author: Aeshus
+  id: 6869
+  time: '2024-07-04T02:29:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29693
+- author: metalgearsloth
   changes:
-  - message: Salvage has a comprehensive guide.
-    type: Add
-  - message: Cargo's guide is up-to-date.
+  - message: Made vox roundstart.
     type: Tweak
-  id: 6706
-  time: '2024-06-09T18:28:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28775
-- author: Zonespace27
-  changes:
-  - message: Fixed a typo under the "Cargonia" header in the glossary.
-    type: Fix
-  id: 6707
-  time: '2024-06-10T13:19:24.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28818
-- author: EmoGarbage404
+  id: 6870
+  time: '2024-07-04T07:11:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29704
+- author: JIPDawg
   changes:
-  - message: Fixed drinks page not having a search bar.
-    type: Fix
-  id: 6708
-  time: '2024-06-10T13:20:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28815
-- author: Aquif
+  - message: Changed the basic treatment module to include a Health Analyzer and removed
+      the dropper.
+    type: Tweak
+  id: 6871
+  time: '2024-07-04T07:17:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29696
+- author: PJB3005
   changes:
-  - message: It is now possible to save after chaining you job unavailable preference.
+  - message: Fixed flashlights and similar permanently getting stuck blinking.
     type: Fix
-  id: 6709
-  time: '2024-06-11T02:48:23.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28839
-- author: lzk228
+  id: 6872
+  time: '2024-07-04T08:02:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29457
+- author: Jezithyr
   changes:
-  - message: Added reward info in cargo bounty label.
+  - message: All species except for Vox can now be played as Nukies. (Vox will be
+      enabled when load out code supports them)
     type: Tweak
-  id: 6710
-  time: '2024-06-11T09:33:36.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28853
-- author: Tayrtahn
+  id: 6873
+  time: '2024-07-05T07:59:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29707
+- author: metalgearsloth
   changes:
-  - message: Announcements for the location of the evac shuttle, the armed nuke, and
-      more will no longer send you in the opposite direction.
-    type: Fix
-  id: 6711
-  time: '2024-06-11T22:18:30.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28869
-- author: Boaz1111
+  - message: Shuttle map buttons will show up faster.
+    type: Tweak
+  id: 6874
+  time: '2024-07-06T03:51:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29757
+- author: JIPDawg
   changes:
-  - message: Refactors Cluster's Armoury
+  - message: Added Late join CryoSleepers to Origin.
     type: Tweak
-  id: 6712
-  time: '2024-06-12T01:07:37.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28854
-- author: Deserty0
+  id: 6875
+  time: '2024-07-06T17:33:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29761
+- author: Beck Thompson
   changes:
-  - message: '"no materials loaded" messege now appears in lathes!'
+  - message: Splashing reagents on players will now apply the correct amounts.
     type: Fix
-  id: 6713
-  time: '2024-06-12T10:32:11.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28885
-- author: robertGN
+  id: 6876
+  time: '2024-07-07T03:52:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29763
+- author: Tayrtahn
   changes:
-  - message: Syndicate communications consoles can no longer recall the emergency
-      shuttle.
+  - message: Dead bodies will no longer remain standing after being unbuckled from
+      chairs.
     type: Fix
-  id: 6714
-  time: '2024-06-12T13:32:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28803
-- author: deltanedas
+  id: 6877
+  time: '2024-07-07T06:20:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29741
+- author: Simyon
   changes:
-  - message: Fixed opening the PDA UI sometimes breaking.
-    type: Fix
-  id: 6715
-  time: '2024-06-12T18:10:53.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28896
-- author: notafet
+  - message: Ratkings now require at least 30 players in order to spawn.
+    type: Tweak
+  id: 6878
+  time: '2024-07-07T13:06:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29737
+- author: EmoGarbage404
   changes:
-  - message: The singularity is now safe to operate up to PA level 3.
+  - message: Intercoms now use encryption keys to determine what channels they can
+      broadcast on.
+    type: Tweak
+  - message: Intercoms and handheld radios no longer rely on telecom servers.
     type: Fix
-  id: 6716
-  time: '2024-06-12T22:56:07.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28906
-- author: stalengd
+  id: 6879
+  time: '2024-07-07T14:19:10.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29580
+- author: Vermidia
   changes:
-  - message: Players can now correctly toggle internals on pets.
-    type: Fix
-  id: 6717
-  time: '2024-06-13T02:17:07.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28904
-- author: Cojoke-dot
+  - message: Some drink reactions now require shaking with the shaker or stirring
+      with a spoon
+    type: Add
+  id: 6880
+  time: '2024-07-07T14:21:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29243
+- author: Dezzzix
   changes:
-  - message: Tranquilizer Shotguns shells now have a unique sprite
+  - message: Now you can slice food with swords
+    type: Add
+  id: 6881
+  time: '2024-07-07T14:22:38.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29005
+- author: EmoGarbage404
+  changes:
+  - message: Changed AME power output. Lower injection amounts now produce more power
+      but further injections have diminishing returns.
     type: Tweak
-  - message: You now print boxes of Tranquilizer Boxes rather than a single shell
+  - message: Increased damage per injection overclocked AMEs.
     type: Tweak
-  id: 6718
-  time: '2024-06-13T02:17:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28903
+  - message: Halved fuel per AME jar.
+    type: Tweak
+  id: 6882
+  time: '2024-07-07T14:27:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29587
 - author: Plykiya
   changes:
-  - message: Gauze continues to heal even when you stop someone's bleeding.
+  - message: Hyperzine's effective healing range has been changed from 70 to 120,
+      to anything above 70 total damage.
+    type: Tweak
+  id: 6883
+  time: '2024-07-07T14:28:13.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29712
+- author: Tayrtahn
+  changes:
+  - message: Fixed admin ghosts briefly becoming visible when a news article is published.
     type: Fix
-  id: 6719
-  time: '2024-06-13T02:19:10.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28844
-- author: Doomsdrayk
+  id: 6884
+  time: '2024-07-08T03:33:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29801
+- author: slarticodefast
+  changes:
+  - message: Improved throwing calculations. Thrown items now stop moving exactly
+      below your cursor. Throwing weapons will land at your cursor and then slide
+      until stopped by friction.
+    type: Tweak
+  id: 6885
+  time: '2024-07-08T09:03:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29726
+- author: Errant
+  changes:
+  - message: Vox now have their entry in the guidebook.
+    type: Fix
+  id: 6886
+  time: '2024-07-09T00:28:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29713
+- author: Whisper
+  changes:
+  - message: Light toggle actions now have a 1 second cooldown between uses.
+    type: Tweak
+  id: 6887
+  time: '2024-07-09T04:14:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29833
+- author: Cojoke-dot
   changes:
-  - message: Fixed guns appearing to cycle their bolt when wielded.
+  - message: Shotgun loading doafter now does something
     type: Fix
-  id: 6720
-  time: '2024-06-13T06:30:39.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28756
-- author: Doomsdrayk
+  id: 6888
+  time: '2024-07-09T04:23:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29827
+- author: slarticodefast
   changes:
-  - message: The Drozd and C-20r do not unwield on use again.
+  - message: The construction menu and building preview now show the correct passive
+      vent sprite.
     type: Fix
-  id: 6721
-  time: '2024-06-13T18:10:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28728
-- author: EmoGarbage404
+  id: 6889
+  time: '2024-07-09T13:39:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29820
+- author: Cojoke-dot
   changes:
-  - message: Fixed constructed items rotating strangely.
+  - message: Pacifists can now use foam weaponry
+    type: Tweak
+  id: 6890
+  time: '2024-07-09T13:46:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29835
+- author: Plykiya
+  changes:
+  - message: You can now drop food and drinks to stop consuming it.
     type: Fix
-  id: 6722
-  time: '2024-06-13T18:21:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28427
-- author: lzk228
+  id: 6891
+  time: '2024-07-09T23:12:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29854
+- author: Boaz1111
   changes:
-  - message: Added order quantity to cargo invoice label.
+  - message: Guitars can now be worn in the suit storage slot
+    type: Add
+  id: 6892
+  time: '2024-07-09T23:28:10.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29048
+- author: Winkarst-cpu
+  changes:
+  - message: Fixed popup spam when trying to open borg's UI while the borg is locked.
+    type: Fix
+  id: 6893
+  time: '2024-07-09T23:48:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29861
+- author: Lokachop
+  changes:
+  - message: Scarves now count as warm clothing for the warm clothing cargo bounty.
     type: Tweak
-  id: 6723
-  time: '2024-06-13T18:36:38.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28821
-- author: osjarw
+  id: 6894
+  time: '2024-07-10T05:26:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29779
+- author: Aquif
   changes:
-  - message: Added context menu action for scanning artifacts.
+  - message: It is now possible to "lock" admin faxes such that they cannot be edited
+      by cybersun pens or any other IC means.
     type: Add
-  id: 6724
-  time: '2024-06-14T02:01:32.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26873
-- author: Cojoke-dot
+  id: 6895
+  time: '2024-07-10T05:28:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28972
+- author: Ghagliiarghii
   changes:
-  - message: Lasers now pass over things unless clicked like projectiles
+  - message: The Librarian's Books Bag can now hold D&D related items such as dice
+      and battlemats.
     type: Tweak
-  id: 6725
-  time: '2024-06-14T02:04:45.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28768
-- author: Boaz1111
+  id: 6896
+  time: '2024-07-10T05:51:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29863
+- author: Beck Thompson, Tayrtahn
   changes:
-  - message: The PKA can now mine rocks in one hit again.
-    type: Tweak
-  id: 6726
-  time: '2024-06-14T02:40:23.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27476
-- author: KyuPolaris
+  - message: Typing indicators now correctly stack and will not overwrite your default
+      species indicator.
+    type: Fix
+  id: 6897
+  time: '2024-07-10T05:51:48.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29492
+- author: Winkarst-cpu
   changes:
-  - message: Chickens now make a clucking sound when they speak.
+  - message: Now confirmation popup is displayed and item panel status is updated
+      after setting a custom solution transfer volume.
+    type: Fix
+  id: 6898
+  time: '2024-07-10T10:32:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29852
+- author: Winkarst-cpu
+  changes:
+  - message: Added exit confirmation for character setup menu with unsaved changes.
     type: Add
-  id: 6727
-  time: '2024-06-14T02:43:02.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28948
-- author: Killerqu00
+  id: 6899
+  time: '2024-07-11T00:24:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29875
+- author: ShadowCommander
   changes:
-  - message: Time between uncuff attempts is now 30 seconds instead of 6.
+  - message: Players can now use melee attacks and shoves while dragging an entity
+      in their active hand.
     type: Tweak
-  id: 6728
-  time: '2024-06-14T06:19:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28095
-- author: Moomoobeef
+  id: 6900
+  time: '2024-07-11T04:48:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29703
+- author: Cojoke-dot
   changes:
-  - message: Fax machines can now be purchased at cargo, for when you need more paper
-      pushing on your station!
-    type: Add
-  id: 6729
-  time: '2024-06-14T06:24:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28968
-- author: Zonespace27
+  - message: You can no longer shoot out of crates with guns
+    type: Fix
+  id: 6901
+  time: '2024-07-11T05:14:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28961
+- author: Cojoke-dot
   changes:
-  - message: Non-uplink PDAs can no longer have telecrystals inserted into them.
+  - message: The Spray Painter can now be used to paint glass airlocks to look like
+      regular glass airlocks.
+    type: Tweak
+  id: 6902
+  time: '2024-07-11T05:33:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29869
+- author: MFMessage
+  changes:
+  - message: Picking a ghost role as an admin will now deadmin.
     type: Fix
-  id: 6730
-  time: '2024-06-14T15:24:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28985
-- author: Aquif
+  id: 6903
+  time: '2024-07-11T05:53:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29790
+- author: Winkarst-cpu
   changes:
-  - message: '"Space Drugs" have been renamed to "Space Mirage"'
+  - message: Admin notes popups are now more readable.
     type: Tweak
-  - message: '"Stimulants" have been renamed to "Hyperzine"'
+  id: 6904
+  time: '2024-07-11T14:03:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29909
+- author: jonathanargo
+  changes:
+  - message: Muskets are now wieldable.
     type: Tweak
-  id: 6731
-  time: '2024-06-14T16:53:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28989
-- author: PJB3005
+  id: 6905
+  time: '2024-07-12T09:16:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29910
+- author: themias
   changes:
-  - message: Added pride month.
-    type: Add
-  - message: Made the nuke gay.
-    type: Add
-  id: 6732
-  time: '2024-06-14T17:22:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28992
-- author: Aeshus
+  - message: Notice boards can now be built on walls
+    type: Fix
+  id: 6906
+  time: '2024-07-12T09:18:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29851
+- author: slarticodefast
   changes:
-  - message: Loadouts now display all requirements.
+  - message: Stun batons, stun prods and banana cream pies now fly like other throwing
+      weapons when thrown.
     type: Fix
-  id: 6733
-  time: '2024-06-14T20:32:39.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28994
-- author: Vermidia
+  id: 6907
+  time: '2024-07-12T09:19:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29883
+- author: Plykiya
   changes:
-  - message: allies callable by radio in the uplink now have unique icons
+  - message: Dropping an item while in a container now places the item in the container.
+    type: Fix
+  id: 6908
+  time: '2024-07-12T09:24:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29900
+- author: coffeeware, slarticodefast
+  changes:
+  - message: Fixed items thrown very fast not being in the air. In particular this
+      fixes the pneumatic cannon.
+    type: Fix
+  - message: Buffed base hand throwing speed by 10% to be more similar to before the
+      recent throwing changes.
     type: Tweak
-  id: 6734
-  time: '2024-06-14T21:44:23.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28954
-- author: K-Dynamic
+  id: 6909
+  time: '2024-07-12T10:32:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29935
+- author: themias
   changes:
-  - message: Added witch robes and witch hat to the AutoDrobe.
+  - message: Timers can now be deconstructed
+    type: Fix
+  id: 6910
+  time: '2024-07-12T11:38:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29917
+- author: jonathanargo
+  changes:
+  - message: Hard hat icon sprites are now centered correctly.
+    type: Fix
+  id: 6911
+  time: '2024-07-12T15:00:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29953
+- author: lzk228
+  changes:
+  - message: Secure windoors now use reinforced glass damage modifier.
+    type: Fix
+  id: 6912
+  time: '2024-07-13T04:03:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29941
+- author: Tayrtahn
+  changes:
+  - message: Antag objective total difficulty is now properly capped.
+    type: Fix
+  id: 6913
+  time: '2024-07-13T04:14:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29830
+- author: EmoGarbage404
+  changes:
+  - message: Added wristwatches for telling time.
     type: Add
-  id: 6735
-  time: '2024-06-15T02:19:08.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28965
-- author: Plykiya
+  id: 6914
+  time: '2024-07-13T06:09:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29550
+- author: TheShuEd
   changes:
-  - message: You can no longer insert duplicates of the same module into a cyborg.
+  - message: Added diamonds ore!
+    type: Add
+  - message: Diamonds can now be sold at a bargain price.
+    type: Add
+  id: 6915
+  time: '2024-07-13T12:15:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25750
+- author: coffeeware
+  changes:
+  - message: Lizards will no longer lose their snouts when equipping head bandanas
+    type: Fix
+  id: 6916
+  time: '2024-07-14T02:59:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29979
+- author: SlamBamActionman
+  changes:
+  - message: RGBee and Rainbow Carp plushies now cycle color when held/worn.
+    type: Fix
+  id: 6917
+  time: '2024-07-14T10:26:34.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30023
+- author: Winkarst-cpu
+  changes:
+  - message: Now grappling gun is clumsy proof.
     type: Tweak
-  id: 6736
-  time: '2024-06-15T02:58:30.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28943
-- author: Vermidia
+  id: 6918
+  time: '2024-07-14T10:26:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29904
+- author: HahayesSiH
   changes:
-  - message: Nukie planet now has an improved Donk co. microwave, which cooks twice
-      as fast but is more likely to explode. It can't handle id cards without exploding.
+  - message: It is now possible to pet cyborgs.
     type: Add
-  - message: Made microwave explosions destroy the machine board and spit out the
-      machine parts.
+  - message: Clicking on cyborgs and opening the strip menu no longer unlocks them.
     type: Tweak
-  id: 6737
-  time: '2024-06-15T03:00:00.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28951
-- author: robertGN
+  id: 6919
+  time: '2024-07-14T14:09:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30037
+- author: deltanedas
   changes:
-  - message: Using a welder on vending machines now correctly repairs the vending
-      machine.
+  - message: Fixed ninja shoes not working as magboots.
     type: Fix
-  id: 6738
-  time: '2024-06-15T03:13:53.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28920
-- author: Brandon-Huu
+  id: 6920
+  time: '2024-07-14T15:11:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28586
+- author: lzk228
   changes:
-  - message: Removed the six Handheld GPS devices from the syndicate deathrattle implant
-      box.
+  - message: Scarves are eatable again.
+    type: Fix
+  id: 6921
+  time: '2024-07-14T15:12:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29959
+- author: Winkarst-cpu
+  changes:
+  - message: Now addgamerule command processes only valid game rules.
+    type: Fix
+  id: 6922
+  time: '2024-07-15T19:18:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29912
+- author: Jezithyr
+  changes:
+  - message: Removed the Geras ability from Slimes
     type: Remove
-  id: 6739
-  time: '2024-06-15T03:23:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28999
-- author: EmoGarbage404
+  id: 6923
+  time: '2024-07-16T22:50:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29731
+- author: K-Dynamic
   changes:
-  - message: Revamped meteors. Meteors now crash through several walls before exploding.
-      They can still come in a weaker "space dust" form where they don't break through
-      structures.
-    type: Add
-  - message: Meteor and space dust events now occur on regular intervals during a
-      round rather than being tied to station events. Expect to see more of them during
-      a round.
-    type: Add
-  id: 6740
-  time: '2024-06-15T03:38:43.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28974
+  - message: nerfed paraylze timer of all slippable objects (including soaps, water
+      puddles, and clown-related items)
+    type: Tweak
+  id: 6924
+  time: '2024-07-16T23:26:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27879
 - author: EmoGarbage404
   changes:
-  - message: Added Moon Boots! This science research item allows you to move like
-      you're in zero-gravity.
+  - message: Resprited wall signs.
+    type: Tweak
+  id: 6925
+  time: '2024-07-17T04:35:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29806
+- author: lzk228
+  changes:
+  - message: Added health examine for caustic and cold damage.
     type: Add
-  id: 6741
-  time: '2024-06-15T03:43:24.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29009
-- author: EmoGarbage404
+  id: 6926
+  time: '2024-07-17T06:19:13.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29989
+- author: lzk228
   changes:
-  - message: Attempting to uncuff oneself while being pulled will now take twice as
-      long.
-    type: Tweak
-  - message: Reduced cooldown after attempting to uncuff oneself back to previous
-      values.
+  - message: Surgery saws now are normal-sized (no more pocket circular saw).
     type: Tweak
-  id: 6742
-  time: '2024-06-15T04:01:22.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29008
-- author: EmoGarbage404
+  id: 6927
+  time: '2024-07-17T06:26:10.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29995
+- author: Winkarst-cpu
   changes:
-  - message: Fixed bottles, when used inhand, not being drank from but instead repeatedly
-      opening and closing.
+  - message: The super door remote is now able to control Syndicate doors.
     type: Fix
-  id: 6743
-  time: '2024-06-15T05:20:43.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29010
-- author: Flareguy
+  id: 6928
+  time: '2024-07-17T13:50:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30033
+- author: Errant
   changes:
-  - message: Replaced RelayStation with a more fair ruin.
-    type: Remove
-  id: 6744
-  time: '2024-06-15T06:02:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28971
-- author: metalgearsloth
+  - message: Vox are temporarily removed from Space Ninjas and all Unknown Shuttle
+      ghostroles, until code supports giving them species-specific gear.
+    type: Tweak
+  id: 6929
+  time: '2024-07-17T22:04:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30099
+- author: Cojoke-dot
   changes:
-  - message: Fix the character profile sometimes thinking there's changes to save
-      even if the loadouts haven't changed.
+  - message: You can no longer teleport objects that should not be in other objects
+      into other objects with the Quantum Spin Inverter
     type: Fix
-  id: 6745
-  time: '2024-06-15T06:52:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28737
-- author: EmoGarbage404
+  id: 6930
+  time: '2024-07-18T00:40:54.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29200
+- author: Plykiya
   changes:
-  - message: Fixed borgs and other non-humans getting deleted by salvage magnet wrecks
-      disappearing.
+  - message: Stun batons no longer use up charges when hitting objects without stamina.
     type: Fix
-  id: 6746
-  time: '2024-06-15T13:19:23.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29006
-- author: ShadowCommander
+  id: 6931
+  time: '2024-07-18T00:48:09.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30136
+- author: Sh18RW
   changes:
-  - message: Added a red light to firelocks when their warning lights are active.
-    type: Add
-  - message: Firelocks no longer require power to show warning lights.
-    type: Tweak
-  id: 6747
-  time: '2024-06-15T15:17:16.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29024
-- author: Ian321
+  - message: Moth can't eat boots with an item more
+    type: Fix
+  id: 6932
+  time: '2024-07-18T22:34:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30019
+- author: portfiend
   changes:
-  - message: Donk co. microwaves now have their own machine board.
+  - message: Reptilians display correct mask sprites in character customization screen.
     type: Fix
-  id: 6748
-  time: '2024-06-15T15:44:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29037
-- author: BombasterDS
+  id: 6933
+  time: '2024-07-18T22:36:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30095
+- author: Plykiya
   changes:
-  - message: Added craftable mannequin that you can hang clothing on!
-    type: Add
-  id: 6749
-  time: '2024-06-15T17:50:55.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29004
-- author: notafet
+  - message: You no longer deal double damage to your first target when throwing an
+      item.
+    type: Fix
+  id: 6934
+  time: '2024-07-19T01:08:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30115
+- author: deepdarkdepths
   changes:
-  - message: The TEG must now be operated at higher temperatures to generate power.
-    type: Tweak
-  id: 6750
-  time: '2024-06-15T21:05:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29050
-- author: lzk228
+  - message: Removed the description about geras in the Slime guidebook section.
+    type: Remove
+  id: 6935
+  time: '2024-07-19T09:04:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30140
+- author: Blackern5000
   changes:
-  - message: Fixed ability for mime to not choose any mask.
+  - message: Nuclear operatives are now able to purchase durable armor which is NOT
+      space-proof.
+    type: Add
+  id: 6936
+  time: '2024-07-19T09:38:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29845
+- author: Plykiya, slarticodefast
+  changes:
+  - message: Explosive pens now correctly embed into their target.
     type: Fix
-  id: 6751
-  time: '2024-06-15T21:32:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29056
-- author: FunTust
+  id: 6937
+  time: '2024-07-19T09:42:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30112
+- author: ThatOneEnby1337
   changes:
-  - message: Fixed hair disappearing when hats are tucked away in a pocket.
+  - message: News Reporters are now able to use markup tags in their reports without
+      bricking the PDAs of readers
     type: Fix
-  id: 6752
-  time: '2024-06-15T21:42:13.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28949
-- author: Cojoke-dot
+  id: 6938
+  time: '2024-07-19T14:18:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30169
+- author: themias
   changes:
-  - message: You can now find Jackboots in the security load-outs
-    type: Add
-  - message: The Sec drobe no longer has a Cowboy hat or boots
-    type: Remove
-  id: 6753
-  time: '2024-06-15T22:38:29.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29018
-- author: Keer-Sar
+  - message: Mailing units are functional again
+    type: Fix
+  id: 6939
+  time: '2024-07-20T02:31:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30174
+- author: Ghagliiarghii
   changes:
-  - message: Fixed a spelling error in the cargo bounty for lungs.
+  - message: Nuclear Operatives' Reinforcements now have a PDA!
+    type: Tweak
+  id: 6940
+  time: '2024-07-20T02:59:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28088
+- author: Plykiya
+  changes:
+  - message: Chameleon scarves now work again.
     type: Fix
-  id: 6754
-  time: '2024-06-16T00:24:29.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29064
-- author: Keer-Sar
+  id: 6941
+  time: '2024-07-20T03:00:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30156
+- author: Aidenkrz
   changes:
-  - message: Non-humanoids' names are now capitalized when inserting materials into
-      machines.
+  - message: The mass hallucinations event no longer affects non-humanoids.
     type: Fix
-  id: 6755
-  time: '2024-06-16T02:06:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29071
+  id: 6942
+  time: '2024-07-20T05:53:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28748
+- author: buntobaggins
+  changes:
+  - message: Increased light radius on the Spationaut Hardsuit
+    type: Tweak
+  id: 6943
+  time: '2024-07-21T03:29:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30049
 - author: EmoGarbage404
   changes:
-  - message: Magboots no longer work when off-grid.
+  - message: Fixed wires not updating UI on the Particle Accelerator.
     type: Fix
-  id: 6756
-  time: '2024-06-16T03:38:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29034
-- author: deltanedas
+  id: 6944
+  time: '2024-07-21T05:27:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28750
+- author: CroilBird
   changes:
-  - message: Tarantulas now use Mechanotoxin, a venom that slows you down over time.
-    type: Tweak
-  id: 6757
-  time: '2024-06-16T11:26:59.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29066
-- author: Cojoke-dot
+  - message: 6-pack of cola displays correctly when not being handled
+    type: Fix
+  id: 6945
+  time: '2024-07-21T05:49:48.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29309
+- author: metalgearsloth
   changes:
-  - message: Musicians can now select instruments in their loadout
-    type: Add
-  id: 6758
-  time: '2024-06-16T11:27:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29059
-- author: ElectroJr
+  - message: Fix muzzle flashes not tracking properly.
+    type: Fix
+  id: 6946
+  time: '2024-07-21T06:09:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30163
+- author: metalgearsloth
   changes:
-  - message: Fixed pianos, office chairs & other objects not rotating while being
-      pulled.
+  - message: Fix being able to throw items while your cursor is off-screen.
     type: Fix
-  id: 6759
-  time: '2024-06-16T11:30:36.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29032
-- author: deltanedas
+  id: 6947
+  time: '2024-07-21T06:13:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30164
+- author: metalgearsloth
   changes:
-  - message: Added the Carp Hardsuit to the uplink which is spaceproof and makes carp
-      think you are one of them.
+  - message: Reset the scroll bar in the ghost warp menu whenever you search for a
+      role. Previously it remained at your previous position and you would have to
+      scroll up to see the first entry.
+    type: Tweak
+  id: 6948
+  time: '2024-07-21T06:38:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30159
+- author: Blackern5000
+  changes:
+  - message: The syndicate agent's cyborg weapons module now uses syndicate weaponry
+      rather than NT weaponry.
+    type: Tweak
+  id: 6949
+  time: '2024-07-21T07:04:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26947
+- author: Winkarst-cpu
+  changes:
+  - message: Added ambience to the camera routers and telecommunication servers.
     type: Add
-  id: 6760
-  time: '2024-06-16T11:57:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25155
-- author: Futuristic
+  - message: Now server's and router's ambience stops once they are unpowered.
+    type: Fix
+  id: 6950
+  time: '2024-07-21T07:22:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30091
+- author: Scott Dimeling
   changes:
-  - message: RandomSentience event was removed
-    type: Remove
-  id: 6761
-  time: '2024-06-16T23:24:29.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28982
-- author: notafet
+  - message: Reduced the number of botanists in some stations, for optimal _workflow_
+    type: Tweak
+  id: 6951
+  time: '2024-07-21T07:23:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29581
+- author: metalgearsloth
   changes:
-  - message: Adjust TEG power generation levels.
+  - message: Escape pods won't show up on shuttle map anymore.
     type: Tweak
-  id: 6762
-  time: '2024-06-17T01:13:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29112
-- author: Cojoke-dot, AJCM-git
+  id: 6952
+  time: '2024-07-21T07:23:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29758
+- author: IProduceWidgets
   changes:
-  - message: You can now flip your eyepatches to the other eye! Yarrrrr!
+  - message: an arabian lamp!
     type: Add
-  id: 6763
-  time: '2024-06-17T03:21:29.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26277
-- author: deltanedas
+  id: 6953
+  time: '2024-07-21T07:24:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27270
+- author: osjarw
   changes:
-  - message: Borgs now have a 10 second beeping timer that paralyzes them when being
-      exploded with the robotics console and a 5 second delay when being disabled
-      with it.
-    type: Tweak
-  id: 6764
-  time: '2024-06-17T03:30:10.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27876
-- author: EmoGarbage404
+  - message: NPCs no longer get stuck trying to pick up anchored pipes.
+    type: Fix
+  id: 6954
+  time: '2024-07-21T07:28:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30061
+- author: The Hands Leader - JoJo cat
   changes:
-  - message: Changed meteor swarm spawning to be less clumped up and favor hitting
-      multiple areas more.
+  - message: Train map is back into rotation
     type: Tweak
-  id: 6765
-  time: '2024-06-17T05:20:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29057
-- author: Ubaser
+  id: 6955
+  time: '2024-07-21T07:44:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30145
+- author: Plykiya
   changes:
-  - message: Added new reptilian horns, "Demonic".
+  - message: Syndicate traitor reinforcements are now specialized to be medics, spies,
+      or thieves.
     type: Add
-  id: 6766
-  time: '2024-06-17T10:53:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29022
-- author: Tayrtahn
+  - message: Reinforcement radios with options now have a radial menu, similar to
+      RCDs.
+    type: Tweak
+  id: 6956
+  time: '2024-07-21T10:32:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29853
+- author: Cojoke-dot
   changes:
-  - message: Chemical jugs no longer spawn with two labels.
+  - message: Dead Space Dragons no long despawn
     type: Fix
-  id: 6767
-  time: '2024-06-17T23:09:19.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29137
-- author: Tayrtahn
+  id: 6957
+  time: '2024-07-21T10:46:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29842
+- author: slarticodefast
   changes:
-  - message: Mice and hamsters inside chef's hats can now steer the hat's wearer.
+  - message: Fixed microwave construction.
+    type: Fix
+  id: 6958
+  time: '2024-07-21T16:20:09.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30232
+- author: Sphiral&Kezu
+  changes:
+  - message: 'Added a variety of new wall based storages: Shelfs! Build some today!'
     type: Add
-  id: 6768
-  time: '2024-06-18T10:59:37.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25950
-- author: metalgearsloth
+  id: 6959
+  time: '2024-07-21T17:16:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27858
+- author: valquaint, slarticodefast
   changes:
-  - message: Fix conveyors mispredicting movement.
+  - message: Fixed borgs being unable to state laws with an activated flashlight.
     type: Fix
-  id: 6769
-  time: '2024-06-18T12:11:37.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28157
-- author: lzk228
+  id: 6960
+  time: '2024-07-22T03:55:35.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30183
+- author: Lank
   changes:
-  - message: Warning cones added to the Engivend.
+  - message: Darts can now pop balloons. Keep them away from any monkeys.
     type: Add
-  id: 6770
-  time: '2024-06-18T14:02:05.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29085
-- author: Errant
+  id: 6961
+  time: '2024-07-22T05:38:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30088
+- author: Plykiya
   changes:
-  - message: The strip interface layout of arachnids is now consistent with other
-      species.
+  - message: You can now eat or drink and swap hands without it being interrupted.
     type: Tweak
-  id: 6771
-  time: '2024-06-18T14:10:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29165
+  id: 6962
+  time: '2024-07-22T09:17:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30060
 - author: IProduceWidgets
   changes:
-  - message: Foam Force rifle to cargo lottery!
-    type: Add
-  - message: Foam darts now stick to things they hit!
+  - message: Zookeepers can now possess Nonlethal shotguns according to spacelaw.
     type: Tweak
-  id: 6772
-  time: '2024-06-18T15:04:15.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29103
-- author: metalgearsloth
+  id: 6963
+  time: '2024-07-22T09:33:03.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30237
+- author: Plykiya
   changes:
-  - message: Fix lathe materials sometimes flickering.
-    type: Fix
-  id: 6773
-  time: '2024-06-18T21:47:19.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29167
+  - message: Bag sounds can now only be heard from half the distance and is quieter
+      in general.
+    type: Tweak
+  id: 6964
+  time: '2024-07-22T09:54:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30225
 - author: osjarw
   changes:
-  - message: Fix air alarms not alarming air.
+  - message: Syringes are now 0.5 seconds faster.
+    type: Tweak
+  id: 6965
+  time: '2024-07-22T10:20:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29825
+- author: Errant
+  changes:
+  - message: Replay observers now always spawn on the station.
     type: Fix
-  id: 6774
-  time: '2024-06-19T00:20:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29172
-- author: EmoGarbage404
+  id: 6966
+  time: '2024-07-22T19:32:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30252
+- author: Cojoke-dot
   changes:
-  - message: Slightly decreased meteor frequency.
+  - message: You can now read the volume of a gas tank in its examine text
     type: Tweak
-  id: 6775
-  time: '2024-06-19T01:57:00.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29194
-- author: Flareguy
+  id: 6967
+  time: '2024-07-22T21:41:42.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29771
+- author: Cojoke-dot
   changes:
-  - message: Resprited most of Security's basic attire.
-    type: Tweak
-  id: 6776
-  time: '2024-06-19T02:04:04.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29082
-- author: Beck Thompson, UbaserB
+  - message: Throwing a jetpack mid-flight will no longer freeze your character
+    type: Fix
+  id: 6968
+  time: '2024-07-22T22:24:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30223
+- author: Flareguy
   changes:
-  - message: Added some happier messages for the medibot!
+  - message: Added vox sprites for a few headwear items, including radiation suits
+      and the paramedic helmet.
     type: Add
-  id: 6777
-  time: '2024-06-19T02:28:30.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29147
-- author: HolySSSS
+  id: 6969
+  time: '2024-07-23T02:18:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30150
+- author: Cojoke-dot
   changes:
-  - message: Short Raffle is now much shorter.
-    type: Tweak
-  id: 6778
-  time: '2024-06-19T02:41:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28685
-- author: Truoizys
+  - message: You can no longer use telescreens and televisions while blind or asleep.
+    type: Fix
+  id: 6970
+  time: '2024-07-23T02:33:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30260
+- author: Cojoke-dot
   changes:
-  - message: PDA cartridges can no longer be installed more than once.
+  - message: Fix one of the QSI popups
     type: Fix
-  id: 6779
-  time: '2024-06-19T13:21:06.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29187
-- author: Just_Art
+  id: 6971
+  time: '2024-07-23T03:23:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30265
+- author: Errant
   changes:
-  - message: Musician's jumpskirt added to loadouts.
+  - message: Players are now notified when trying to insert an incompatible magazine
+      into a gun.
     type: Add
-  id: 6780
-  time: '2024-06-19T14:06:03.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29203
-- author: Flareguy
-  changes:
-  - message: Made the HOS's cap look significantly better.
-    type: Tweak
-  id: 6781
-  time: '2024-06-19T14:49:19.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29208
-- author: Flareguy
+  id: 6972
+  time: '2024-07-23T06:36:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29046
+- author: TheKittehJesus
   changes:
-  - message: Emergency Toolboxes now have a different fill that contains more utility
-      items then before.
-    type: Tweak
-  - message: Added the pocket fire extinguisher. You can currently only find them
-      in the emergency toolbox.
-    type: Add
-  id: 6782
-  time: '2024-06-19T18:13:27.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29202
-- author: lzk228
+  - message: The Syndicate Assault Borg can now wield their double esword
+    type: Fix
+  id: 6973
+  time: '2024-07-23T08:13:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30229
+- author: Scribbles0
   changes:
-  - message: Warning cone and wet floor sign recipes added to the autolathe.
-    type: Add
-  id: 6783
-  time: '2024-06-19T18:13:55.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29205
-- author: arimah
+  - message: Handless mobs can no longer wipe devices like positronic brains or pAIs.
+    type: Fix
+  id: 6974
+  time: '2024-07-23T17:47:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30149
+- author: Quantus
   changes:
-  - message: Containment field generators can no longer be powered by an emitter bolt
-      flying past them. The bolt must hit them directly.
+  - message: Reagent grinders can no longer auto-grind when unpowered.
     type: Fix
-  id: 6784
-  time: '2024-06-19T23:51:07.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29225
-- author: Dutch-VanDerLinde
+  id: 6975
+  time: '2024-07-23T21:02:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30267
+- author: BombasterDS
   changes:
-  - message: Lizard frills and moth antenna are now hidden by hardsuit helmets.
-    type: Tweak
-  id: 6785
-  time: '2024-06-20T00:09:44.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29214
-- author: metalgearsloth
+  - message: Fixed items disappearing after shelfs and mannequin disassembling
+    type: Fix
+  id: 6976
+  time: '2024-07-24T08:57:03.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30313
+- author: Cojoke-dot
   changes:
-  - message: Fix entities getting stuck red after getting hit.
+  - message: Fix infinite QSI linking range
     type: Fix
-  id: 6786
-  time: '2024-06-20T07:15:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28981
-- author: Dutch-VanDerLinde
+  id: 6977
+  time: '2024-07-24T20:57:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30332
+- author: deltanedas
   changes:
-  - message: Syndicate sleeper agents are now opt-in. You can opt-in with the antagonist
-      preferences menu.
+  - message: Borgs can no longer unlock the robotics console or other borgs.
     type: Tweak
-  - message: ERT are no longer able to become sleeper agents.
-    type: Fix
-  id: 6787
-  time: '2024-06-20T11:12:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27817
-- author: neutrino-laser
+  id: 6978
+  time: '2024-07-25T03:54:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27888
+- author: themias
   changes:
-  - message: Syndicate smokes pack now has 10 cigarettes as intended.
+  - message: Fixed the ripley control panel not loading
     type: Fix
-  id: 6788
-  time: '2024-06-20T11:16:06.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28371
-- author: lzk228
+  id: 6979
+  time: '2024-07-25T05:23:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30325
+- author: Timur2011
   changes:
-  - message: Cube boxes buffed 6 -> 8 cubes.
+  - message: Space adders are now butcherable.
+    type: Add
+  - message: Snakes now drop snake meat when butchered.
+    type: Fix
+  - message: Snakes now appear lying when in critical state.
     type: Tweak
-  id: 6789
-  time: '2024-06-20T11:58:51.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29251
-- author: Boaz1111
+  id: 6980
+  time: '2024-07-25T10:52:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29629
+- author: Plykiya
   changes:
-  - message: Explosive technology has been moved to T1 arsenal
+  - message: You can now build atmos gas pipes through things like walls.
     type: Tweak
-  id: 6790
-  time: '2024-06-20T12:22:04.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29227
-- author: Redfire1331
+  id: 6981
+  time: '2024-07-25T23:26:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28707
+- author: Ilya246
   changes:
-  - message: You can now eat cup ramen with chopsticks.
+  - message: Nuclear operative reinforcements now come with full nuclear operative
+      gear (and a toy carp) at no additional cost.
     type: Tweak
-  id: 6791
-  time: '2024-06-20T12:34:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27826
-- author: Errant
+  - message: Nuclear operative reinforcements now get nuclear operative names.
+    type: Tweak
+  id: 6982
+  time: '2024-07-25T23:37:54.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30173
+- author: Cojoke-dot
   changes:
-  - message: Slimepeople crewmembers now spawn with survival boxes that contain emergency
-      nitrogen tanks.
+  - message: Engineering goggles and other similar-looking eyewear now help block
+      identity.
     type: Tweak
-  id: 6792
-  time: '2024-06-20T14:05:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29131
-- author: PJB3005
+  - message: Radiation suit's hood now blocks identity.
+    type: Fix
+  id: 6983
+  time: '2024-07-26T05:26:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30305
+- author: Moomoobeef
   changes:
-  - message: You can now pry multiple tiles at once.
+  - message: Some radio channel colors have been tweaked in order to be more easily
+      distinguishable.
     type: Tweak
-  id: 6793
-  time: '2024-06-20T14:05:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29231
-- author: MilenVolf
+  id: 6984
+  time: '2024-07-26T06:47:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30133
+- author: Errant
   changes:
-  - message: Jaws of life, xeno and spiders now use proper prying speed that will
-      lead into a faster prying.
+  - message: Replay ghosts now actually spawn on the proper station, take two.
     type: Fix
-  - message: Jaws of life now pries tiles much faster.
-    type: Tweak
-  id: 6794
-  time: '2024-06-20T14:19:22.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29210
-- author: MilenVolf
+  id: 6985
+  time: '2024-07-26T12:59:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30273
+- author: themias
   changes:
-  - message: Stasis bed can be toggled on or off!
-    type: Tweak
-  id: 6795
-  time: '2024-06-21T03:02:23.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29268
-- author: slarticodefast
+  - message: Arcade machines are functional again
+    type: Fix
+  id: 6986
+  time: '2024-07-26T17:30:50.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30376
+- author: themias
   changes:
-  - message: Fixed initial infected status icons not showing up.
+  - message: Zombies now get uncuffed upon transformation
     type: Fix
-  - message: Added an antagonist message to the character menu for initial infected
-      and zombies.
+  id: 6987
+  time: '2024-07-26T18:48:03.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30321
+- author: metalgearsloth
+  changes:
+  - message: Fix grid labels getting spammed from VGRoid.
+    type: Fix
+  id: 6988
+  time: '2024-07-27T01:54:38.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29946
+- author: GoldenCan
+  changes:
+  - message: Added a Security Clown Mask which is obtainable by hacking a SecDrobe.
     type: Add
-  id: 6796
-  time: '2024-06-21T05:42:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29259
-- author: Chief_Engineer and TsjipTsjip
+  id: 6989
+  time: '2024-07-27T04:09:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30249
+- author: Plykiya
   changes:
-  - message: All ghostroles now have their role type, as defined in the rules, defined
-      in their ghostrole request box.
+  - message: Thief game rule now properly selects more than one thief.
+    type: Fix
+  id: 6990
+  time: '2024-07-27T07:27:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30393
+- author: BombasterDS
+  changes:
+  - message: Added new plant mutations for apple, sugarcane and galaxythistle
+    type: Add
+  id: 6991
+  time: '2024-07-27T15:08:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28993
+- author: Spessmann
+  changes:
+  - message: Thief objectives for figurines and stamps now require less items
     type: Tweak
-  id: 6797
-  time: '2024-06-21T09:41:54.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29249
-- author: ElectroJr
+  id: 6992
+  time: '2024-07-27T23:11:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30390
+- author: metalgearsloth
   changes:
-  - message: Fixed not being able to pick up folded rollerbeds.
+  - message: Moved VGRoid from 1,000m away to ~500m.
+    type: Tweak
+  id: 6993
+  time: '2024-07-28T03:14:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29943
+- author: lzk228
+  changes:
+  - message: Fixed pancakes stacks. Before it, splitting not default pancakes stacks
+      would give you default pancakes.
     type: Fix
-  - message: Fixed not being able to unbuckle entities by clicking on them.
+  id: 6994
+  time: '2024-07-28T03:49:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30270
+- author: Plykiya
+  changes:
+  - message: Fixed the client mispredicting people slipping with their magboots turned
+      on
     type: Fix
-  id: 6798
-  time: '2024-06-21T10:50:53.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29293
-- author: Macoron
+  id: 6995
+  time: '2024-07-28T06:17:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30425
+- author: Katzenminer
   changes:
-  - message: Fixed SSD indicator for dwarfs.
+  - message: Pun and similar pets are no longer firemune
     type: Fix
-  id: 6799
-  time: '2024-06-22T01:11:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29310
-- author: EmoGarbage404
+  id: 6996
+  time: '2024-07-28T08:32:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30424
+- author: lzk228
   changes:
-  - message: Deconstructing a damaged AME core now yields steel instead of a full
-      AME flatpack.
-    type: Tweak
-  id: 6800
-  time: '2024-06-22T04:15:21.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29317
-- author: Errant
+  - message: Fixed permanent absence of the approver string in cargo invoice.
+    type: Fix
+  id: 6997
+  time: '2024-07-29T06:19:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29690
+- author: JIPDawg
   changes:
-  - message: Items should no longer be missing from backpacks at spawn.
+  - message: F9 is correctly bound to the Round End Summary window by default now.
     type: Fix
-  id: 6801
-  time: '2024-06-22T10:43:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29336
-- author: Donchan, marboww
+  id: 6998
+  time: '2024-07-29T06:49:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30438
+- author: githubuser508
   changes:
-  - message: New Nuke Detonation Song "Sound Station 14"
+  - message: Candles crate and the ability for Cargo to order it.
     type: Add
-  id: 6802
-  time: '2024-06-22T15:09:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29345
-- author: deltanedas
+  id: 6999
+  time: '2024-07-29T08:29:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29736
+- author: Blackern5000
   changes:
-  - message: Doors access logging can now be disabled by snipping or pulsing a LOG
-      wire.
+  - message: Emergency oxygen and fire lockers now generally contain more supplies
     type: Tweak
-  id: 6803
-  time: '2024-06-22T15:12:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29094
-- author: notafet
+  id: 7000
+  time: '2024-07-29T09:57:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29230
+- author: Moomoobeef
   changes:
-  - message: Reduce air alarm sensitivity to plasma, tritium, and carbon dioxide.
-    type: Tweak
-  id: 6804
-  time: '2024-06-22T15:22:07.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29331
-- author: Damn Feds
+  - message: Added the ability to wear lizard plushies on your head!
+    type: Add
+  id: 7001
+  time: '2024-07-29T12:52:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30400
+- author: TurboTrackerss14
   changes:
-  - message: thief toolbox kits now better describe contents
+  - message: Reduced Kobold ghostrole chance to mirror Monkey
     type: Tweak
-  id: 6805
-  time: '2024-06-22T15:44:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27771
-- author: lzk228
+  id: 7002
+  time: '2024-07-29T15:16:54.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30450
+- author: Ian321
   changes:
-  - message: Prying reinforced tile now will give you back metal rod
+  - message: The Courser now comes with a defibrillator.
     type: Tweak
-  id: 6806
-  time: '2024-06-22T15:47:02.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29084
-- author: nikthechampiongr
+  id: 7003
+  time: '2024-07-30T01:05:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30471
+- author: slarticodefast
   changes:
-  - message: Locked firelocks can no longer be pried by hand when powered.
+  - message: Fixed puppy Ian not counting as a thief steal target.
+    type: Fix
+  id: 7004
+  time: '2024-07-30T01:22:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30474
+- author: themias
+  changes:
+  - message: Added envelopes to the PTech and bureaucracy crate
+    type: Add
+  id: 7005
+  time: '2024-07-30T01:49:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30298
+- author: TheKittehJesus
+  changes:
+  - message: The recipe for chow mein, egg-fried rice, and both brownies now use liquid
+      egg instead of a whole egg.
     type: Tweak
-  id: 6807
-  time: '2024-06-22T17:49:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29221
-- author: Floofi
+  - message: Cake batter now also requires 5u of milk
+    type: Tweak
+  id: 7006
+  time: '2024-07-30T02:14:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30262
+- author: Plykiya
   changes:
-  - message: Added lemon juice to the Boozemat!
+  - message: Wearing something that covers your head will prevent your hair from being
+      cut.
     type: Add
-  id: 6808
-  time: '2024-06-22T23:46:19.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27465
+  - message: You now see a popup when your hair is being altered.
+    type: Add
+  - message: The doafter for altering other people's hair now takes seven seconds.
+    type: Tweak
+  id: 7007
+  time: '2024-07-30T02:17:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30366
 - author: Cojoke-dot
   changes:
-  - message: You can now put hats on Medibots
-    type: Add
-  id: 6809
-  time: '2024-06-23T00:28:20.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28584
-- author: WarMechanic
+  - message: Hamlet and other ghost rolls can now spin when they enter combat mode
+    type: Fix
+  id: 7008
+  time: '2024-07-30T02:48:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30478
+- author: themias
   changes:
-  - message: The TEG now powers itself once started.
+  - message: Fixed the ACC wire not appearing in vending machine wire layouts
+    type: Fix
+  id: 7009
+  time: '2024-07-30T03:04:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30453
+- author: Blackern5000
+  changes:
+  - message: The defibrillator has been recolored slightly
     type: Tweak
-  id: 6810
-  time: '2024-06-23T01:46:31.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29072
-- author: eoineoineoin
+  id: 7010
+  time: '2024-07-30T04:41:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29964
+- author: themias
   changes:
-  - message: Hand labelers can now apply labels to buttons, switches, and levers
+  - message: Fixed victim's fingerprints transferring onto an attacker's weapon
+    type: Fix
+  id: 7011
+  time: '2024-07-30T08:35:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30257
+- author: to4no_fix
+  changes:
+  - message: Now engineering access is needed to interact with the particle accelerator
     type: Tweak
-  id: 6811
-  time: '2024-06-23T14:52:30.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29378
-- author: Tayrtahn
+  id: 7012
+  time: '2024-07-30T11:29:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30394
+- author: Cojoke-dot
   changes:
-  - message: Jugs in the ChemVend are labeled again.
+  - message: You can no longer get out of a disposal chute or container while knocked
+      over by trying to walk
     type: Fix
-  id: 6812
-  time: '2024-06-23T17:31:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29178
-- author: DrEnzyme
+  id: 7013
+  time: '2024-07-30T13:53:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30391
+- author: Cojoke-dot
   changes:
-  - message: Add bagels and poppy seed bagels.
-    type: Add
-  id: 6813
-  time: '2024-06-23T19:33:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/24799
+  - message: QSI now swaps the top most valid container instead of QSI when placed
+      in an anchored container
+    type: Fix
+  id: 7014
+  time: '2024-07-30T14:07:35.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30241
+- author: TheShuEd
+  changes:
+  - message: industrial ore processor can now process diamonds
+    type: Fix
+  id: 7015
+  time: '2024-07-30T14:41:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30499
 - author: PJB3005
   changes:
-  - message: Ghosts can now examine details on objects from any range.
+  - message: CLF3 is now called "chlorine trifluoride"
     type: Tweak
-  id: 6814
-  time: '2024-06-24T15:36:53.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29404
-- author: Emisse
+  id: 7016
+  time: '2024-07-31T00:14:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30510
+- author: slarticodefast
   changes:
-  - message: atmos, elite syndie, and deathsquad hardsuits are now the only fireproof
-      suits
-    type: Tweak
-  id: 6815
-  time: '2024-06-24T22:03:05.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29416
-- author: Bhijn and Myr
+  - message: Fixed the mouse position when it is over a singularity distortion effect
+      while zoomed in or out.
+    type: Fix
+  id: 7017
+  time: '2024-07-31T00:14:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30509
+- author: metalgearsloth
   changes:
-  - message: The colors of the LEDs on the heater and freezer thermomachines has been
-      changed from red/green (respectively) to orange/cyan (respectively). In laymen's
-      terms, this makes thermomachines far more reasonably differentiable for those
-      with colorblindness.
+  - message: Add a button to the lobby so you can export a .png of your characters
+    type: Add
+  id: 7018
+  time: '2024-07-31T15:14:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29874
+- author: slarticodefast
+  changes:
+  - message: Skeletons no longer have fingerprints.
     type: Tweak
-  id: 6816
-  time: '2024-06-24T22:40:20.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29397
-- author: Elysium206
+  id: 7019
+  time: '2024-07-31T16:08:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30530
+- author: themias
   changes:
-  - message: Increased Security Riot shields durability significantly and makes actively
-      blocking better
+  - message: Pens can be clicked cathartically
     type: Tweak
-  id: 6817
-  time: '2024-06-25T03:56:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29239
-- author: Tayrtahn
+  id: 7020
+  time: '2024-07-31T17:57:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30531
+- author: Plykiya
   changes:
-  - message: Fixed space ninja's starting with their internals disabled.
-    type: Fix
-  id: 6818
-  time: '2024-06-25T06:28:48.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29213
-- author: PJB3005
+  - message: Meteors now leave behind asteroid rocks on impact.
+    type: Add
+  id: 7021
+  time: '2024-08-01T02:55:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30419
+- author: PixelTheAertist
   changes:
-  - message: Low pressure damage now does only 1/4th as much damage. This is a band-aid
-      until better mechanics exists for the crew to deal with breaches of various
-      kinds.
-    type: Remove
-  id: 6819
-  time: '2024-06-26T00:48:26.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29478
-- author: lzk228
+  - message: The Social Anxiety trait is now renamed to "Stutter"
+    type: Tweak
+  id: 7022
+  time: '2024-08-01T02:58:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29898
+- author: Plykiya
+  changes:
+  - message: Adds hand labelers to the PTech, ChemDrobe, and LawDrobe.
+    type: Add
+  id: 7023
+  time: '2024-08-01T02:59:54.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29958
+- author: Ko4erga
   changes:
-  - message: Blood now has less satiation.
+  - message: Added a cutter machine for crafting patterned steel tiles, concrete and
+      wooden tiles.
+    type: Add
+  - message: After rip off patterned tiles you get current pattern, not just steel
+      tile.
     type: Tweak
-  id: 6820
-  time: '2024-06-26T02:27:11.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29433
-- author: Veritable-Calamity
+  id: 7024
+  time: '2024-08-01T10:26:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30431
+- author: NakataRin
   changes:
-  - message: Moldy food can now be collected in the Janitors' trash bags.
-    type: Fix
-  id: 6821
-  time: '2024-06-26T03:26:59.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29380
-- author: Plykiya
+  - message: Added paramedic to the train station.
+    type: Add
+  id: 7025
+  time: '2024-08-01T19:59:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30556
+- author: marbow
   changes:
-  - message: You can now interact with magic mirrors.
-    type: Fix
-  id: 6822
-  time: '2024-06-26T14:25:11.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29491
-- author: Doomsdrayk
+  - message: Rejoice, detectives! Hand labeler has been added to your closet!
+    type: Add
+  id: 7026
+  time: '2024-08-01T20:01:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30501
+- author: metalgearsloth
   changes:
-  - message: Disposal units no longer protect their contents from nuclear explosions.
+  - message: Fix some popups playing twice.
     type: Fix
-  id: 6823
-  time: '2024-06-26T14:25:43.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29438
-- author: Tayrtahn
+  id: 7027
+  time: '2024-08-02T01:33:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30452
+- author: WarMechanic
   changes:
-  - message: Pills and pill canisters no longer have two labels.
+  - message: Adjusted meteors to have less lethal blast fragments.
+    type: Tweak
+  id: 7028
+  time: '2024-08-02T05:43:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29199
+- author: slarticodefast
+  changes:
+  - message: Fixed borgs not being able to state laws or open other UIs without an
+      active module.
     type: Fix
-  id: 6824
-  time: '2024-06-27T02:08:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29499
-- author: PJB3005
+  id: 7029
+  time: '2024-08-02T05:44:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30299
+- author: TropicalHibi
   changes:
-  - message: You can no longer place items onto tabletop games. The feature could
-      be easily abused to crash the server.
-    type: Remove
-  id: 6825
-  time: '2024-06-27T14:57:55.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29513
-- author: KonstantinAngelov
+  - message: Now fs (for sure) and wru (where are you) are changed to their full version
+      in text
+    type: Add
+  id: 7030
+  time: '2024-08-02T05:57:50.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30508
+- author: Plykiya
   changes:
-  - message: Chef's Cookbook has a more IC name.
+  - message: Rechargers now show the percent charged of the item it is charging.
+    type: Add
+  id: 7031
+  time: '2024-08-02T06:05:38.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28500
+- author: ShadowCommander
+  changes:
+  - message: Rollerbeds now deploy when holding them in hand and clicking on the ground.
+    type: Add
+  id: 7032
+  time: '2024-08-02T07:05:12.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30000
+- author: slarticodefast
+  changes:
+  - message: The digital audio workstation can now be rotated.
     type: Tweak
-  id: 6826
-  time: '2024-06-27T15:11:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29467
-- author: metalgearsloth
+  id: 7033
+  time: '2024-08-02T10:02:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30571
+- author: slarticodefast
   changes:
-  - message: Ushanka no longer applies an accent to your name.
+  - message: Added potassium iodide. It gives you short term radiation protection
+      and can be found in radiation treatment kits.
+    type: Add
+  - message: Added haloperidol. It removes most stimulating/hallucinogenic drugs from
+      the body and makes you drowsy.
+    type: Add
+  - message: Added the drowsiness status effect. It blurs your vision and makes you
+      randomly fall asleep. Drink some coffee or cola to remove it.
+    type: Add
+  - message: Chloral hydrate now makes you drowsy instead of forcing you to sleep
+      instantly.
     type: Tweak
-  id: 6827
-  time: '2024-06-28T00:08:09.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29524
-- author: JIPDawg
+  id: 7034
+  time: '2024-08-02T17:12:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27454
+- author: Blackern5000
   changes:
-  - message: Changed the sound of pulling back the foam crossbow from the sound of
-      a Flash to just pulling back a bow.
+  - message: Winter boots no longer have ugly outlines
     type: Tweak
-  id: 6828
-  time: '2024-06-28T00:23:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29508
-- author: Plykiya
+  id: 7035
+  time: '2024-08-02T23:05:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30350
+- author: lzk228
   changes:
-  - message: Do-after bars performed inside containers are hidden from view.
+  - message: Figurines will say phrases on activation.
     type: Add
-  id: 6829
-  time: '2024-06-28T03:34:24.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29487
-- author: slarticodefast
+  id: 7036
+  time: '2024-08-03T14:06:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30455
+- author: JoelZimmerman
   changes:
-  - message: Passive vents now have the correct sprite.
-    type: Fix
-  id: 6830
-  time: '2024-06-28T12:33:03.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29536
-- author: Plykiya
+  - message: Dank pizza is now cooked with cannabis leaves instead of ambrosia vulgaris.
+    type: Tweak
+  id: 7037
+  time: '2024-08-03T14:07:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30430
+- author: Ian321
   changes:
-  - message: Icons in the chameleon menu now appear correctly.
+  - message: Help menus now include the linked guides.
     type: Fix
-  id: 6831
-  time: '2024-06-28T21:21:36.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29539
-- author: DogZeroX
+  id: 7038
+  time: '2024-08-04T03:32:10.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30462
+- author: DrSmugleaf
   changes:
-  - message: Bananium no longer emit rads
-    type: Remove
-  id: 6832
-  time: '2024-06-28T23:28:27.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29545
-- author: TokenStyle
+  - message: The Toggle Internals verb no longer shows up in the context menu if no
+      breathing tool is equipped and internals are off.
+    type: Tweak
+  id: 7039
+  time: '2024-08-04T03:34:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30622
+- author: Mervill
   changes:
-  - message: Mechs can now be destroyed!
+  - message: Rotten Meat can be collected in trash bags and deleted by the recycler
     type: Tweak
-  id: 6833
-  time: '2024-06-29T03:28:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29338
-- author: metalgearsloth
+  id: 7040
+  time: '2024-08-04T10:13:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30594
+- author: DrSmugleaf
   changes:
-  - message: Typing indicators are now predicted.
+  - message: Fixed the client sometimes falsely showing the red color flash effect
+      when attacking something that they can't, like allied xenonids.
     type: Fix
-  id: 6834
-  time: '2024-06-29T03:33:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29551
-- author: Arteben
+  id: 7041
+  time: '2024-08-05T03:14:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30661
+- author: Killerqu00
   changes:
-  - message: Added favorite tab for construction!
+  - message: Sleeper agents event no longer occurs when evacuation is called.
+    type: Tweak
+  id: 7042
+  time: '2024-08-05T03:17:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30646
+- author: Cojoke-dot
+  changes:
+  - message: Mice can now use combat mode with a 0 damage attack
+    type: Tweak
+  id: 7043
+  time: '2024-08-05T03:26:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30487
+- author: TheShuEd
+  changes:
+  - message: Nanotrasen has introduced recruitment rules. Characters under the age
+      of 20 are no longer allowed to take on the role of head.
+    type: Tweak
+  id: 7044
+  time: '2024-08-05T04:25:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30347
+- author: foboscheshir
+  changes:
+  - message: added missing mime mask sprites for Vox - scared and sad.
     type: Add
-  id: 6835
-  time: '2024-06-29T04:10:00.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26347
-- author: deltanedas
+  id: 7045
+  time: '2024-08-05T06:09:35.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30607
+- author: SlamBamActionman, PolarTundra
   changes:
-  - message: Traitors can now be assigned to deconstruct the station's nuke for its
-      precious plutonium core.
+  - message: Thief's Syndie Kit now comes with a Radio Jammer, a lighter and a Syndicate
+      codeword.
     type: Add
-  - message: Added the Objectives category in the uplink with a Core Extraction Toolbox
-      for deconstructing said nuke.
+  - message: Thief's Agent ID has been moved from the Syndie Kit to the Chameleon
+      Kit.
+    type: Tweak
+  - message: The Syndicate pAI has been removed from the Thief's Syndie Kit.
+    type: Remove
+  id: 7046
+  time: '2024-08-05T08:03:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30446
+- author: EmoGarbage404
+  changes:
+  - message: Being cold now slows down your character.
     type: Add
-  id: 6836
-  time: '2024-06-29T04:11:31.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26786
+  id: 7047
+  time: '2024-08-05T08:07:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29692
+- author: EmoGarbage404
+  changes:
+  - message: The biogenerator has been recolored and renamed to the "biocube fabricator."
+    type: Tweak
+  id: 7048
+  time: '2024-08-06T10:51:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30696
+- author: Errant
+  changes:
+  - message: Vox can be nukies and ninjas again.
+    type: Tweak
+  id: 7049
+  time: '2024-08-06T10:58:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29783
 - author: slarticodefast
   changes:
-  - message: Air vents now have yellow lights if they are in under-pressure lockout.
+  - message: Fixed borgs, animals and aghosts being able to enter cryosleep.
+    type: Fix
+  id: 7050
+  time: '2024-08-06T11:00:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30574
+- author: Flareguy
+  changes:
+  - message: Most hats are now automatically displaced on vox to look more fitting.
+    type: Tweak
+  id: 7051
+  time: '2024-08-06T13:12:14.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30699
+- author: Errant
+  changes:
+  - message: Medical Mask sprite now works on vox.
+    type: Fix
+  id: 7052
+  time: '2024-08-07T03:41:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30702
+- author: Lyroth001
+  changes:
+  - message: Dragons are immune to flashes
+    type: Tweak
+  id: 7053
+  time: '2024-08-07T07:42:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30658
+- author: ShadowCommander
+  changes:
+  - message: Rollerbeds can now be dragged to the player to fold and pick them up.
     type: Add
-  id: 6837
-  time: '2024-06-29T05:02:48.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29527
-- author: metalgearsloth
+  id: 7054
+  time: '2024-08-07T09:19:10.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30002
+- author: Errant
   changes:
-  - message: Fix character traits not being validated.
+  - message: Survivors arriving via the Unknown Shuttle event, ERT and CBURN agents,
+      and Death Squad members are now equipped with the appropriate species-specific
+      survival gear.
     type: Fix
-  id: 6838
-  time: '2024-06-29T05:39:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28730
-- author: PJB3005
+  - message: Unknown Shuttle event can once again spawn vox characters.
+    type: Tweak
+  id: 7055
+  time: '2024-08-07T09:26:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29746
+- author: IProduceWidgets
   changes:
-  - message: '"Steal plutonium core" traitor objective has been reverted.'
-    type: Remove
-  id: 6839
-  time: '2024-06-29T15:23:03.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29578
-- author: MureixloL
+  - message: butter is slippery
+    type: Tweak
+  id: 7056
+  time: '2024-08-07T21:47:03.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29772
+- author: Mervill
   changes:
-  - message: Changed some vending machine point lights to match the vendors better.
+  - message: Gas Miners now have detailed examine text
     type: Tweak
-  id: 6840
-  time: '2024-06-30T03:46:31.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29590
-- author: metalgearsloth
+  id: 7057
+  time: '2024-08-08T02:14:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30480
+- author: BackeTako
   changes:
-  - message: Fix trait categories not respecting unlimited points.
-    type: Fix
-  id: 6841
-  time: '2024-06-30T04:28:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29600
-- author: ShadowCommander
+  - message: "!, \u203D and multiple punctuations now work for Spanish."
+    type: Tweak
+  id: 7058
+  time: '2024-08-08T03:08:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30551
+- author: strO0pwafel
   changes:
-  - message: Fixed sprite layers disappearing when inserting or removing an item on
-      entities such as belts, janitor trolley, clipboard, etc.
+  - message: Fixed inconsistent naming of CentComm.
     type: Fix
-  id: 6842
-  time: '2024-06-30T04:34:06.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29461
+  id: 7059
+  time: '2024-08-08T10:04:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29217
 - author: Plykiya
   changes:
-  - message: Syndicate traitor reinforcements price has been changed from 16 TC to
-      14 TC.
+  - message: Buffed the range of EMP implants from a radius of 1.75 tiles to 2.75
+      tiles.
     type: Tweak
-  - message: Nuclear ops reinforcements price has been changed from 16 TC to 35 TC.
+  - message: Buffed the range of EMP grenades from a radius of 4 tiles to 5.5 tiles.
     type: Tweak
-  id: 6843
-  time: '2024-06-30T12:28:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29557
+  id: 7060
+  time: '2024-08-08T10:04:50.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30660
 - author: Plykiya
   changes:
-  - message: Skeletons are now immune to flashes.
+  - message: You can drop food or drinks from your hands to interrupt eating it, again.
+    type: Fix
+  - message: Barber scissors are now interrupted if the item is dropped or if the
+      user changes hands.
+    type: Tweak
+  id: 7061
+  time: '2024-08-08T11:39:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30361
+- author: TheShuEd
+  changes:
+  - message: Add "thieving beacon" to Thief antag - a device that counts objects within
+      a radius of itself as stolen.
     type: Add
-  id: 6844
-  time: '2024-06-30T13:42:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29604
-- author: Plykiya
+  - message: Return thief structures stealing objectives.
+    type: Add
+  - message: Animal theft objectives can no longer appear if the animals are not on
+      the station.
+    type: Fix
+  id: 7062
+  time: '2024-08-08T13:17:50.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29997
+- author: lzk228
   changes:
-  - message: The lock on emagged borgs no longer breaks, preventing unauthorized access
-      and emag checking.
-    type: Tweak
-  id: 6845
-  time: '2024-06-30T13:46:45.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29605
-- author: metalgearsloth
+  - message: RD labcoat added in RD's dresser.
+    type: Add
+  id: 7063
+  time: '2024-08-08T22:50:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30671
+- author: SlamBamActionman
   changes:
-  - message: Accentless speech now costs 2 trait points.
+  - message: Animal DNA now shows up as "unknown DNA" in the Forensic Scanner.
     type: Tweak
-  id: 6846
-  time: '2024-06-30T13:47:22.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29603
-- author: deltanedas
-  changes:
-  - message: Fixed sleeper agents not showing up in the round end summary.
+  - message: Forensic Scanner can now scan fluid containers for DNA in reagents.
+    type: Tweak
+  - message: Fluids keep their DNA data when moved.
     type: Fix
-  id: 6847
-  time: '2024-06-30T13:51:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29468
+  - message: Fluids now stain containers they're in with DNA. Make sure to scrub your
+      blood bucket after use!
+    type: Add
+  - message: Vomit now includes DNA!
+    type: Add
+  id: 7064
+  time: '2024-08-08T23:27:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26699
+- author: themias
+  changes:
+  - message: Butter can be sliced, cookie and toast recipes now use butter slices.
+    type: Tweak
+  - message: Chefvend butter reduced from 4 to 3.
+    type: Tweak
+  id: 7065
+  time: '2024-08-08T23:32:42.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30789
 - author: EmoGarbage404
   changes:
-  - message: The design on the bar sign can now be changed via a menu.
+  - message: You should have significantly less friction when moving in space.
+    type: Tweak
+  id: 7066
+  time: '2024-08-09T04:52:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29383
+- author: Plykiya
+  changes:
+  - message: Hardsuits and EVA suits now count as protection for unscrewing lightbulbs.
     type: Add
-  id: 6848
-  time: '2024-06-30T16:20:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29068
-- author: Hmeister
+  - message: More gloves were given the ability to unscrew light bulbs.
+    type: Add
+  - message: Behonkers no longer hurt you when melee attacking them or interacting
+      with them.
+    type: Remove
+  id: 7067
+  time: '2024-08-09T05:32:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30244
+- author: Ian321
   changes:
-  - message: The CE hardsuit is now fireproof again.
+  - message: The warden is now an important job.
     type: Tweak
-  id: 6849
-  time: '2024-06-30T17:56:31.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29516
+  id: 7068
+  time: '2024-08-09T05:45:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30745
+- author: slarticodefast
+  changes:
+  - message: Added tooltips to the agent ID job icons
+    type: Add
+  id: 7069
+  time: '2024-08-09T06:14:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28575
+- author: stalengd
+  changes:
+  - message: Head bandana no longer blocks food eating.
+    type: Fix
+  id: 7070
+  time: '2024-08-09T06:17:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28910
+- author: Ubaser
+  changes:
+  - message: Oxygen and nitrogen canisters now have new sprites when worn.
+    type: Add
+  id: 7071
+  time: '2024-08-09T10:32:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30809
diff --git a/Resources/ConfigPresets/DeltaV/deltav.toml b/Resources/ConfigPresets/DeltaV/deltav.toml
index 2e5b5d0f886..bd39372a720 100644
--- a/Resources/ConfigPresets/DeltaV/deltav.toml
+++ b/Resources/ConfigPresets/DeltaV/deltav.toml
@@ -45,3 +45,7 @@ flavor_text = true
 
 #[worldgen]
 #enabled = true
+
+[ahelp]
+admin_prefix = false
+admin_prefix_webhook = false
diff --git a/Resources/Locale/en-US/accent/russian.ftl b/Resources/Locale/en-US/accent/russian.ftl
new file mode 100644
index 00000000000..596342dc9f1
--- /dev/null
+++ b/Resources/Locale/en-US/accent/russian.ftl
@@ -0,0 +1,19 @@
+accent-russian-words-1 = yes
+accent-russian-words-replace-1 = da
+
+accent-russian-words-2 = no
+accent-russian-words-replace-2 = nyet
+
+accent-russian-words-3 = grandma
+accent-russian-words-3-2 = grandmother
+accent-russian-words-3-3 = granny
+accent-russian-words-replace-3 = babushka
+
+accent-russian-words-4 = friend
+accent-russian-words-replace-4 = comrade
+
+accent-russian-words-5 = friends
+accent-russian-words-replace-5 = comrades
+
+accent-russian-words-6 = cheers
+accent-russian-words-replace-6 = na zdorovje
\ No newline at end of file
diff --git a/Resources/Locale/en-US/actions/actions/polymorph.ftl b/Resources/Locale/en-US/actions/actions/polymorph.ftl
new file mode 100644
index 00000000000..4a65a60ecf0
--- /dev/null
+++ b/Resources/Locale/en-US/actions/actions/polymorph.ftl
@@ -0,0 +1 @@
+gera-transformation-popup = This action will transform you. Use it again to confirm.
diff --git a/Resources/Locale/en-US/actions/ui/actionmenu.ftl b/Resources/Locale/en-US/actions/ui/actionmenu.ftl
index a6f0dee5342..47fdb43f699 100644
--- a/Resources/Locale/en-US/actions/ui/actionmenu.ftl
+++ b/Resources/Locale/en-US/actions/ui/actionmenu.ftl
@@ -9,3 +9,8 @@ ui-actionmenu-clear-button = Clear
 ui-actionsui-function-lock-action-slots = (Un)lock dragging and clearing action slots
 ui-actionsui-function-open-abilities-menu = Open action menu
 
+ui-actionmenu-enabled = Enabled
+ui-actionmenu-item = Item
+ui-actionmenu-innate = Innate
+ui-actionmenu-instant = Instant
+ui-actionmenu-targeted = Targeted
diff --git a/Resources/Locale/en-US/administration/admin-verbs.ftl b/Resources/Locale/en-US/administration/admin-verbs.ftl
index 16715087ee4..a89397bd65d 100644
--- a/Resources/Locale/en-US/administration/admin-verbs.ftl
+++ b/Resources/Locale/en-US/administration/admin-verbs.ftl
@@ -13,4 +13,6 @@ admin-verbs-erase-description = Removes the player from the round and crew manif
     Their items are dropped on the ground.
     Players are shown a popup indicating them to play as if they never existed.
 toolshed-verb-mark = Mark
-toolshed-verb-mark-description = Places this entity into the $marked variable, a list of entities, replacing it's prior value.
+toolshed-verb-mark-description = Places this entity into the $marked variable, a list of entities, replacing its prior value.
+
+export-entity-verb-get-data-text = Export sprite
diff --git a/Resources/Locale/en-US/administration/bwoink.ftl b/Resources/Locale/en-US/administration/bwoink.ftl
index 3a92f58ad18..e43932dc1d3 100644
--- a/Resources/Locale/en-US/administration/bwoink.ftl
+++ b/Resources/Locale/en-US/administration/bwoink.ftl
@@ -16,3 +16,6 @@ admin-bwoink-play-sound = Bwoink?
 bwoink-title-none-selected = None selected
 
 bwoink-system-rate-limited = System: you are sending messages too quickly.
+bwoink-system-player-disconnecting = has disconnected.
+bwoink-system-player-reconnecting = has reconnected.
+bwoink-system-player-banned = has been banned for: {$banReason}
diff --git a/Resources/Locale/en-US/administration/commands/aghost.ftl b/Resources/Locale/en-US/administration/commands/aghost.ftl
index 4de0639981e..30cd893dc8f 100644
--- a/Resources/Locale/en-US/administration/commands/aghost.ftl
+++ b/Resources/Locale/en-US/administration/commands/aghost.ftl
@@ -1,3 +1,3 @@
-aghost-description = Makes you an admin ghost.
+cmd-aghost-desc = Makes you or others an admin ghost.
 aghost-no-mind-self = You can't ghost here!
 aghost-no-mind-other = They can't ghost here!
diff --git a/Resources/Locale/en-US/administration/smites.ftl b/Resources/Locale/en-US/administration/smites.ftl
index 9cc0e9043ce..467a1577e7a 100644
--- a/Resources/Locale/en-US/administration/smites.ftl
+++ b/Resources/Locale/en-US/administration/smites.ftl
@@ -126,7 +126,7 @@ admin-trick-rename-and-redescribe-description = Convenient bundle of both rename
 admin-trick-bar-job-slots-description = Closes all job slots on the station, such that nobody can join it.
 admin-trick-locate-cargo-shuttle-description = Teleports you directly to the station's cargo shuttle, if it exists.
 admin-trick-infinite-battery-description = Reconfigures the SMESes and substations on the grid/station/map to self-recharge rapidly.
-admin-trick-infinite-battery-object-description = Reconfigures the item so that it's battery rapidly refills.
+admin-trick-infinite-battery-object-description = Reconfigures the item so that its battery rapidly refills.
 admin-trick-halt-movement-description = Halts the movement of the target object, at least until something moves it again.
 admin-trick-unpause-map-description = Unpause the selected map. NOTE THIS CAN CAUSE BAD BEHAVIOR WITH STORAGE MAPS!
 admin-trick-pause-map-description = Pause the selected map. Note this doesn't entirely stop player movement!
diff --git a/Resources/Locale/en-US/administration/ui/actions.ftl b/Resources/Locale/en-US/administration/ui/actions.ftl
index 3c13d56c948..9893eb59afc 100644
--- a/Resources/Locale/en-US/administration/ui/actions.ftl
+++ b/Resources/Locale/en-US/administration/ui/actions.ftl
@@ -7,6 +7,7 @@ admin-player-actions-ahelp = AHelp
 admin-player-actions-respawn = Respawn
 admin-player-actions-spawn = Spawn here
 admin-player-spawn-failed = Failed to find valid coordinates
+admin-player-actions-player-panel = Open Player Panel
 
 admin-player-actions-clone = Clone
 admin-player-actions-follow = Follow
diff --git a/Resources/Locale/en-US/administration/ui/player-panel.ftl b/Resources/Locale/en-US/administration/ui/player-panel.ftl
new file mode 100644
index 00000000000..ed63dd6d10f
--- /dev/null
+++ b/Resources/Locale/en-US/administration/ui/player-panel.ftl
@@ -0,0 +1,22 @@
+player-panel-title = information for {$player}
+player-panel-username = Username: {$player}
+player-panel-whitelisted = Whitelisted:
+player-panel-bans = Total Bans: {$totalBans}
+player-panel-rolebans = Total Role Bans: {$totalRoleBans}
+player-panel-notes = Total Notes: {$totalNotes}
+player-panel-playtime = Total Playtime: {$days}d:{$hours}h:{$minutes}m
+player-panel-shared-connections = Shared Connections: {$sharedConnections}
+
+player-panel-copy-username = Copy
+player-panel-show-notes = Notes
+player-panel-show-bans = Show Bans
+player-panel-help = Ahelp
+player-panel-freeze-and-mute = Freeze & Mute
+player-panel-freeze = Freeze
+player-panel-unfreeze = Unfreeze
+player-panel-kick = Kick
+player-panel-ban = Ban
+player-panel-logs = Logs
+player-panel-delete = Delete
+player-panel-rejuvenate = Rejuvenate
+player-panel-false = False
diff --git a/Resources/Locale/en-US/administration/ui/silicon-law-ui.ftl b/Resources/Locale/en-US/administration/ui/silicon-law-ui.ftl
new file mode 100644
index 00000000000..0a68d08063a
--- /dev/null
+++ b/Resources/Locale/en-US/administration/ui/silicon-law-ui.ftl
@@ -0,0 +1,10 @@
+silicon-law-ui-verb = Manage laws
+silicon-law-ui-title = Silicon laws
+silicon-law-ui-new-law = New law
+silicon-law-ui-save = Save changes
+silicon-law-ui-plus-one = +1
+silicon-law-ui-minus-one = -1
+silicon-law-ui-delete = Delete
+silicon-law-ui-check-corrupted = Corrupted law
+silicon-law-ui-check-corrupted-tooltip = If the law identifier should be set as 'corrupted', so symbols shuffling around.
+silicon-law-ui-placeholder = Type here to change law text...
diff --git a/Resources/Locale/en-US/administration/ui/tabs/object-tab.ftl b/Resources/Locale/en-US/administration/ui/tabs/object-tab.ftl
index da84ea4f163..3f49a4ad9cf 100644
--- a/Resources/Locale/en-US/administration/ui/tabs/object-tab.ftl
+++ b/Resources/Locale/en-US/administration/ui/tabs/object-tab.ftl
@@ -8,3 +8,6 @@ object-tab-object-type-grids = Grids
 object-tab-object-type-maps = Maps
 object-tab-object-type-stations = Stations
 object-tab-refresh-button = Refresh
+
+object-tab-entity-teleport = Teleport
+object-tab-entity-delete = Delete
diff --git a/Resources/Locale/en-US/advertisements/vending/atmosdrobe.ftl b/Resources/Locale/en-US/advertisements/vending/atmosdrobe.ftl
index 642d142fbfb..f7bc093e1cf 100644
--- a/Resources/Locale/en-US/advertisements/vending/atmosdrobe.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/atmosdrobe.ftl
@@ -1,3 +1,5 @@
 advertisement-atmosdrobe-1 = Get your inflammable clothing right here!!!
 advertisement-atmosdrobe-2 = Protects you against plasma fires!
-advertisement-atmosdrobe-3 = Enjoy your off-brand engineering clothing!
\ No newline at end of file
+advertisement-atmosdrobe-3 = Enjoy your off-brand engineering clothing!
+advertisement-atmosdrobe-4 = Always under control of your atmosphere!
+advertisement-atmosdrobe-5 = Providing comfort in every breath!
diff --git a/Resources/Locale/en-US/advertisements/vending/chefdrobe.ftl b/Resources/Locale/en-US/advertisements/vending/chefdrobe.ftl
index a681a7acedf..025c731ff32 100644
--- a/Resources/Locale/en-US/advertisements/vending/chefdrobe.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/chefdrobe.ftl
@@ -1,3 +1,4 @@
-advertisement-chefdrobe-1 = Our clothes are guaranteed to protect you from food splatters!
+advertisement-chefdrobe-1 = Our clothes are guaranteed to protect you from food splatters!
 advertisement-chefdrobe-2 = Perfectly white, so everyone knows about the murder in the kitchen!
 advertisement-chefdrobe-3 = Easy to clean, easy to see!
+advertisement-chefdrobe-4 = Cook like a pro, look like a maestro!
diff --git a/Resources/Locale/en-US/advertisements/vending/chemdrobe.ftl b/Resources/Locale/en-US/advertisements/vending/chemdrobe.ftl
index 4472ced15ed..5dd4f87dc3c 100644
--- a/Resources/Locale/en-US/advertisements/vending/chemdrobe.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/chemdrobe.ftl
@@ -1,3 +1,4 @@
 advertisement-chemdrobe-1 = Our clothes are 0.5% more resistant to acid spills! Get yours now!
 advertisement-chemdrobe-2 = Professional laboratory clothing, designed by NanoTrasen!
-advertisement-chemdrobe-3 = I'm pretty sure these will protect you against acid spills!
\ No newline at end of file
+advertisement-chemdrobe-3 = I'm pretty sure these will protect you against acid spills!
+advertisement-chemdrobe-4 = The best fashion formula!
diff --git a/Resources/Locale/en-US/advertisements/vending/donut.ftl b/Resources/Locale/en-US/advertisements/vending/donut.ftl
index daa93928b6c..af801f621c4 100644
--- a/Resources/Locale/en-US/advertisements/vending/donut.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/donut.ftl
@@ -3,6 +3,7 @@ advertisement-donut-2 = Hope you're hunger!
 advertisement-donut-3 = Over 1 million donuts sold!
 advertisement-donut-4 = We pride ourselves in the consistency of our products!
 advertisement-donut-5 = Sweet, sugary and delicious!
+advertisement-donut-6 = Donut worry, be happy!
 thankyou-donut-1 = Enjoy your donut!
 thankyou-donut-2 = Another donut sold!
 thankyou-donut-3 = Have a nice day, officer!
diff --git a/Resources/Locale/en-US/advertisements/vending/hydrobe.ftl b/Resources/Locale/en-US/advertisements/vending/hydrobe.ftl
index f1fdc4fccc2..64b38d8e3ae 100644
--- a/Resources/Locale/en-US/advertisements/vending/hydrobe.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/hydrobe.ftl
@@ -1,4 +1,5 @@
 advertisement-hydrobe-1 = Do you love soil? Then buy our clothes!
 advertisement-hydrobe-2 = Get outfits to match your green thumb here!
 advertisement-hydrobe-3 = Here to give you an outfit perfect for handling plants!
-advertisement-hydrobe-4 = Perfect outfits for tree huggers... or just literal trees!
\ No newline at end of file
+advertisement-hydrobe-4 = Perfect outfits for tree huggers... or just literal trees!
+advertisement-hydrobe-5 = Wear green and grow!
diff --git a/Resources/Locale/en-US/advertisements/vending/janidrobe.ftl b/Resources/Locale/en-US/advertisements/vending/janidrobe.ftl
index 7c39a9ad4a2..a23f878e749 100644
--- a/Resources/Locale/en-US/advertisements/vending/janidrobe.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/janidrobe.ftl
@@ -1,4 +1,5 @@
 advertisement-janidrobe-1 = Come and get your janitorial clothing, now endorsed by lizard janitors everywhere!
 advertisement-janidrobe-2 = Here to keep you clean as you clean up non-clean things!
 advertisement-janidrobe-3 = Stylishly yellow!
-
+advertisement-janidrobe-4 = Polish your appearance with JaniDrobe!
+advertisement-janidrobe-5 = Shine like a shiny floor!
diff --git a/Resources/Locale/en-US/advertisements/vending/lawdrobe.ftl b/Resources/Locale/en-US/advertisements/vending/lawdrobe.ftl
index d91ca5e3dfe..64849d93414 100644
--- a/Resources/Locale/en-US/advertisements/vending/lawdrobe.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/lawdrobe.ftl
@@ -6,8 +6,9 @@ advertisement-lawdrobe-5 = No one is above the law!
 advertisement-lawdrobe-6 = No officer, I do not consent to a search!
 advertisement-lawdrobe-7 = Injecting space drugs leaves no evidence!
 advertisement-lawdrobe-8 = You or a loved one hurt by Nanotrasen? Too bad!
+advertisement-lawdrobe-9 = Case closed! Defendant has too much drip!
 thankyou-lawdrobe-1 = You can win any case in that outfit!
 thankyou-lawdrobe-2 = Get one for your client as well!
 thankyou-lawdrobe-3 = Win or lose, you get paid either way!
-thankyou-lawdrobe-4 = Remember: Its only illegal if you get caught!
+thankyou-lawdrobe-4 = Remember: It's only illegal if you get caught!
 thankyou-lawdrobe-5 = OBJECTION! That outfit is too cool for court!
diff --git a/Resources/Locale/en-US/advertisements/vending/medidrobe.ftl b/Resources/Locale/en-US/advertisements/vending/medidrobe.ftl
index 68b18a83909..980628a0cea 100644
--- a/Resources/Locale/en-US/advertisements/vending/medidrobe.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/medidrobe.ftl
@@ -1,3 +1,4 @@
 advertisement-medidrobe-1 = Make those blood stains look fashionable!!
 advertisement-medidrobe-2 = Clean and hygienic! Don't get too many bloodstains on yourself!
 advertisement-medidrobe-3 = With these outfits, you'll look like a professional doctor now!
+advertisement-medidrobe-4 = Jumpsuit, check. Coat, check. Someone who will wear this? Check!
diff --git a/Resources/Locale/en-US/anomaly/anomaly.ftl b/Resources/Locale/en-US/anomaly/anomaly.ftl
index da5882fa62f..c8d099777d4 100644
--- a/Resources/Locale/en-US/anomaly/anomaly.ftl
+++ b/Resources/Locale/en-US/anomaly/anomaly.ftl
@@ -89,6 +89,7 @@ anomaly-behavior-rapid = The frequency of the pulsation is much higher, but its
 anomaly-behavior-reflect = A protective coating was detected.
 anomaly-behavior-nonsensivity = A weak reaction to particles was detected.
 anomaly-behavior-sensivity = Amplified reaction to particles was detected.
+anomaly-behavior-invisibility = Light wave distortion has been detected.
 anomaly-behavior-secret = Interference detected. Some data cannot be read
 anomaly-behavior-inconstancy = [color=crimson]Impermanence has been detected. Particle types can change over time.[/color]
 anomaly-behavior-fast = [color=crimson]The pulsation frequency is strongly increased.[/color]
diff --git a/Resources/Locale/en-US/atmos/gas-miner-component.ftl b/Resources/Locale/en-US/atmos/gas-miner-component.ftl
new file mode 100644
index 00000000000..87016e4522d
--- /dev/null
+++ b/Resources/Locale/en-US/atmos/gas-miner-component.ftl
@@ -0,0 +1,11 @@
+gas-miner-mines-text = It mines [color=lightgray]{$gas}[/color] when active.
+
+gas-miner-amount-text = It mines {$moles} moles of gas a second when active.
+gas-miner-temperature-text = Mined gas temp: {$tempK}K ({$tempC}°C).
+
+gas-miner-moles-cutoff-text = Surrounding moles cutoff: {$moles} moles.
+gas-miner-pressure-cutoff-text = Surrounding pressure cutoff: {$pressure} kPA.
+
+gas-miner-state-working-text = The miner is [color=green]active[/color] and mining gas.
+gas-miner-state-idle-text = The miner is [color=yellow]idle[/color] and not mining gas.
+gas-miner-state-disabled-text = The miner is [color=red]disabled[/color] and not mining gas.
\ No newline at end of file
diff --git a/Resources/Locale/en-US/cargo/bounties.ftl b/Resources/Locale/en-US/cargo/bounties.ftl
index 09424e49097..91b8348f057 100644
--- a/Resources/Locale/en-US/cargo/bounties.ftl
+++ b/Resources/Locale/en-US/cargo/bounties.ftl
@@ -65,9 +65,10 @@ bounty-item-cardboard-box = Cardboard box
 bounty-item-wine = Wine bottle
 bounty-item-cotton-boll = Cotton boll
 bounty-item-microwave-machine-board = Microwave machine board
+bounty-item-flash = Flash
 
 bounty-description-artifact = NanoTrasen is in some hot water for stealing artifacts from non-spacefaring planets. Return one and we'll compensate you for it.
-bounty-description-baseball-bat = Baseball fever is going on at CentCom! Be a dear and ship them some baseball bats, so that management can live out their childhood dream.
+bounty-description-baseball-bat = Baseball fever is going on at CentComm! Be a dear and ship them some baseball bats, so that management can live out their childhood dream.
 bounty-description-box-hugs = Several chief officials have sustained serious boo-boos. A box of hugs is urgently needed to aid in their recovery.
 bounty-description-brain = Commander Caldwell was rendered brain-dead by a recent space lube accident. Unfortunately, we can't hire a replacement, so just send us a new brain to put in her instead.
 bounty-description-bread = Problems with central planning have led to bread prices skyrocketing. Ship some bread to ease tensions.
@@ -77,9 +78,9 @@ bounty-description-carp = Admiral Pavlov has gone on strike ever since Central C
 bounty-description-clown-costume = Due to a recent issue at a space carp petting zoo, we've unfortunately lost Bonobobonobo the Clown. Send us a new costume so the kids can see him once more.
 bounty-description-corn = After the recent destruction of Space Ohio, our corn imports are down 80%. Send us some so we can make up for it.
 bounty-description-crayon = Dr Jones' kid ate all our crayons again. Please send us yours.
-bounty-description-cuban-carp = To celebrate the birth of Castro XXVII, ship one cuban carp to CentCom.
-bounty-description-donk-pocket = Consumer safety recall: Warning. Donk-Pockets manufactured in the past year contain hazardous lizard biomatter. Return units to CentCom immediately.
-bounty-description-donut = CentCom's security forces are facing heavy losses against the Syndicate. Ship donuts to raise morale.
+bounty-description-cuban-carp = To celebrate the birth of Castro XXVII, ship one cuban carp to CentComm.
+bounty-description-donk-pocket = Consumer safety recall: Warning. Donk-Pockets manufactured in the past year contain hazardous lizard biomatter. Return units to CentComm immediately.
+bounty-description-donut = CentComm's security forces are facing heavy losses against the Syndicate. Ship donuts to raise morale.
 bounty-description-figurine = The vice president's son saw an ad for action figures on the telescreen and now he won't shut up about them. Ship some to ease his complaints.
 bounty-description-flesh-monster = We've recently receieved reports of some kind of flesh monster infestation onboard several stations. Send us a few samples of these creatures so we can investigate new botanical opportunities.
 bounty-description-flower = Commander Zot really wants to sweep Security Officer Olivia off her feet. Send a shipment of flowers and he'll happily reward you.
@@ -95,18 +96,18 @@ bounty-description-mouse = Station 13 ran out of freeze-dried mice. Ship some fr
 bounty-description-pancake = Here at Nanotrasen we consider employees to be family. And you know what families love? Pancakes. Ship a baker's dozen.
 bounty-description-pen = We are hosting the intergalactic pen balancing competition. We need you to send us some standardized ball point pens.
 bounty-description-percussion = Due to a poorly timed barfight, the United Galaxy-wide Mixed Percussion Ensemble lost all of their instruments. Send them a new set so they can jam once more.
-bounty-description-pie = 3.14159? No! CentCom management wants edible pie! Ship a whole one.
+bounty-description-pie = 3.14159? No! CentComm management wants edible pie! Ship a whole one.
 bounty-description-prison-uniform = Terragov has been unable to source any new prisoner uniforms, so if you have any spares, we'll take them off your hands.
 bounty-description-radio = A recent solar flare has fried all of our communication devices. Send us a new set of radios for our engineering crew so we can repair the network.
 bounty-description-research-disk = Turns out those bozos in the Research department have been spending all their time getting janitorial equipment. Send some research up to Central Command so we can actually get what we need.
 bounty-description-shiv = Bzzzt... Transmission from prison planet OC-1001: we're facing an onslaught of uhm... "invaders." Yeah, invaders. Send us some shivs to fight them off with.
-bounty-description-soap = Soap has gone missing from CentCom's bathrooms and nobody knows who took it. Replace it and be the hero CentCom needs.
+bounty-description-soap = Soap has gone missing from CentComm's bathrooms and nobody knows who took it. Replace it and be the hero CentComm needs.
 bounty-description-soup = To quell the homeless uprising, Nanotrasen will be serving soup to all underpaid workers. Ship any type of soup.
-bounty-description-spear = CentCom's security forces are going through budget cuts. You will be paid if you ship a set of spears.
+bounty-description-spear = CentComm's security forces are going through budget cuts. You will be paid if you ship a set of spears.
 bounty-description-syringe = The NT anti-drug task force is in need of some syringes in order to distribute them to low-income communities. Help some keep some peoples' jobs secure.
 bounty-description-toolbox = There's an absence of robustness at Central Command. Hurry up and ship some toolboxes as a solution.
 bounty-description-tech-disk = The new research assistant on Station 13 spilled a soda on the RND server. Send them some technology disks so they can build up their recipes.
-bounty-description-trash = Recently a group of janitors have run out of trash to clean up, without any trash Centcom wants to fire them to cut costs. Send a shipment of trash to keep them employed, and they'll give you a small compensation.
+bounty-description-trash = Recently a group of janitors have run out of trash to clean up, without any trash Centcomm wants to fire them to cut costs. Send a shipment of trash to keep them employed, and they'll give you a small compensation.
 bounty-description-anomaly-core = Suddenly we've run out of anomaly cores, including inert nuclei. Send us any anomaly cores so that we can continue to observe their final decay process.
 bounty-description-borg-module = Scientists at the neighboring station have only studied Borg production, not module production. They are stuck in the research process and need references to work from. Send any Borg modules to inspire your colleagues.
 bounty-description-artifact-fragment = Scientists at a nearby station are requesting artifact fragments for microxenoarchaeology studies. Ordinary artifacts are too large for their micro research platforms. Send some of the artifact fragments your sector is rich in.
@@ -132,3 +133,4 @@ bounty-description-cardobard-box = "The Cardborgs Cometh" is a new play premieri
 bounty-description-wine = The new librarian and the Quartermaster are falling head over heels for each other after she caught him disassembling the bookshelves for wood. Send a couple bottles of wine (Or cans, if you must) to help make the date go well.
 bounty-description-cotton-boll = A massive swarm of mothroaches ate all the paper and cloth on the station. Send us some cotton to help keep our winged crewmembers fed.
 bounty-description-microwave-machine-board = Mr. Giggles thought it'd be funny to stick forks in all the kitchen microwaves. Help us replace them before the chefs start making clown burgers.
+bounty-description-flashes = GREETINGS \[Station] WE REQUIRE 6 FLASHES DUE TO A NORMAL \[TrainingExercise] WITH SECURITY. EVERYTHING IS \[Normal].
diff --git a/Resources/Locale/en-US/cargo/cargo-console-component.ftl b/Resources/Locale/en-US/cargo/cargo-console-component.ftl
index 3c032488b52..7114924c026 100644
--- a/Resources/Locale/en-US/cargo/cargo-console-component.ftl
+++ b/Resources/Locale/en-US/cargo/cargo-console-component.ftl
@@ -30,7 +30,7 @@ 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-unlock-approved-order-broadcast = [bold]{$productName} x{$orderAmount}[/bold], which cost [bold]{$cost}[/bold], was approved by [bold]{$approverName}, {$approverJob}[/bold]
+cargo-console-unlock-approved-order-broadcast = [bold]{$productName} x{$orderAmount}[/bold], which cost [bold]{$cost}[/bold], was approved by [bold]{$approver}[/bold]
 
 cargo-console-paper-print-name = Order #{$orderNumber}
 cargo-console-paper-print-text =
diff --git a/Resources/Locale/en-US/character-appearance/components/magic-mirror-component.ftl b/Resources/Locale/en-US/character-appearance/components/magic-mirror-component.ftl
index e9018171a40..0906cccee50 100644
--- a/Resources/Locale/en-US/character-appearance/components/magic-mirror-component.ftl
+++ b/Resources/Locale/en-US/character-appearance/components/magic-mirror-component.ftl
@@ -1,3 +1,15 @@
 magic-mirror-component-activate-user-has-no-hair = You can't have any hair!
 
-magic-mirror-window-title = Magic Mirror
\ No newline at end of file
+magic-mirror-window-title = Magic Mirror
+magic-mirror-add-slot-self = You're giving yourself some hair.
+magic-mirror-remove-slot-self = You're removing some of your hair.
+magic-mirror-change-slot-self = You're changing your hairstyle.
+magic-mirror-change-color-self = You're changing your hair color.
+
+magic-mirror-add-slot-target = Hair is being added to you by {$user}.
+magic-mirror-remove-slot-target = Your hair is being cut off by {$user}.
+magic-mirror-change-slot-target = Your hairstyle is being changed by {$user}.
+magic-mirror-change-color-target = Your hair color is being changed by {$user}.
+
+magic-mirror-blocked-by-hat-self = You need to take off your hat before changing your hair.
+magic-mirror-blocked-by-hat-self-target = You try to change their hair but their clothes gets in the way.
diff --git a/Resources/Locale/en-US/character-info/components/character-info-component.ftl b/Resources/Locale/en-US/character-info/components/character-info-component.ftl
index 07a0dd696a3..b515c36c5a5 100644
--- a/Resources/Locale/en-US/character-info/components/character-info-component.ftl
+++ b/Resources/Locale/en-US/character-info/components/character-info-component.ftl
@@ -1,3 +1,4 @@
 character-info-title = Character
 character-info-roles-antagonist-text = Antagonist Roles
 character-info-objectives-label = Objectives
+character-info-no-profession = No Profession
diff --git a/Resources/Locale/en-US/chat/managers/chat-manager.ftl b/Resources/Locale/en-US/chat/managers/chat-manager.ftl
index 787bb660283..083274da3f9 100644
--- a/Resources/Locale/en-US/chat/managers/chat-manager.ftl
+++ b/Resources/Locale/en-US/chat/managers/chat-manager.ftl
@@ -19,6 +19,7 @@ chat-manager-no-such-channel = There is no channel with key '{$key}'!
 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 = Central Command
 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][Name]{$entityName}[/Name][/BubbleHeader] {$verb}, [font={$fontType} size={$fontSize}]"[BubbleContent]{$message}[/BubbleContent]"[/font]
diff --git a/Resources/Locale/en-US/chemistry/components/mixing-component.ftl b/Resources/Locale/en-US/chemistry/components/mixing-component.ftl
index a486ed8ede3..c434246fab7 100644
--- a/Resources/Locale/en-US/chemistry/components/mixing-component.ftl
+++ b/Resources/Locale/en-US/chemistry/components/mixing-component.ftl
@@ -6,9 +6,12 @@ mixing-verb-default-condense = condense
 mixing-verb-centrifuge = centrifugation
 mixing-verb-electrolysis = electrolyze
 mixing-verb-holy = bless
+mixing-verb-stir = stir
+mixing-verb-shake = shake
 
 ## Entity
 
 default-mixing-success = You mix the {$mixed} with the {$mixer}
 bible-mixing-success = You bless the {$mixed} with the {$mixer}
+spoon-mixing-success = You stir the {$mixed} with the {$mixer}
 
diff --git a/Resources/Locale/en-US/chemistry/components/solution-transfer-component.ftl b/Resources/Locale/en-US/chemistry/components/solution-transfer-component.ftl
index 601392069b0..b966a9cc61d 100644
--- a/Resources/Locale/en-US/chemistry/components/solution-transfer-component.ftl
+++ b/Resources/Locale/en-US/chemistry/components/solution-transfer-component.ftl
@@ -15,3 +15,6 @@ comp-solution-transfer-verb-toggle = Toggle to {$amount}u
 
 ## Displayed after you successfully change a solution's amount using the BUI
 comp-solution-transfer-set-amount = Transfer amount set to {$amount}u.
+comp-solution-transfer-set-amount-max = Max: {$amount}u
+comp-solution-transfer-set-amount-min = Min: {$amount}u
+
diff --git a/Resources/Locale/en-US/commands/colornetwork-command.ftl b/Resources/Locale/en-US/commands/colornetwork-command.ftl
new file mode 100644
index 00000000000..3fd60bcb89f
--- /dev/null
+++ b/Resources/Locale/en-US/commands/colornetwork-command.ftl
@@ -0,0 +1,3 @@
+cmd-colornetwork-desc = Paints the atmos devices in the specified color
+cmd-colornetwork-help = colornetwork <uid> Pipe <HexColor>
+cmd-colornetwork-no-access = You are not currently able to use mapping commands.
diff --git a/Resources/Locale/en-US/commands/job-whitelist-command.ftl b/Resources/Locale/en-US/commands/job-whitelist-command.ftl
index 7fa20f03dec..a188f9ba5ce 100644
--- a/Resources/Locale/en-US/commands/job-whitelist-command.ftl
+++ b/Resources/Locale/en-US/commands/job-whitelist-command.ftl
@@ -9,12 +9,12 @@ cmd-jobwhitelistadd-already-whitelisted = {$player} is already whitelisted to pl
 cmd-jobwhitelistadd-added = Added {$player} to the {$jobId} ({$jobName}) whitelist.
 
 cmd-jobwhitelistget-desc = Gets all the jobs that a player has been whitelisted for.
-cmd-jobwhitelistget-help = Usage: jobwhitelistadd <username>
+cmd-jobwhitelistget-help = Usage: jobwhitelistget <username>
 cmd-jobwhitelistget-whitelisted-none = Player {$player} is not whitelisted for any jobs.
 cmd-jobwhitelistget-whitelisted-for = "Player {$player} is whitelisted for:
 {$jobs}"
 
 cmd-jobwhitelistremove-desc = Removes a player's ability to play a whitelisted job.
-cmd-jobwhitelistremove-help = Usage: jobwhitelistadd <username> <job>
+cmd-jobwhitelistremove-help = Usage: jobwhitelistremove <username> <job>
 cmd-jobwhitelistremove-was-not-whitelisted = {$player} was not whitelisted to play as {$jobId} ({$jobName}).
 cmd-jobwhitelistremove-removed = Removed {$player} from the whitelist for {$jobId} ({$jobName}).
diff --git a/Resources/Locale/en-US/commands/stat-values-command.ftl b/Resources/Locale/en-US/commands/stat-values-command.ftl
index 99c6bd194e3..67a211adabe 100644
--- a/Resources/Locale/en-US/commands/stat-values-command.ftl
+++ b/Resources/Locale/en-US/commands/stat-values-command.ftl
@@ -18,3 +18,8 @@ stat-lathe-sell = Sell price
 stat-item-values = Item sizes
 stat-item-id = ID
 stat-item-price = Size
+
+# Draw Rate
+stat-drawrate-values = APC draw rate
+stat-drawrate-id = ID
+stat-drawrate-rate = Draw Rate (W)
diff --git a/Resources/Locale/en-US/commands/zoom-command.ftl b/Resources/Locale/en-US/commands/zoom-command.ftl
index 0132f222405..64bf6bca7af 100644
--- a/Resources/Locale/en-US/commands/zoom-command.ftl
+++ b/Resources/Locale/en-US/commands/zoom-command.ftl
@@ -1,3 +1,3 @@
-cmd-zoom-desc = Sets the zoom of the main eye.
-cmd-zoom-help = zoom ( <scale> | <X-scale> <Y-scale> )
+cmd-zoom-desc = Sets the zoom of the main eye. Optionally also changes the eye's PVS range.
+cmd-zoom-help = zoom ( <scale> | <X-scale> <Y-scale> [bool])
 cmd-zoom-error = scale has to be greater than 0
diff --git a/Resources/Locale/en-US/communications/communications-console-component.ftl b/Resources/Locale/en-US/communications/communications-console-component.ftl
index bead43df286..d3200914b3c 100644
--- a/Resources/Locale/en-US/communications/communications-console-component.ftl
+++ b/Resources/Locale/en-US/communications/communications-console-component.ftl
@@ -5,6 +5,7 @@ comms-console-menu-announcement-button = Announce
 comms-console-menu-broadcast-button = Broadcast
 comms-console-menu-call-shuttle = Call emergency shuttle
 comms-console-menu-recall-shuttle = Recall emergency shuttle
+comms-console-menu-time-remaining = Time remaining: {$time}
 
 # Popup
 comms-console-permission-denied = Permission denied
diff --git a/Resources/Locale/en-US/connection-messages.ftl b/Resources/Locale/en-US/connection-messages.ftl
index f1596d90152..309e8fc2f83 100644
--- a/Resources/Locale/en-US/connection-messages.ftl
+++ b/Resources/Locale/en-US/connection-messages.ftl
@@ -11,14 +11,14 @@ whitelist-playercount-invalid = {$min ->
 whitelist-not-whitelisted-rp = You are not whitelisted. To become whitelisted, visit our Discord (which can be found at https://spacestation14.io) and check the #rp-whitelist channel.
 
 cmd-whitelistadd-desc = Adds the player with the given username to the server whitelist.
-cmd-whitelistadd-help = Usage: whitelistadd <username>
+cmd-whitelistadd-help = Usage: whitelistadd <username or User ID>
 cmd-whitelistadd-existing = {$username} is already on the whitelist!
 cmd-whitelistadd-added = {$username} added to the whitelist
 cmd-whitelistadd-not-found = Unable to find '{$username}'
 cmd-whitelistadd-arg-player = [player]
 
 cmd-whitelistremove-desc = Removes the player with the given username from the server whitelist.
-cmd-whitelistremove-help = Usage: whitelistremove <username>
+cmd-whitelistremove-help = Usage: whitelistremove <username or User ID>
 cmd-whitelistremove-existing = {$username} is not on the whitelist!
 cmd-whitelistremove-removed = {$username} removed from the whitelist
 cmd-whitelistremove-not-found = Unable to find '{$username}'
diff --git a/Resources/Locale/en-US/cuffs/components/handcuff-component.ftl b/Resources/Locale/en-US/cuffs/components/handcuff-component.ftl
index 16447f42515..a4de62ede48 100644
--- a/Resources/Locale/en-US/cuffs/components/handcuff-component.ftl
+++ b/Resources/Locale/en-US/cuffs/components/handcuff-component.ftl
@@ -15,3 +15,4 @@ handcuff-component-cuff-interrupt-other-message = You interrupt {$otherName} whi
 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!
+handcuff-component-cannot-drop-cuffs = You are unable to put the restraints on {$target}
diff --git a/Resources/Locale/en-US/datasets/figurines.ftl b/Resources/Locale/en-US/datasets/figurines.ftl
new file mode 100644
index 00000000000..900f09ed37d
--- /dev/null
+++ b/Resources/Locale/en-US/datasets/figurines.ftl
@@ -0,0 +1,165 @@
+figurines-hop-1 = Papers, please.
+figurines-hop-2 = You are fired.
+
+figurines-passenger-1 = How to change hands?
+figurines-passenger-2 = Call evac.
+
+figurines-greytider-1 = Man, this party stinks. I fucking hate these people.
+figurines-greytider-2 = Uh-oh, who's lost their stunbaton?
+figurines-greytider-3 = Robust.
+figurines-greytider-4 = I'm not me without a toolbox.
+figurines-greytider-5 = Grey tide station wide!
+
+figurines-clown-1 = Honk!
+figurines-clown-2 = Banana!
+figurines-clown-3 = Soap!
+figurines-clown-4 = HoP has one clown, HoS has the whole department.
+figurines-clown-5 = Do I annoy you?
+
+figurines-holoclown-1 = I'm helping my older brother.
+
+figurines-mime-1 = ...
+figurines-mime-2 = ...
+figurines-mime-3 = ....
+figurines-mime-4 = .......
+figurines-mime-5 = ................
+
+figurines-musician-1 = Never gonna give you up!
+figurines-musician-2 = Never gonna let you down!
+
+# figurines-boxer-
+
+figurines-captain-1 = Glory to NT!
+
+figurines-hos-1 = Space law? What?
+figurines-hos-2 = Shot the clown.
+
+figurines-warden-1 = Execute him for breaking in!
+
+figurines-detective-1 = The butler did it.
+
+figurines-security-1 = I am the law!
+figurines-security-2 = You have violated article 1984.
+
+figurines-lawyer-1 = Better Call Saul!
+figurines-lawyer-2 = Objection!
+
+figurines-cargotech-1 = DRAGON ON ATS!
+figurines-cargotech-2 = I sold the station!
+figurines-cargotech-3 = Brain bounty? I don't have a brain.
+
+figurines-salvage-1 = Megafauna? It was mega easy.
+
+figurines-qm-1 = Who stole the shuttle?
+figurines-qm-2 = I won't approve the guns.
+figurines-qm-3 = I didn't buy those guns!
+figurines-qm-4 = One toys crate for ma fellow clown!
+figurines-qm-5 = Time to spent all money on gambling.
+figurines-qm-6 = Viva La Cargonia!
+figurines-qm-7 = Fill the form.
+
+figurines-ce-1 = Everyone to the briefing!
+figurines-ce-2 = Wire the solars!
+figurines-ce-3 = How to setup the TEG?
+figurines-ce-4 = SINGULOOSE!
+figurines-ce-5 = TESLOOSE!
+
+figurines-engineer-1 = SINGULOOSE!
+figurines-engineer-2 = TESLOOSE!
+figurines-engineer-3 = What is AME?
+
+figurines-atmostech-1 = I put plasma in distro.
+figurines-atmostech-2 = I will burn you in a burn chamber.
+figurines-atmostech-3 = Frezon...
+figurines-atmostech-4 = Tritium...
+figurines-atmostech-5 = Glory to Atmosia!
+
+figurines-rd-1 = Blowing all of the borgs!
+figurines-rd-2 = Tier 3 arsenal? No way.
+
+figurines-scientist-1 = Someone else must have made those bombs!
+figurines-scientist-2 = He asked to be borged!
+figurines-scientist-3 = Carp at sci!
+figurines-scientist-4 = Explosion at sci.
+figurines-scientist-5 = The anomaly has exploded.
+
+figurines-cmo-1 = Suit sensors!
+figurines-cmo-2 = Why do we have meth?
+
+figurines-chemist-1 = Get your pills!
+
+figurines-paramedic-1 = Insuls and tools!
+figurines-paramedic-2 = I need AA for saving people!
+
+figurines-doctor-1 = The patient is already dead!
+figurines-doctor-2 = CLEAR!
+figurines-doctor-3 = Saw makes BRRR.
+
+figurines-librarian-1 = One day while...
+figurines-librarian-2 = Silence!
+
+figurines-chaplain-1 = Would you like to join my cul- I mean religion.
+figurines-chaplain-2 = Gods make me a killing machine please!
+figurines-chaplain-3 = God exists!
+
+figurines-chef-1 = I swear it's not human meat.
+
+figurines-bartender-1 = Where's my monkey?
+figurines-bartender-2 = Sec won't drink.
+
+figurines-botanist-1 = I don't have any weed, officer!
+figurines-botanist-2 = Dude, I see colors...
+
+figurines-janitor-1 = Clown stole my soap. Again.
+figurines-janitor-2 = Look at the signs, you idiot.
+
+figurines-nukie-1 = I got the disk!
+figurines-nukie-2 = Whiskey, Echo, Whiskey.
+figurines-nukie-3 = The nuke makes boom.
+figurines-nukie-4 = What's the code?
+
+figurines-nukie-elite-1 = Not a word in nanotrasen.
+figurines-nukie-elite-2 = THAT'S A KEG!
+figurines-nukie-elite-3 = Guys are you alive?
+
+figurines-nukie-commander-1 = GET DAT FUKKEN DISK!
+
+figurines-footsoldier-1 = I'm an evil boy. Less boy every day, more evil every day.
+figurines-footsoldier-2 = Who will you choose? Them or us? Us or them?
+
+figurines-wizard-1 = Ei Nath!
+figurines-wizard-2 = Wehgardium Leviosa!
+figurines-wizard-3 = Skidaddle skadoodle!
+figurines-wizard-4 = FIREBALL!
+
+figurines-space-dragon-1 = Fish will consume the station.
+
+# figurines-queen
+
+figurines-rat-king-1 = Gimme some food, capiche?
+figurines-rat-king-2 = Fugeddaboutit.
+figurines-rat-king-3 = Whack 'em!
+
+figurines-rat-servant-1 = Capiche!
+figurines-rat-servant-2 = Boss says!
+
+figurines-mouse-1 = Piep!
+figurines-mouse-2 = Squeak!
+figurines-mouse-3 = Chuu!
+figurines-mouse-4 = Eeee!
+figurines-mouse-5 = Pip!
+figurines-mouse-6 = Fwiep!
+figurines-mouse-7 = Heep!
+
+figurines-slime-1 = Blyump.
+figurines-slime-2 = Blimpuf?
+figurines-slime-3 = Blump!
+
+figurines-hamlet-1 = Piep!
+figurines-hamlet-2 = Squeak!
+figurines-hamlet-3 = Chuu!
+figurines-hamlet-4 = Eeee!
+figurines-hamlet-5 = Pip!
+figurines-hamlet-6 = Fwiep!
+figurines-hamlet-7 = Heep!
+figurines-hamlet-8 = NOT THE MICROWAVE!
diff --git a/Resources/Locale/en-US/deltav/job/department-desc.ftl b/Resources/Locale/en-US/deltav/job/department-desc.ftl
index 530a1b0a5ae..4e19e50c340 100644
--- a/Resources/Locale/en-US/deltav/job/department-desc.ftl
+++ b/Resources/Locale/en-US/deltav/job/department-desc.ftl
@@ -1,2 +1,3 @@
+department-Epistemics-description = Research artifacts and anomalies to invent new equipment for the station, while trying to keep glimmer tame.
+department-Logistics-description = Complete bounties, earn Spesos and deliver useful supplies to the crew.
 department-Justice-description = Uphold justice on the station.
-
diff --git a/Resources/Locale/en-US/deltav/job/department.ftl b/Resources/Locale/en-US/deltav/job/department.ftl
index 2653e8f46cc..43d9ad464bc 100644
--- a/Resources/Locale/en-US/deltav/job/department.ftl
+++ b/Resources/Locale/en-US/deltav/job/department.ftl
@@ -1,4 +1,3 @@
 department-Epistemics = Epistemics
 department-Logistics = Logistics
 department-Justice = Justice
-
diff --git a/Resources/Locale/en-US/deltav/job/job-names.ftl b/Resources/Locale/en-US/deltav/job/job-names.ftl
index 051cacc60c8..622254ff1c1 100644
--- a/Resources/Locale/en-US/deltav/job/job-names.ftl
+++ b/Resources/Locale/en-US/deltav/job/job-names.ftl
@@ -6,31 +6,6 @@ job-name-lawyer = Attorney
 job-name-courier = Courier
 job-name-security-borg = Security Cyborg
 
-# Alternate job names
-job-name-tourist = Tourist
-job-name-off-duty = Off-Duty Crew
-job-name-student = Student
-job-name-mixologist = Mixologist
-job-name-baker = Baker
-job-name-butcher = Butcher
-job-name-pizzaiolo = Pizzaiolo
-job-name-practical-nurse = Practical Nurse
-job-name-resident = Resident
-job-name-clinician = Clinician
-job-name-life-support-tech = Life Support Technician
-job-name-plasma-scientist = Plasma Scientist
-job-name-electrician = Electrician
-job-name-mechanic = Mechanic
-job-name-deck-worker = Deck Worker
-job-name-inventory-associate = Inventory Associate
-job-name-prospector = Prospector
-job-name-excavator = Excavator
-job-name-lab-tech = Lab Technician
-job-name-xenoarch = Xenoarchaeologist
-job-name-roboticist = Roboticist
-job-name-jester = Jester
-job-name-fool = Fool
-
 # Role timers
 JobMedicalBorg = Medical Cyborg
 JobCourier = Courier
diff --git a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl
index 05ee30a8207..ec18b4f7a17 100644
--- a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl
+++ b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl
@@ -1,5 +1,8 @@
 # This file will contain strings for both DeltaV and Nyanotrasen loadouts, because I'm lazy
 
+# Miscellaneous
+loadout-group-survival-corpsman = Corpsman Survival Box
+
 # Command
 loadout-group-captain-gloves = Captain gloves
 loadout-group-captain-shoes = Captain shoes
diff --git a/Resources/Locale/en-US/devices/clock.ftl b/Resources/Locale/en-US/devices/clock.ftl
new file mode 100644
index 00000000000..6d0aef1eb76
--- /dev/null
+++ b/Resources/Locale/en-US/devices/clock.ftl
@@ -0,0 +1 @@
+clock-examine = The time reads: [color=white]{$time}[/color]
diff --git a/Resources/Locale/en-US/entity-categories.ftl b/Resources/Locale/en-US/entity-categories.ftl
index e971990e6cb..f17f65fde21 100644
--- a/Resources/Locale/en-US/entity-categories.ftl
+++ b/Resources/Locale/en-US/entity-categories.ftl
@@ -1,2 +1,3 @@
 entity-category-name-actions = Actions
 entity-category-name-objectives = Objectives
+entity-category-name-game-rules = Game Rules
diff --git a/Resources/Locale/en-US/examine/examine-system.ftl b/Resources/Locale/en-US/examine/examine-system.ftl
index 243ba572576..fae6360e9b9 100644
--- a/Resources/Locale/en-US/examine/examine-system.ftl
+++ b/Resources/Locale/en-US/examine/examine-system.ftl
@@ -6,6 +6,6 @@ examine-system-cant-see-entity = You can't make out whatever that is.
 
 examine-verb-name = Basic
 
-examinable-anchored = It is [color=darkgreen]anchored[/color] to the floor
+examinable-anchored = It is [color=darkgreen]anchored[/color] to the floor.
 
-examinable-unanchored = It is [color=darkred]unanchored[/color] from the floor
+examinable-unanchored = It is [color=darkred]unanchored[/color] from the floor.
diff --git a/Resources/Locale/en-US/fax/fax-admin.ftl b/Resources/Locale/en-US/fax/fax-admin.ftl
index eff7e15fe8b..8a8f37809e1 100644
--- a/Resources/Locale/en-US/fax/fax-admin.ftl
+++ b/Resources/Locale/en-US/fax/fax-admin.ftl
@@ -12,3 +12,5 @@ admin-fax-message-placeholder = Your message here...
 admin-fax-stamp = Stamp icon:
 admin-fax-stamp-color = Stamp color:
 admin-fax-send = Send
+admin-fax-lock-page = Lock Page
+admin-fax-lock-page-tooltip = Lock the paper such that it cannot be edited even by things such as cybersun pens.
diff --git a/Resources/Locale/en-US/forensics/forensics.ftl b/Resources/Locale/en-US/forensics/forensics.ftl
index 29e2db8f788..712e8511bb0 100644
--- a/Resources/Locale/en-US/forensics/forensics.ftl
+++ b/Resources/Locale/en-US/forensics/forensics.ftl
@@ -23,8 +23,10 @@ forensic-scanner-verb-message = Perform a forensic scan
 forensic-pad-fingerprint-name = {$entity}'s fingerprints
 forensic-pad-gloves-name = fibers from {$entity}
 
+forensics-dna-unknown = unknown DNA
+
 forensics-verb-text = Remove evidence
 forensics-verb-message = Remove fingerprints and DNA residues from the object!
 forensics-cleaning = You begin cleaning the evidence off of {THE($target)}...
 
-forensics-cleaning-cannot-clean = There is nothing cleanable on {THE($target)}!
\ No newline at end of file
+forensics-cleaning-cannot-clean = There is nothing cleanable on {THE($target)}!
diff --git a/Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl b/Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl
index e92676a2160..fd3e6b82aa7 100644
--- a/Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl
+++ b/Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl
@@ -24,17 +24,17 @@ traitor-death-match-end-round-description-entry = {$originalName}'s PDA, with {$
 
 # TraitorRole
 traitor-role-greeting =
-    You are an agent sent by {$corporation} on behalf of The Syndicate.
+    You are an agent sent by {$corporation} on behalf of [color = darkred]The Syndicate.[/color]
     Your objectives and codewords are listed in the character menu.
     Use the uplink loaded into your PDA to buy the tools you'll need for this mission.
     Death to Nanotrasen!
 traitor-role-codewords =
-    The codewords are:
-    {$codewords}.
+    The codewords are: [color = lightgray]
+    {$codewords}.[/color]
     Codewords can be used in regular conversation to identify yourself discretely to other syndicate agents.
     Listen for them, and keep them secret.
 traitor-role-uplink-code =
-    Set your ringtone to the notes {$code} to lock or unlock your uplink.
+    Set your ringtone to the notes [color = lightgray]{$code}[/color] to lock or unlock your uplink.
     Remember to lock it after, or the stations crew will easily open it too!
 
 # don't need all the flavour text for character menu
diff --git a/Resources/Locale/en-US/game-ticking/game-ticker.ftl b/Resources/Locale/en-US/game-ticking/game-ticker.ftl
index 9527ecb57d9..9c2d7bcf306 100644
--- a/Resources/Locale/en-US/game-ticking/game-ticker.ftl
+++ b/Resources/Locale/en-US/game-ticking/game-ticker.ftl
@@ -37,6 +37,8 @@ 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}.
+latejoin-arrivals-dumped-from-shuttle = A mysterious force prevents you from leaving with the arrivals shuttle.
+latejoin-arrivals-teleport-to-spawn = A mysterious force teleports you off the arrivals shuttle. Have a safe shift!
 
 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/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
index d6fd3de63e9..97941e25d04 100644
--- a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
+++ b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
@@ -195,7 +195,7 @@ ghost-role-information-ert-medical-name = ERT Medical
 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.
+ghost-role-information-cburn-agent-description = A highly trained CentComm agent, capable of dealing with various threats.
 
 ghost-role-information-centcom-official-name = CentComm official
 ghost-role-information-centcom-official-description = Perform CentComm related duties such as inspect the station, jotting down performance reviews for heads of staff, and managing the fax machine.
@@ -243,6 +243,19 @@ ghost-role-information-syndicate-reinforcement-name = Syndicate Agent
 ghost-role-information-syndicate-reinforcement-description = Someone needs reinforcements. You, the first person the syndicate could find, will help them.
 ghost-role-information-syndicate-reinforcement-rules = Normal syndicate antagonist rules apply. Work with whoever called you in, and don't harm them.
 
+ghost-role-information-syndicate-reinforcement-medic-name = Syndicate Medic
+ghost-role-information-syndicate-reinforcement-medic-description = Someone needs reinforcements. Your task is to keep the agent who called you alive.
+
+ghost-role-information-syndicate-reinforcement-spy-name = Syndicate Spy
+ghost-role-information-syndicate-reinforcement-spy-description = Someone needs reinforcements. Your speciality lies in espionage, do not be discovered.
+
+ghost-role-information-syndicate-reinforcement-thief-name = Syndicate Thief
+ghost-role-information-syndicate-reinforcement-thief-description = Someone needs reinforcements. Your job is to break in and retrieve something valuable for your agent.
+
+ghost-role-information-nukeop-reinforcement-name = Nuclear Operative
+ghost-role-information-nukeop-reinforcement-description = The nuclear operatives need reinforcements. You, a reserve agent, will help them.
+ghost-role-information-nukeop-reinforcement-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with the nuclear operatives who summoned you.
+
 ghost-role-information-syndicate-monkey-reinforcement-name = Syndicate Monkey Agent
 ghost-role-information-syndicate-monkey-reinforcement-description = Someone needs reinforcements. You, a trained monkey, will help them.
 ghost-role-information-syndicate-monkey-reinforcement-rules = Normal syndicate antagonist rules apply. Work with whoever called you in, and don't harm them.
diff --git a/Resources/Locale/en-US/guidebook/chemistry/statuseffects.ftl b/Resources/Locale/en-US/guidebook/chemistry/statuseffects.ftl
index 3db8a3c5b0e..9a8f2f6c8a3 100644
--- a/Resources/Locale/en-US/guidebook/chemistry/statuseffects.ftl
+++ b/Resources/Locale/en-US/guidebook/chemistry/statuseffects.ftl
@@ -11,3 +11,5 @@ reagent-effect-status-effect-PressureImmunity = pressure immunity
 reagent-effect-status-effect-Pacified = combat pacification
 reagent-effect-status-effect-RatvarianLanguage = ratvarian language patterns
 reagent-effect-status-effect-StaminaModifier = modified stamina
+reagent-effect-status-effect-RadiationProtection = radiation protection
+reagent-effect-status-effect-Drowsiness = drowsiness
diff --git a/Resources/Locale/en-US/guidebook/guidebook.ftl b/Resources/Locale/en-US/guidebook/guidebook.ftl
index 24ce789ea12..d49fc5138ef 100644
--- a/Resources/Locale/en-US/guidebook/guidebook.ftl
+++ b/Resources/Locale/en-US/guidebook/guidebook.ftl
@@ -3,6 +3,8 @@ guidebook-placeholder-text = Select an entry.
 guidebook-placeholder-text-2 = If you're new, select the topmost entry to get started.
 guidebook-filter-placeholder-text = Filter items
 
+guidebook-parser-error = Parser Error
+guidebook-error-message = Error Message
 
 guidebook-monkey-unspin = Unspin Monkey
 guidebook-monkey-disco = Disco Monkey
\ No newline at end of file
diff --git a/Resources/Locale/en-US/headset/headset-component.ftl b/Resources/Locale/en-US/headset/headset-component.ftl
index a220737f18a..57cb7d62b21 100644
--- a/Resources/Locale/en-US/headset/headset-component.ftl
+++ b/Resources/Locale/en-US/headset/headset-component.ftl
@@ -5,7 +5,7 @@ chat-radio-message-wrap-bold = [color={$color}]{$channel} {$name} {$verb}, [font
 examine-headset-default-channel = Use {$prefix} for the default channel ([color={$color}]{$channel}[/color]).
 
 chat-radio-common = Common
-chat-radio-centcom = CentCom
+chat-radio-centcom = CentComm
 chat-radio-command = Command
 chat-radio-engineering = Engineering
 chat-radio-medical = Medical
diff --git a/Resources/Locale/en-US/health-examinable/health-examinable-carbon.ftl b/Resources/Locale/en-US/health-examinable/health-examinable-carbon.ftl
index ddd6de23673..ac536a1e25a 100644
--- a/Resources/Locale/en-US/health-examinable/health-examinable-carbon.ftl
+++ b/Resources/Locale/en-US/health-examinable/health-examinable-carbon.ftl
@@ -16,3 +16,11 @@ health-examinable-carbon-Heat-50 = [color=orange]{ CAPITALIZE(SUBJECT($target))
 health-examinable-carbon-Heat-75 = [color=orange]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } severe third-degree burns across { POSS-ADJ($target) } body![/color]
 
 health-examinable-carbon-Shock-50 = [color=lightgoldenrodyellow]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } electrical shock marks across { POSS-ADJ($target) } body![/color]
+
+health-examinable-carbon-Cold-25 = [color=lightblue]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } minor frostbite across { POSS-ADJ($target) } body.[/color]
+health-examinable-carbon-Cold-50 = [color=lightblue]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } major frostbite across { POSS-ADJ($target) } body.[/color]
+health-examinable-carbon-Cold-75 = [color=lightblue]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } severe third-degree frostbite across { POSS-ADJ($target) } body![/color]
+
+health-examinable-carbon-Caustic-25 = [color=yellowgreen]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } minor chemical burns.[/color]
+health-examinable-carbon-Caustic-50 = [color=yellowgreen]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } chemical burns across { POSS-ADJ($target) } body.[/color]
+health-examinable-carbon-Caustic-75 = [color=yellowgreen]{ CAPITALIZE(SUBJECT($target)) } { CONJUGATE-HAVE($target) } severe chemical burns all over { POSS-ADJ($target) } body![/color]
diff --git a/Resources/Locale/en-US/info/playerpanel.ftl b/Resources/Locale/en-US/info/playerpanel.ftl
new file mode 100644
index 00000000000..138939c48c9
--- /dev/null
+++ b/Resources/Locale/en-US/info/playerpanel.ftl
@@ -0,0 +1,7 @@
+cmd-playerpanel-desc = Displays general information and actions for a player
+cmd-playerpanel-help = Usage: playerpanel <name or user ID>
+
+cmd-playerpanel-server = This command cannot be run from the server
+cmd-playerpanel-invalid-arguments = Invalid amount of arguments
+cmd-playerpanel-invalid-player = Player not found
+cmd-playerpanel-completion = <PlayerIndex>
diff --git a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
index 55be1fb3b97..10773d6de84 100644
--- a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
+++ b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
@@ -60,12 +60,26 @@ petting-success-honkbot = You pet {THE($target)} on {POSS-ADJ($target)} slippery
 petting-success-mimebot = You pet {THE($target)} on {POSS-ADJ($target)} cold metal head.
 petting-success-cleanbot = You pet {THE($target)} on {POSS-ADJ($target)} damp metal head.
 petting-success-medibot = You pet {THE($target)} on {POSS-ADJ($target)} sterile metal head.
+petting-success-generic-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} metal head.
+petting-success-salvage-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} dirty metal head.
+petting-success-engineer-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} reflective metal head.
+petting-success-janitor-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} damp metal head.
+petting-success-medical-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} sterile metal head.
+petting-success-service-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} dapper looking metal head.
+petting-success-syndicate-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} menacing metal head.
 petting-success-recycler = You pet {THE($target)} on {POSS-ADJ($target)} mildly threatening steel exterior.
 
 petting-failure-honkbot = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BASIC($target, "honk", "honks")} in refusal!
 petting-failure-cleanbot = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy mopping!
 petting-failure-mimebot = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy miming!
 petting-failure-medibot = You reach out to pet {THE($target)}, but {POSS-ADJ($target)} syringe nearly stabs your hand!
+petting-failure-generic-cyborg = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy stating laws!
+petting-failure-salvage-cyborg = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy drilling!
+petting-failure-engineer-cyborg = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy repairing!
+petting-failure-janitor-cyborg = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy cleaning!
+petting-failure-medical-cyborg = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy saving lives!
+petting-failure-service-cyborg = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy serving others!
+petting-failure-syndicate-cyborg = You reach out to pet {THE($target)}, but {POSS-ADJ($target)} treacherous affiliation makes you reconsider.
 
 ## Rattling fences
 
diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl
index c3c1a86937d..56e84a43759 100644
--- a/Resources/Locale/en-US/job/job-names.ftl
+++ b/Resources/Locale/en-US/job/job-names.ftl
@@ -20,7 +20,7 @@ job-name-atmostech = Atmospheric Technician
 job-name-hop = Head of Personnel
 job-name-captain = Captain
 job-name-serviceworker = Service Worker
-job-name-centcomoff = CentCom Official
+job-name-centcomoff = CentComm Official
 job-name-reporter = Reporter
 job-name-musician = Musician
 job-name-librarian = Librarian
@@ -48,11 +48,17 @@ job-name-boxer = Boxer
 job-name-zookeeper = Zookeeper
 job-name-visitor = Visitor
 
-# DeltaV #1418 - Define senior job names for use in virtual jobs
-job-name-seniorengineer = Senior Engineer
-job-name-seniorphysician = Senior Physician
-job-name-seniorresearcher = Senior Researcher
-job-name-seniorofficer = Senior Officer
+# unused jobs
+# these are required for the agent ID job icon tooltips
+# I am keeping them for roleplaying opportunities
+job-name-geneticist = Geneticist
+job-name-no-id = No ID
+job-name-prisoner = Prisoner
+job-name-roboticist = Roboticist
+job-name-syndicate = Syndicate
+job-name-unknown = Unknown
+job-name-virologist = Virologist
+job-name-zombie = Zombie
 
 # Role timers - Make these alphabetical or I cut you
 JobAtmosphericTechnician = Atmospheric Technician
diff --git a/Resources/Locale/en-US/job/role-timers.ftl b/Resources/Locale/en-US/job/role-requirements.ftl
similarity index 71%
rename from Resources/Locale/en-US/job/role-timers.ftl
rename to Resources/Locale/en-US/job/role-requirements.ftl
index 1981f5e7957..906a0470af0 100644
--- a/Resources/Locale/en-US/job/role-timers.ftl
+++ b/Resources/Locale/en-US/job/role-requirements.ftl
@@ -4,7 +4,13 @@ role-timer-overall-insufficient = You require [color=yellow]{TOSTRING($time, "0"
 role-timer-overall-too-high = You require [color=yellow]{TOSTRING($time, "0")}[/color] fewer minutes of playtime to play this role. (Are you trying to play a trainee role?)
 role-timer-role-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes with [color={$departmentColor}]{$job}[/color] to play this role.
 role-timer-role-too-high = You require[color=yellow] {TOSTRING($time, "0")}[/color] fewer minutes with [color={$departmentColor}]{$job}[/color] to play this role. (Are you trying to play a trainee role?)
+role-timer-age-to-old = Your character must be under the age of [color=yellow]{$age}[/color] to play this role.
+role-timer-age-to-young = Your character must be over the age of [color=yellow]{$age}[/color] to play this role.
+role-timer-whitelisted-species = Your character must be one of the following species to play this role:
+role-timer-blacklisted-species = Your character must not be one of the following species to play this role:
 
 role-timer-locked = Locked (hover for details)
 
+role-timer-department-unknown = Unknown Department
+
 role-ban = You have been banned from this role.
diff --git a/Resources/Locale/en-US/lathe/recipes.ftl b/Resources/Locale/en-US/lathe/recipes.ftl
new file mode 100644
index 00000000000..99186c5b659
--- /dev/null
+++ b/Resources/Locale/en-US/lathe/recipes.ftl
@@ -0,0 +1,8 @@
+lathe-recipe-Medkit-name = first aid kit (empty)
+lathe-recipe-MedkitBurn-name = burn treatment kit (empty)
+lathe-recipe-MedkitToxin-name = toxin treatment kit (empty)
+lathe-recipe-MedkitO2-name = oxygen deprivation treatment kit (empty)
+lathe-recipe-MedkitBrute-name = brute trauma treatment kit (empty)
+lathe-recipe-MedkitAdvanced-name = advanced first aid kit (empty)
+lathe-recipe-MedkitRadiation-name = radiation treatment kit (empty)
+lathe-recipe-MedkitCombat-name = combat medical kit (empty)
diff --git a/Resources/Locale/en-US/lathe/ui/lathe-menu.ftl b/Resources/Locale/en-US/lathe/ui/lathe-menu.ftl
index 71dd50d4091..16b67022ad5 100644
--- a/Resources/Locale/en-US/lathe/ui/lathe-menu.ftl
+++ b/Resources/Locale/en-US/lathe/ui/lathe-menu.ftl
@@ -6,6 +6,9 @@ lathe-menu-search-designs = Search designs
 lathe-menu-category-all = All
 lathe-menu-search-filter = Filter:
 lathe-menu-amount = Amount:
+lathe-menu-reagent-slot-examine = It has a slot for a beaker on the side.
+lathe-reagent-dispense-no-container = Liquid pours out of {THE($name)} onto the floor!
+lathe-menu-result-reagent-display = {$reagent} ({$amount}u)
 lathe-menu-material-display = {$material} ({$amount})
 lathe-menu-tooltip-display = {$amount} of {$material}
 lathe-menu-description-display = [italic]{$description}[/italic]
diff --git a/Resources/Locale/en-US/lobby/lobby-state.ftl b/Resources/Locale/en-US/lobby/lobby-state.ftl
index 2e60b66bde1..0c4c401daa3 100644
--- a/Resources/Locale/en-US/lobby/lobby-state.ftl
+++ b/Resources/Locale/en-US/lobby/lobby-state.ftl
@@ -9,7 +9,14 @@ lobby-state-player-status-not-ready = Not Ready
 lobby-state-player-status-ready = Ready
 lobby-state-player-status-observer = Observer
 lobby-state-player-status-round-not-started = The round hasn't started yet
-lobby-state-player-status-round-time =  The round time is: {$hours} hours and {$minutes} minutes
+lobby-state-player-status-round-time =
+    The round time is: {$hours} {$hours ->
+    [1]hour
+    *[other]hours
+    } and {$minutes} {$minutes ->
+    [1]minute
+    *[other]minutes
+    }
 lobby-state-song-text = Playing: [color=white]{$songTitle}[/color] by [color=white]{$songArtist}[/color]
 lobby-state-song-no-song-text = No lobby song playing.
 lobby-state-song-unknown-title = [color=dimgray]Unknown title[/color]
diff --git a/Resources/Locale/en-US/lock/locking-whitelist-component.ftl b/Resources/Locale/en-US/lock/locking-whitelist-component.ftl
new file mode 100644
index 00000000000..182814c2c56
--- /dev/null
+++ b/Resources/Locale/en-US/lock/locking-whitelist-component.ftl
@@ -0,0 +1 @@
+locking-whitelist-component-lock-toggle-deny = You can't toggle the lock.
diff --git a/Resources/Locale/en-US/mass-media/news-ui.ftl b/Resources/Locale/en-US/mass-media/news-ui.ftl
index 9f62fe75c0c..678f20a81af 100644
--- a/Resources/Locale/en-US/mass-media/news-ui.ftl
+++ b/Resources/Locale/en-US/mass-media/news-ui.ftl
@@ -34,3 +34,4 @@ news-write-ui-richtext-tooltip = News articles support rich text
     {"[bullet/]bullet[/color]"}
 
 news-pda-notification-header = New news article
+news-publish-admin-announcement = {$actor} published news article {$title} by {$author}
diff --git a/Resources/Locale/en-US/materials/materials.ftl b/Resources/Locale/en-US/materials/materials.ftl
index a354423d2b7..0fc716bda53 100644
--- a/Resources/Locale/en-US/materials/materials.ftl
+++ b/Resources/Locale/en-US/materials/materials.ftl
@@ -25,6 +25,7 @@ materials-meat = meat
 materials-web = silk
 materials-bones = bone
 materials-coal = coal
+materials-diamond = diamond
 materials-gunpowder = gunpowder
 
 # Ores
@@ -36,3 +37,4 @@ materials-raw-plasma = raw plasma
 materials-raw-uranium = raw uranium
 materials-raw-bananium = raw bananium
 materials-raw-salt = raw salt
+materials-raw-diamond = raw diamond
diff --git a/Resources/Locale/en-US/medical/components/healing-component.ftl b/Resources/Locale/en-US/medical/components/healing-component.ftl
index 5c2aaaabd9b..1deb39db091 100644
--- a/Resources/Locale/en-US/medical/components/healing-component.ftl
+++ b/Resources/Locale/en-US/medical/components/healing-component.ftl
@@ -1,3 +1,4 @@
 medical-item-finished-using = You have finished healing with the {$item}
 medical-item-cant-use = There is no damage you can heal with the {$item}
 medical-item-stop-bleeding = They have stopped bleeding
+medical-item-popup-target = {CAPITALIZE(THE($user))} is trying to heal you with the {$item}!
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 8460bcc27b0..121e50b923e 100644
--- a/Resources/Locale/en-US/medical/components/health-analyzer-component.ftl
+++ b/Resources/Locale/en-US/medical/components/health-analyzer-component.ftl
@@ -14,3 +14,5 @@ health-analyzer-window-scan-mode-active = ACTIVE
 health-analyzer-window-scan-mode-inactive = INACTIVE
 
 health-analyzer-window-malnutrition = Severely malnourished
+
+health-analyzer-popup-scan-target = {CAPITALIZE(THE($user))} is trying to scan you!
diff --git a/Resources/Locale/en-US/nutrition/nutrition-commands.ftl b/Resources/Locale/en-US/nutrition/nutrition-commands.ftl
new file mode 100644
index 00000000000..2b1259e9b2e
--- /dev/null
+++ b/Resources/Locale/en-US/nutrition/nutrition-commands.ftl
@@ -0,0 +1,12 @@
+cmd-nutrition-error-player = You cannot use this command unless you are a player.
+cmd-nutrition-error-entity = You cannot use this command without an entity.
+cmd-nutrition-error-component = Your entity does not have a {$comp} component.
+
+cmd-hungry-desc = makes you hungry
+cmd-hungry-help = sets your hungry level to starving
+cmd-setnutrit-desc = modify hunger and thirst
+cmd-setnutrit-help = set your hunger or thirst to one of the built-in thresholds
+cmd-setnutrit-error-invalid-threshold = invalid {$thresholdType} `{$thresholdString}`
+
+cmd-thirsty-desc = makes you thirsty
+cmd-thirsty-help = sets your thirst level to partched
diff --git a/Resources/Locale/en-US/nyanotrasen/job/job-description.ftl b/Resources/Locale/en-US/nyanotrasen/job/job-description.ftl
index 3b9bc86e6f8..08fc8bd1629 100644
--- a/Resources/Locale/en-US/nyanotrasen/job/job-description.ftl
+++ b/Resources/Locale/en-US/nyanotrasen/job/job-description.ftl
@@ -1,6 +1,5 @@
 job-description-gladiator = Put on a combat spectacle for the crew. Fight for your freedom, glory, and honor. Currently available on Arena.
 job-description-guard = Keep track of prisoners and make sure they have their basic needs.
-job-description-mail-carrier = Deliver mail and other packages from and to logistics. Avoid dogs.
 job-description-martialartist = Be honorable and disciplined, spar in the dojo, challenge security to CQC. Currently available on Shōkō.
 job-description-prisoner = Sit in prison. Gamble with your cellmates. Talk to the warden. Write your memoirs.
 job-description-mantis = Solve mysteries from the nature of the universe to the meaning of life. Be the main person to deal with Psionic beings.
diff --git a/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl b/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl
index 3ade7056a48..bcd05861c42 100644
--- a/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl
+++ b/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl
@@ -1,8 +1,7 @@
 job-name-gladiator = Gladiator
 job-name-guard = Prison Guard
-job-name-mail-carrier = Mail Carrier
 job-name-martialartist =  Martial Artist
-job-name-prisoner = Prisoner
+#job-name-prisoner = Prisoner
 job-name-mantis = Psionic Mantis
 
 # Role timers
diff --git a/Resources/Locale/en-US/paper/envelope.ftl b/Resources/Locale/en-US/paper/envelope.ftl
new file mode 100644
index 00000000000..bb7993d2840
--- /dev/null
+++ b/Resources/Locale/en-US/paper/envelope.ftl
@@ -0,0 +1,11 @@
+envelope-verb-seal = Seal
+envelope-verb-tear = Tear
+
+envelope-letter-slot = Letter
+
+envelope-sealed-examine = [color=gray]{CAPITALIZE(THE($envelope))} is sealed.[/color]
+envelope-torn-examine = [color=yellow]{CAPITALIZE(THE($envelope))} is torn and unusable![/color]
+
+envelope-default-message = TO: 
+  
+  FROM: 
\ No newline at end of file
diff --git a/Resources/Locale/en-US/paper/paper-component.ftl b/Resources/Locale/en-US/paper/paper-component.ftl
index a62616631f4..c2d9d5712bf 100644
--- a/Resources/Locale/en-US/paper/paper-component.ftl
+++ b/Resources/Locale/en-US/paper/paper-component.ftl
@@ -12,3 +12,5 @@ paper-component-action-stamp-paper-other = {CAPITALIZE(THE($user))} stamps {THE(
 paper-component-action-stamp-paper-self = You stamp {THE($target)} with {THE($stamp)}.
 
 paper-ui-save-button = Save ({$keybind})
+
+paper-tamper-proof-modified-message = This page was written using tamper-proof ink.
diff --git a/Resources/Locale/en-US/paper/stamp-component.ftl b/Resources/Locale/en-US/paper/stamp-component.ftl
index a00c4a62a70..3e150a2df48 100644
--- a/Resources/Locale/en-US/paper/stamp-component.ftl
+++ b/Resources/Locale/en-US/paper/stamp-component.ftl
@@ -2,7 +2,7 @@ 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
+stamp-component-stamped-name-centcom = CentComm
 stamp-component-stamped-name-chaplain = Chaplain
 stamp-component-stamped-name-lawyer = Lawyer
 stamp-component-stamped-name-clown = Clown
diff --git a/Resources/Locale/en-US/particle-accelerator/components/ui/particle-accelerator-control-menu.ftl b/Resources/Locale/en-US/particle-accelerator/components/ui/particle-accelerator-control-menu.ftl
index 6bc3ec50684..da3221e4f85 100644
--- a/Resources/Locale/en-US/particle-accelerator/components/ui/particle-accelerator-control-menu.ftl
+++ b/Resources/Locale/en-US/particle-accelerator/components/ui/particle-accelerator-control-menu.ftl
@@ -2,15 +2,21 @@ particle-accelerator-control-menu-on-button = On
 particle-accelerator-control-menu-off-button = Off
 particle-accelerator-control-menu-service-manual-reference = Refer to p.132 of service manual
 particle-accelerator-control-menu-device-version-label = Mark 2 Particle Accelerator
-particle-accelerator-control-menu-power-label = Power:
-particle-accelerator-control-menu-strength-label = Strength:
-particle-accelerator-control-menu-alarm-control = PARTICLE STRENGTH
-                                                  LIMITER FAILURE
+particle-accelerator-control-menu-power-label = [bold]Power:[/bold]
+particle-accelerator-control-menu-strength-label = [bold]Strength:[/bold]
+particle-accelerator-control-menu-alarm-control-1 = [bold][color=red]PARTICLE STRENGTH[/bold][/color]
+particle-accelerator-control-menu-alarm-control-2 = [bold][color=red]LIMITER FAILURE[/bold][/color]
 particle-accelerator-control-menu-scan-parts-button = Scan Parts
 particle-accelerator-control-menu-check-containment-field-warning = Ensure containment field is active before operation
 particle-accelerator-control-menu-foo-bar-baz = FOO-BAR-BAZ
-particle-accelerator-control-menu-status-label = Status: {$status}
-particle-accelerator-control-menu-status-operational = Operational
-particle-accelerator-control-menu-status-incomplete = Incomplete
-particle-accelerator-control-menu-draw-not-available = Draw: N/A
-particle-accelerator-control-menu-draw = Draw: {$watts}/{$lastReceive} 
\ No newline at end of file
+particle-accelerator-control-menu-status-label = [bold]Status:[/bold]
+particle-accelerator-control-menu-status-unknown = [font="Monospace"][color=red]Unknown[/color][/bold]
+particle-accelerator-control-menu-status-operational = [font="Monospace"][color=green]Operational[/color][/bold]
+particle-accelerator-control-menu-status-incomplete = [font="Monospace"][color=red]Incomplete[/color][/bold]
+particle-accelerator-control-menu-draw = [bold]Draw:[/bold]
+particle-accelerator-control-menu-draw-value = [font="Monospace"]{$watts}/{$lastReceive}[/font]
+particle-accelerator-control-menu-draw-not-available = [font="Monospace"][color=gray]N/A[/color][/font]
+
+particle-accelerator-radio-message-on = PA power has been switched on.
+particle-accelerator-radio-message-off = PA power has been switched off.
+particle-accelerator-radio-message-num = PA strength has been set to level {$level}.
diff --git a/Resources/Locale/en-US/portal/swap-teleporter.ftl b/Resources/Locale/en-US/portal/swap-teleporter.ftl
index f13fa9be423..0040ad0a88b 100644
--- a/Resources/Locale/en-US/portal/swap-teleporter.ftl
+++ b/Resources/Locale/en-US/portal/swap-teleporter.ftl
@@ -5,6 +5,7 @@ swap-teleporter-popup-link-destroyed = Quantum link destroyed!
 swap-teleporter-popup-teleport-cancel-time = It's still recharging!
 swap-teleporter-popup-teleport-cancel-link = It's not linked with another device!
 swap-teleporter-popup-teleport-other = {CAPITALIZE(THE($entity))} activates, and you find yourself somewhere else.
+swap-teleporter-popup-teleport-fail = {CAPITALIZE(THE($entity))} activates and fails to transport you anywhere.
 
 swap-teleporter-verb-destroy-link = Destroy Quantum Link
 
diff --git a/Resources/Locale/en-US/power/components/charger.ftl b/Resources/Locale/en-US/power/components/charger.ftl
index 1a6e72f43e9..9ac16a2d46e 100644
--- a/Resources/Locale/en-US/power/components/charger.ftl
+++ b/Resources/Locale/en-US/power/components/charger.ftl
@@ -1,2 +1,4 @@
 charger-examine = Charges at [color={$color}]{$chargeRate}W[/color].
 charger-component-charge-rate = Charge rate
+charger-content = Current charge is at [color=#5E7C16]{$chargePercentage}[/color]%.
+charger-empty = There is nothing in the charger.
diff --git a/Resources/Locale/en-US/power/components/radiation-collector.ftl b/Resources/Locale/en-US/power/components/radiation-collector.ftl
index c38050f1e0a..199b3789aea 100644
--- a/Resources/Locale/en-US/power/components/radiation-collector.ftl
+++ b/Resources/Locale/en-US/power/components/radiation-collector.ftl
@@ -1,2 +1,11 @@
-power-radiation-collector-gas-tank-missing = [color=darkred]No plasma tank attached.[/color]
-power-radiation-collector-gas-tank-present = A plasma tank is [color=darkgreen]connected[/color].
\ No newline at end of file
+power-radiation-collector-gas-tank-missing = The plasma tank slot is [color=darkred]empty[/color].
+power-radiation-collector-gas-tank-present = The plasma tank slot is [color=darkgreen]filled[/color] and the tank indicator reads [color={$fullness ->
+    *[0]red]empty
+    [1]red]low
+    [2]yellow]half-full
+    [3]lime]full
+}[/color].
+power-radiation-collector-enabled = It's switched [color={$state ->
+    [true] darkgreen]on
+    *[false] darkred]off
+}[/color].
diff --git a/Resources/Locale/en-US/prayers/prayers.ftl b/Resources/Locale/en-US/prayers/prayers.ftl
index 532ba4954f0..f0e22eaadff 100644
--- a/Resources/Locale/en-US/prayers/prayers.ftl
+++ b/Resources/Locale/en-US/prayers/prayers.ftl
@@ -1,16 +1,19 @@
 prayer-verbs-subtle-message = Subtle Message
 prayer-verbs-pray = Pray
 prayer-verbs-call = Call
+prayer-verbs-rub = Rub
 prayer-chat-notify-pray = PRAYER
 prayer-chat-notify-honkmother = HONKMOTHER
-prayer-chat-notify-centcom = CENTCOM
+prayer-chat-notify-centcom = CENTCOMM
 prayer-chat-notify-syndicate = SYNDICATE
+prayer-chat-notify-lamp = LAMP
 
 prayer-popup-subtle-default = You hear a voice in your head...
 
 prayer-popup-notify-honkmother-sent = You left a voicemail message for the Honkmother...
 prayer-popup-notify-centcom-sent = You left a voicemail message for Central Command...
 prayer-popup-notify-syndicate-sent = You left a voicemail message for Syndicate High Command...
+prayer-popup-notify-lamp-sent = Your thoughts seem to echo...
 prayer-popup-notify-pray-sent = Your message has been sent to the gods...
 prayer-popup-notify-pray-locked = You don't feel worthy enough...
 prayer-popup-notify-pray-ui-message = Message
diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl
index 444577f2f00..864168a32e3 100644
--- a/Resources/Locale/en-US/preferences/loadout-groups.ftl
+++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl
@@ -1,8 +1,20 @@
+# Errors
+loadout-group-species-restriction = This item is not available for your current species.
+
 # Miscellaneous
 loadout-group-trinkets = Trinkets
 loadout-group-glasses = Glasses
 loadout-group-backpack = Backpack
 loadout-group-instruments = Instruments
+loadout-group-survival-basic = Survival Box
+loadout-group-survival-extended = Extended Survival Box
+loadout-group-survival-clown = Clown Survival Box
+loadout-group-survival-medical = Medical Survival Box
+loadout-group-survival-security = Security Survival Box
+loadout-group-survival-syndicate = Github is forcing me to write text that is literally twice-impossible for the player to ever see, send help
+loadout-group-breath-tool = Species-dependent breath tools
+loadout-group-tank-harness = Species-specific survival equipment
+loadout-group-EVA-tank = Species-specific gas tank
 
 # Command
 loadout-group-captain-head = Captain head
@@ -21,7 +33,6 @@ loadout-group-hop-outerclothing = Head of Personnel outer clothing
 loadout-group-passenger-jumpsuit = Passenger jumpsuit
 loadout-group-passenger-mask = Passenger mask
 loadout-group-passenger-gloves = Passenger gloves
-loadout-group-passenger-backpack = Passenger backpack
 loadout-group-passenger-outerclothing = Passenger outer clothing
 loadout-group-passenger-shoes = Passenger shoes
 
@@ -38,12 +49,10 @@ loadout-group-librarian-jumpsuit = Librarian jumpsuit
 
 loadout-group-lawyer-jumpsuit = Lawyer jumpsuit
 loadout-group-lawyer-neck = Lawyer neck
-loadout-group-lawyer-backpack = Lawyer backpack
 
 loadout-group-chaplain-head = Chaplain head
 loadout-group-chaplain-mask = Chaplain mask
 loadout-group-chaplain-jumpsuit = Chaplain jumpsuit
-loadout-group-chaplain-backpack = Chaplain backpack
 loadout-group-chaplain-outerclothing = Chaplain outer clothing
 loadout-group-chaplain-neck = Chaplain neck
 
@@ -70,14 +79,12 @@ loadout-group-mime-jumpsuit = Mime jumpsuit
 loadout-group-mime-backpack = Mime backpack
 loadout-group-mime-outerclothing = Mime outer clothing
 
-loadout-group-musician-backpack = Musician backpack
 loadout-group-musician-jumpsuit = Musician jumpsuit
 loadout-group-musician-outerclothing = Musician outer clothing
 
 # Cargo
 loadout-group-quartermaster-head = Logistics Officer head
 loadout-group-quartermaster-jumpsuit = Logistics Officer jumpsuit
-loadout-group-quartermaster-backpack = Logistics Officer backpack
 loadout-group-quartermaster-neck = Logistics Officer neck
 loadout-group-quartermaster-outerclothing = Logistics Officer outer clothing
 loadout-group-quartermaster-shoes = Logistics Officer shoes
@@ -95,7 +102,6 @@ loadout-group-salvage-specialist-shoes = Salvage Specialist shoes
 # Engineering
 loadout-group-chief-engineer-head = Chief Engineer head
 loadout-group-chief-engineer-jumpsuit = Chief Engineer jumpsuit
-loadout-group-chief-engineer-backpack = Chief Engineer backpack
 loadout-group-chief-engineer-outerclothing = Chief Engineer outer clothing
 loadout-group-chief-engineer-neck = Chief Engineer neck
 loadout-group-chief-engineer-shoes = Chief Engineer shoes
@@ -118,7 +124,6 @@ loadout-group-atmospheric-technician-shoes = Atmospheric Technician shoes
 loadout-group-research-director-head = Mystagogue head
 loadout-group-research-director-neck = Mystagogue neck
 loadout-group-research-director-jumpsuit = Mystagogue jumpsuit
-loadout-group-research-director-backpack = Mystagogue backpack
 loadout-group-research-director-outerclothing = Mystagogue outer clothing
 loadout-group-research-director-shoes = Mystagogue shoes
 
@@ -154,7 +159,6 @@ loadout-group-security-id = Security ID
 loadout-group-detective-head = Detective head
 loadout-group-detective-neck = Detective neck
 loadout-group-detective-jumpsuit = Detective jumpsuit
-loadout-group-detective-backpack = Detective backpack
 loadout-group-detective-outerclothing = Detective outer clothing
 
 loadout-group-security-cadet-jumpsuit = Security cadet jumpsuit
@@ -166,7 +170,6 @@ loadout-group-medical-mask = Medical mask
 loadout-group-chief-medical-officer-head = Chief Medical Officer head
 loadout-group-chief-medical-officer-jumpsuit = Chief Medical Officer jumpsuit
 loadout-group-chief-medical-officer-outerclothing = Chief Medical Officer outer clothing
-loadout-group-chief-medical-officer-backpack = Chief Medical Officer backpack
 loadout-group-chief-medical-officer-shoes = Chief Medical Officer shoes
 loadout-group-chief-medical-officer-neck = Chief Medical Officer neck
 
@@ -187,7 +190,6 @@ loadout-group-paramedic-head = Paramedic head
 loadout-group-paramedic-jumpsuit = Paramedic jumpsuit
 loadout-group-paramedic-outerclothing = Paramedic outer clothing
 loadout-group-paramedic-shoes = Paramedic shoes
-loadout-group-paramedic-backpack = Paramedic backpack
 
 # Wildcards
 loadout-group-reporter-jumpsuit = Reporter jumpsuit
diff --git a/Resources/Locale/en-US/preferences/ui/character-setup-gui.ftl b/Resources/Locale/en-US/preferences/ui/character-setup-gui.ftl
index b85d7be38ed..325d7cb538d 100644
--- a/Resources/Locale/en-US/preferences/ui/character-setup-gui.ftl
+++ b/Resources/Locale/en-US/preferences/ui/character-setup-gui.ftl
@@ -6,3 +6,8 @@ character-setup-gui-create-new-character-button = Create new slot...
 character-setup-gui-create-new-character-button-tooltip = A maximum of {$maxCharacters} characters are allowed.
 character-setup-gui-character-picker-button-delete-button = Delete
 character-setup-gui-character-picker-button-confirm-delete-button = Confirm
+
+character-setup-gui-save-panel-title = Unsaved character changes
+character-setup-gui-save-panel-save = Save
+character-setup-gui-save-panel-nosave = Don't save
+character-setup-gui-save-panel-cancel = Cancel
\ No newline at end of file
diff --git a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
index bfdbeb2f140..04ea0d9d51f 100644
--- a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
+++ b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
@@ -18,6 +18,8 @@ humanoid-profile-editor-pronouns-epicene-text = They / Them
 humanoid-profile-editor-pronouns-neuter-text = It / It
 humanoid-profile-editor-import-button = Import
 humanoid-profile-editor-export-button = Export
+humanoid-profile-editor-export-image-button = Export image
+humanoid-profile-editor-open-image-button = Open images
 humanoid-profile-editor-save-button = Save
 humanoid-profile-editor-reset-button = Reset
 humanoid-profile-editor-spawn-priority-label = Spawn priority:
@@ -58,4 +60,5 @@ humanoid-profile-editor-no-traits = No traits available
 humanoid-profile-editor-trait-count-hint = Points available: [{$current}/{$max}]
 
 trait-category-disabilities = Disabilities
-trait-category-speech = Speech traits
\ No newline at end of file
+trait-category-speech = Speech traits
+trait-category-quirks = Quirks
diff --git a/Resources/Locale/en-US/procedural/expeditions.ftl b/Resources/Locale/en-US/procedural/expeditions.ftl
index b7bbdbce2f9..56776e351d2 100644
--- a/Resources/Locale/en-US/procedural/expeditions.ftl
+++ b/Resources/Locale/en-US/procedural/expeditions.ftl
@@ -32,3 +32,34 @@ salvage-expedition-announcement-countdown-seconds = {$duration} seconds remainin
 salvage-expedition-announcement-dungeon = Dungeon is located {$direction}.
 salvage-expedition-completed = Expedition is completed.
 salvage-expedition-reward-description = Mission completion reward
+
+# Salvage biome mod
+salvage-biome-mod-caves = Caves
+salvage-biome-mod-grasslands = Grasslands
+salvage-biome-mod-snow = Snow
+salvage-biome-mod-lava = Lava
+
+# Salvage mods
+salvage-light-mod-daylight = Daylight
+salvage-light-mod-evening = Evening
+salvage-light-mod-night = Night time
+
+salvage-temperature-mod-room-temperature = Room temperature
+salvage-temperature-mod-hot = Hot
+salvage-temperature-mod-high-temperature = High temperature
+salvage-temperature-mod-extreme-heat = Extreme heat
+salvage-temperature-mod-cold = Cold
+salvage-temperature-mod-low-temperature = Low temperature
+salvage-temperature-mod-extreme-cold = Extreme cold
+
+salvage-air-mod-no-atmosphere = No atmosphere
+salvage-air-mod-breathable-atmosphere = Breathable atmosphere
+salvage-air-mod-dangerous-atmosphere = Dangerous atmosphere
+salvage-air-mod-toxic-atmosphere = Toxic atmosphere
+salvage-air-mod-volatile-atmosphere = Volatile atmosphere
+
+salvage-dungeon-mod-lava-brig = Lava Brig
+salvage-dungeon-mod-snowy-labs = Snowy labs
+salvage-dungeon-mod-experiment = Experiment
+salvage-dungeon-mod-haunted = Haunted
+salvage-dungeon-mod-mineshaft = Mineshaft
diff --git a/Resources/Locale/en-US/procedural/salvage-faction.ftl b/Resources/Locale/en-US/procedural/salvage-faction.ftl
new file mode 100644
index 00000000000..d3bed816f64
--- /dev/null
+++ b/Resources/Locale/en-US/procedural/salvage-faction.ftl
@@ -0,0 +1,2 @@
+salvage-faction-xenos = Xenos
+salvage-faction-carps = Carps
diff --git a/Resources/Locale/en-US/radio/components/intercom.ftl b/Resources/Locale/en-US/radio/components/intercom.ftl
index e56e3cd0f73..63303999c21 100644
--- a/Resources/Locale/en-US/radio/components/intercom.ftl
+++ b/Resources/Locale/en-US/radio/components/intercom.ftl
@@ -1,5 +1,6 @@
 intercom-menu-title = Intercom
 intercom-channel-label = Channel:
 intercom-button-text-mic = Mic.
-intercom-button-text-speaker = Speak
+intercom-button-text-speaker = Spkr.
+intercom-options-none = No channels
 intercom-flavor-text-left = Keep lines free of chatter
diff --git a/Resources/Locale/en-US/reagents/meta/medicine.ftl b/Resources/Locale/en-US/reagents/meta/medicine.ftl
index a84e8315fda..a0c27d52912 100644
--- a/Resources/Locale/en-US/reagents/meta/medicine.ftl
+++ b/Resources/Locale/en-US/reagents/meta/medicine.ftl
@@ -83,7 +83,7 @@ reagent-name-lipozine = lipozine
 reagent-desc-lipozine = A chemical that accelerates metabolism, causing the user to hunger faster.
 
 reagent-name-omnizine = omnizine
-reagent-desc-omnizine = A soothing milky liquid with an iridescent gleam. A well known conspiracy theory says that it's origins remain a mystery because revealing the secrets of its production would render most commercial pharmaceuticals obsolete.
+reagent-desc-omnizine = A soothing milky liquid with an iridescent gleam. A well known conspiracy theory says that its origins remain a mystery because revealing the secrets of its production would render most commercial pharmaceuticals obsolete.
 
 reagent-name-ultravasculine = ultravasculine
 reagent-desc-ultravasculine = A complicated anti-toxin solution that quickly flushes out toxin while causing minor stress on the body. Reacts with histamine, duplicating itself while flushing it out. Overdose causes extreme pain.
@@ -141,3 +141,9 @@ reagent-desc-mannitol = Efficiently restores brain damage.
 
 reagent-name-psicodine = psicodine
 reagent-desc-psicodine = Suppresses anxiety and other various forms of mental distress. Overdose causes hallucinations and minor toxin damage.
+
+reagent-name-potassium-iodide = potassium iodide
+reagent-desc-potassium-iodide = Will reduce the damaging effects of radiation by 90%. Prophylactic use only.
+
+reagent-name-haloperidol = haloperidol
+reagent-desc-haloperidol = Removes most stimulating and hallucinogenic drugs. Reduces druggy effects and jitteriness. Causes drowsiness.
diff --git a/Resources/Locale/en-US/reagents/meta/narcotics.ftl b/Resources/Locale/en-US/reagents/meta/narcotics.ftl
index b48eb03b7df..600ceffce65 100644
--- a/Resources/Locale/en-US/reagents/meta/narcotics.ftl
+++ b/Resources/Locale/en-US/reagents/meta/narcotics.ftl
@@ -5,7 +5,7 @@ reagent-name-ephedrine = ephedrine
 reagent-desc-ephedrine = A caffeinated adrenaline stimulator chemical that makes you faster and harder to knock down. Also helps combat narcolepsy at dosages over thirty, at the cost of severe nerval stress.
 
 reagent-name-stimulants = hyperzine
-reagent-desc-stimulants = A chemical cocktail developed by Donk Co. that allows agents to recover from stuns faster, move more quickly, and grants a small heal while close to critical condition. Due to the complex nature of the chemical, it is much harder for the body to purge naturally.
+reagent-desc-stimulants = A chemical cocktail developed by Donk Co. that allows agents to recover from stuns faster, move more quickly, and grants a small heal when you're more dead than alive. Due to the complex nature of the chemical, it is much harder for the body to purge naturally.
 
 reagent-name-experimental-stimulants = experimental stimulants
 reagent-desc-experimental-stimulants = A prototype version of hyperzine. Usage grants virtual immunity to stun weaponry, rapid tissue regeneration, extreme running speed by reducing lactic acid buildup, and a general feeling of euphoria. Side effects may include extreme levels of anticoagulation, tunnel vision, extreme toxin buildup in the bloodstream, and rapid liver death. Do not give to animals.
diff --git a/Resources/Locale/en-US/reagents/meta/pyrotechnic.ftl b/Resources/Locale/en-US/reagents/meta/pyrotechnic.ftl
index 87ebe38e216..07bb47678fa 100644
--- a/Resources/Locale/en-US/reagents/meta/pyrotechnic.ftl
+++ b/Resources/Locale/en-US/reagents/meta/pyrotechnic.ftl
@@ -7,7 +7,7 @@ reagent-desc-napalm = It's just a little flammable.
 reagent-name-phlogiston = phlogiston
 reagent-desc-phlogiston = Catches you on fire and makes you ignite.
 
-reagent-name-chlorine-trifluoride = CLF3
+reagent-name-chlorine-trifluoride = chlorine trifluoride
 reagent-desc-chlorine-trifluoride = You really, REALLY don't want to get this shit anywhere near you.
 
 reagent-name-foaming-agent = foaming agent
diff --git a/Resources/Locale/en-US/reagents/meta/toxins.ftl b/Resources/Locale/en-US/reagents/meta/toxins.ftl
index 2a8c81cd59f..cd3669b27c1 100644
--- a/Resources/Locale/en-US/reagents/meta/toxins.ftl
+++ b/Resources/Locale/en-US/reagents/meta/toxins.ftl
@@ -44,7 +44,7 @@ reagent-name-theobromine = theobromine
 reagent-desc-theobromine = A bitter alkaloid of the cacao plant, commonly found in chocolate. Do not feed to animals.
 
 reagent-name-amatoxin = amatoxin
-reagent-desc-amatoxin = A deadly toxin found in some mushrooms, primarily fly amanita. Small dosages can be lethal.
+reagent-desc-amatoxin = A deadly toxin found in some mushrooms, primarily fly amanita. Small doses can be lethal.
 
 reagent-name-vent-crud = vent crud
 reagent-desc-vent-crud = A jet black substance found in poorly maintained ventilation systems. Can cause vent cough.
@@ -65,13 +65,13 @@ reagent-name-honk = honk
 reagent-desc-honk = A toxin found in bananium. Causes severe honking and internal bleeding, may also cause the patient to mutate.
 
 reagent-name-lead = lead
-reagent-desc-lead = A slow-acting but incredibly lethal toxin found in steel, albiet in trace amounts. Tasteless.
+reagent-desc-lead = A slow-acting but incredibly lethal toxin found in steel, albeit in trace amounts. Tasteless.
 
 reagent-name-bungotoxin = bungotoxin
 reagent-desc-bungotoxin = A moderately slow-acting poison found within the pit of the bungo fruit.
 
 reagent-name-vestine = vestine
-reagent-desc-vestine = Has an adverse reaction within the body causing major jittering. While not particularly useful on it's own, it can be used to produce a small variety of chemicals.
+reagent-desc-vestine = Has an adverse reaction within the body causing major jittering. While not particularly useful on its own, it can be used to produce a small variety of chemicals.
 
 reagent-name-tazinide = tazinide
 reagent-desc-tazinide = A highly dangerous metallic mixture which can interfere with most movement through an electrifying current.
diff --git a/Resources/Locale/en-US/replays/replays.ftl b/Resources/Locale/en-US/replays/replays.ftl
index 7a7e551b3e9..4722f4c56b9 100644
--- a/Resources/Locale/en-US/replays/replays.ftl
+++ b/Resources/Locale/en-US/replays/replays.ftl
@@ -41,3 +41,5 @@ replay-verb-spectate = Spectate
 cmd-replay-spectate-help = replay_spectate [optional entity]
 cmd-replay-spectate-desc = Attaches or detaches the local player to a given entity uid.
 cmd-replay-spectate-hint = Optional EntityUid
+
+cmd-replay-toggleui-desc = Toggles the replay control UI.
diff --git a/Resources/Locale/en-US/salvage/salvage-magnet.ftl b/Resources/Locale/en-US/salvage/salvage-magnet.ftl
index 7ce2a486de9..c60bafcc138 100644
--- a/Resources/Locale/en-US/salvage/salvage-magnet.ftl
+++ b/Resources/Locale/en-US/salvage/salvage-magnet.ftl
@@ -13,6 +13,7 @@ salvage-magnet-resources = {$resource ->
     [OreQuartz] Quartz
     [OreSalt] Salt
     [OreGold] Gold
+    [OreDiamond] Diamond
     [OreSilver] Silver
     [OrePlasma] Plasma
     [OreUranium] Uranium
diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl
index 2dc0b88c747..f98118c23eb 100644
--- a/Resources/Locale/en-US/seeds/seeds.ftl
+++ b/Resources/Locale/en-US/seeds/seeds.ftl
@@ -32,6 +32,8 @@ seeds-potato-name = potato
 seeds-potato-display-name = potatoes
 seeds-sugarcane-name = sugarcane
 seeds-sugarcane-display-name = sugarcanes
+seeds-papercane-name = papercane
+seeds-papercane-display-name = papercanes
 seeds-towercap-name = tower cap
 seeds-towercap-display-name = tower caps
 seeds-steelcap-name = steel cap
@@ -48,6 +50,8 @@ seeds-eggplant-name = eggplant
 seeds-eggplant-display-name = eggplants
 seeds-apple-name = apple
 seeds-apple-display-name = apple tree
+seeds-goldenapple-name = golden apple
+seeds-goldenapple-display-name = golden apple tree
 seeds-corn-name = corn
 seeds-corn-display-name = ears of corn
 seeds-onion-name = onion
@@ -88,6 +92,8 @@ seeds-ambrosiadeus-name = ambrosia deus
 seeds-ambrosiadeus-display-name = ambrosia deus
 seeds-galaxythistle-name = galaxythistle
 seeds-galaxythistle-display-name = galaxythistle
+seeds-glasstle-name = glasstle
+seeds-glasstle-display-name = glasstle
 seeds-flyamanita-name = fly amanita
 seeds-flyamanita-display-name = fly amanita
 seeds-gatfruit-name = gatfruit
diff --git a/Resources/Locale/en-US/shuttles/emergency.ftl b/Resources/Locale/en-US/shuttles/emergency.ftl
index 2fa3a7a1240..b4dcaa3e674 100644
--- a/Resources/Locale/en-US/shuttles/emergency.ftl
+++ b/Resources/Locale/en-US/shuttles/emergency.ftl
@@ -11,7 +11,7 @@ emergency-shuttle-command-dock-desc = Calls the emergency shuttle and docks it t
 emergency-shuttle-command-launch-desc = Early launches the emergency shuttle if possible.
 
 # Emergency shuttle
-emergency-shuttle-left = The Emergency Shuttle has left the station. Estimate {$transitTime} seconds until the shuttle arrives at CentCom.
+emergency-shuttle-left = The Emergency Shuttle has left the station. Estimate {$transitTime} seconds until the shuttle arrives at CentComm.
 emergency-shuttle-launch-time = The emergency shuttle will launch in {$consoleAccumulator} seconds.
 emergency-shuttle-docked = The Emergency Shuttle has docked {$direction} of the station, {$location}. It will leave in {$time} seconds.
 emergency-shuttle-good-luck = The Emergency Shuttle is unable to find a station. Good luck.
diff --git a/Resources/Locale/en-US/speech/speech-chatsan.ftl b/Resources/Locale/en-US/speech/speech-chatsan.ftl
index df6cde00a2c..08edd6c204a 100644
--- a/Resources/Locale/en-US/speech/speech-chatsan.ftl
+++ b/Resources/Locale/en-US/speech/speech-chatsan.ftl
@@ -135,3 +135,24 @@ chatsan-replacement-48 = right now
 
 chatsan-word-49 = atm
 chatsan-replacement-49 = at the moment
+
+chatsan-word-50 = istg
+chatsan-replacement-50 = I swear to god
+
+chatsan-word-51 = rq
+chatsan-replacement-51 = real quick
+
+chatsan-word-52 = dw
+chatsan-replacement-52 = don't worry
+
+chatsan-word-53 = wru
+chatsan-replacement-53 = where are you
+
+chatsan-word-54 = fs
+chatsan-replacement-54 = for sure
+
+chatsan-word-55 = ngl
+chatsan-replacement-55 = not gonna lie
+
+chatsan-word-56 = fml
+chatsan-replacement-56 = fuck my life
diff --git a/Resources/Locale/en-US/station-events/events/anomaly-spawn.ftl b/Resources/Locale/en-US/station-events/events/anomaly-spawn.ftl
index 0e4b5f6e39c..907c14ce562 100644
--- a/Resources/Locale/en-US/station-events/events/anomaly-spawn.ftl
+++ b/Resources/Locale/en-US/station-events/events/anomaly-spawn.ftl
@@ -1,4 +1,4 @@
-anomaly-spawn-event-announcement = Our readings have detected a dangerous interspacial anomaly. Please inform the research team of { $sighting }.
+anomaly-spawn-event-announcement = Our readings have detected a dangerous interspacial anomaly. Please inform the research team about { $sighting }.
 
 anomaly-spawn-sighting-1 = low pulsating sounds heard throughout the station
 anomaly-spawn-sighting-2 = strange sources of light
diff --git a/Resources/Locale/en-US/storage/components/secret-stash-component.ftl b/Resources/Locale/en-US/storage/components/secret-stash-component.ftl
index d0dfed2b5dd..2a8f505e2b1 100644
--- a/Resources/Locale/en-US/storage/components/secret-stash-component.ftl
+++ b/Resources/Locale/en-US/storage/components/secret-stash-component.ftl
@@ -1,11 +1,24 @@
 ### Secret stash component. Stuff like potted plants, comfy chair cushions, etc...
 
-comp-secret-stash-secret-part-name = { THE($item) }
-comp-secret-stash-action-hide-success = You hide { THE($item) } in { $this }
-comp-secret-stash-action-hide-container-not-empty = There's already something in here?!
-comp-secret-stash-action-hide-item-too-big = { THE($item) } is too big to fit in {$stash}!
-comp-secret-stash-action-get-item-found-something = There was something inside {$stash}!
-comp-secret-stash-on-examine-found-hidden-item = There is something hidden inside.
-
-secret-stash-part-plant = the plant
-secret-stash-part-toilet = the toilet cistern
+comp-secret-stash-action-hide-success = You hide { THE($item) } in the {$stashname}.
+comp-secret-stash-action-hide-container-not-empty = There's already something in here!?
+comp-secret-stash-action-hide-item-too-big = { THE($item) } is too big to fit in the {$stashname}.
+comp-secret-stash-action-get-item-found-something = There was something inside the {$stashname}!
+comp-secret-stash-on-examine-found-hidden-item = There is something hidden inside the {$stashname}!
+comp-secret-stash-on-destroyed-popup = Something falls out of the the {$stashname}!
+
+### Verbs
+comp-secret-stash-verb-insert-into-stash = Stash item
+comp-secret-stash-verb-insert-message-item-already-inside = There is already an item inside the {$stashname}.
+comp-secret-stash-verb-insert-message-no-item = Hide { THE($item) } in the {$stashname}.
+comp-secret-stash-verb-take-out-item = Grab item
+comp-secret-stash-verb-take-out-message-something = Take the contents of the {$stashname} out.
+comp-secret-stash-verb-take-out-message-nothing = There is nothing inside the {$stashname}.
+
+comp-secret-stash-verb-close = Close
+comp-secret-stash-verb-cant-close = You can't close the {$stashname} with that.
+comp-secret-stash-verb-open = Open
+
+### Stash names
+secret-stash-plant = plant
+secret-stash-toilet = toilet cistern
diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index 3a3e6e54e6c..d497b5fd9d2 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -126,7 +126,10 @@ uplink-reinforcement-radio-ancestor-name = Genetic Ancestor Reinforcement Telepo
 uplink-reinforcement-radio-ancestor-desc =  Call in a trained ancestor of your choosing to assist you. Comes with a single syndicate cigarette.
 
 uplink-reinforcement-radio-name = Reinforcement Teleporter
-uplink-reinforcement-radio-desc =  Radio in a reinforcement agent of extremely questionable quality. No off button, buy this if you're ready to party. They have a pistol with no reserve ammo, and a knife. That's it.
+uplink-reinforcement-radio-traitor-desc =  Radio in a reinforcement agent of extremely questionable quality. No off button, buy this if you're ready to party. Call in a medic or spy or thief to help you out. Good luck.
+
+uplink-reinforcement-radio-nukeops-name = Nuclear Operative Teleporter
+uplink-reinforcement-radio-nukeops-desc =  Radio in a nuclear operative of extremely questionable quality. No off button, buy this if you're ready to party. They have basic nuclear operative gear.
 
 uplink-reinforcement-radio-cyborg-assault-name = Syndicate Assault Cyborg Teleporter
 uplink-reinforcement-radio-cyborg-assault-desc =  A lean, mean killing machine with access to an Energy Sword, LMG, Cryptographic Sequencer, and a Pinpointer.
@@ -243,7 +246,7 @@ uplink-super-surplus-bundle-desc = Contains 125 telecrystals worth of completely
 
 # Tools
 uplink-toolbox-name = Toolbox
-uplink-toolbox-desc = A full compliment of tools for the mechanically inclined traitor. Includes a pair of insulated combat gloves, syndicate gas mask and a utility belt.
+uplink-toolbox-desc = A full compliment of tools for the mechanically inclined traitor. Includes a pair of insulated combat gloves and a syndicate gas mask as well.
 
 uplink-syndicate-jaws-of-life-name = Jaws Of Life
 uplink-syndicate-jaws-of-life-desc = A combined prying and cutting tool. Useful for entering the station or its departments.
@@ -319,6 +322,9 @@ uplink-hardsuit-carp-desc = Looks like an ordinary carp suit, except fully space
 uplink-hardsuit-syndie-name = Syndicate Hardsuit
 uplink-hardsuit-syndie-desc = The Syndicate's well known armored blood red hardsuit, capable of space walks and bullet resistant.
 
+uplink-syndie-raid-name = Syndicate Raid Suit
+uplink-syndie-raid-desc = A very durable and reasonably flexible suit of blood-red armor, reinforced against all common forms of damage but not capable of space walks. Comes with a sick helmet.
+
 uplink-hardsuit-syndieelite-name = Syndicate Elite Hardsuit
 uplink-hardsuit-syndieelite-desc = An elite version of the blood-red hardsuit, with improved mobility and fireproofing. Property of Gorlex Marauders.
 
diff --git a/Resources/Locale/en-US/thief/backpack.ftl b/Resources/Locale/en-US/thief/backpack.ftl
index 0911bc042b6..6a69ab8bc6f 100644
--- a/Resources/Locale/en-US/thief/backpack.ftl
+++ b/Resources/Locale/en-US/thief/backpack.ftl
@@ -18,7 +18,8 @@ thief-backpack-button-deselect = Select [X]
 thief-backpack-category-chameleon-name = chameleon kit
 thief-backpack-category-chameleon-description =
     You are everyone and no one; you are a master of disguise.
-    Includes: Set of chameleon clothing, a chameleon projector.
+    Includes: A full set of chameleon clothing,
+    a chameleon projector, and an Agent ID.
     Disguise as anyone and anything.
 
 thief-backpack-category-tools-name = breacher kit
@@ -38,8 +39,8 @@ thief-backpack-category-syndie-name = syndie kit
 thief-backpack-category-syndie-description =
     Trinkets from a disavowed past, or stolen from a careless agent?
     You've made some connections. Whiskey, echo...
-    Includes: Agent ID card, Emag, syndicate pAI, Interdyne cigs,
-    and some strange red crystals.
+    Includes: An Emag, Interdyne cigs, a Syndicate codeword,
+    a Radio Jammer, a lighter and some strange red crystals.
 
 thief-backpack-category-sleeper-name = sleeper kit
 thief-backpack-category-sleeper-description =
diff --git a/Resources/Locale/en-US/thief/beacon.ftl b/Resources/Locale/en-US/thief/beacon.ftl
new file mode 100644
index 00000000000..9fbbcaf4197
--- /dev/null
+++ b/Resources/Locale/en-US/thief/beacon.ftl
@@ -0,0 +1,8 @@
+thief-fulton-set = Delivery coordinates are set.
+thief-fulton-clear = Delivery coordinates cleared.
+
+thief-fulton-examined-set = Coordinates entered. Bluespace teleportation of the nearest objects will be performed when the evacuation shuttle departs.
+thief-fulton-examined-unset = Beacon coordinates are not set.
+
+thief-fulton-verb-text = Set coordinates
+thief-fulton-verb-message = Set the coordinates of your thief's hideout, where all nearby items will be sent at the end of the round.
\ No newline at end of file
diff --git a/Resources/Locale/en-US/tiles/tiles.ftl b/Resources/Locale/en-US/tiles/tiles.ftl
index e5b6810fcab..35cea19f786 100644
--- a/Resources/Locale/en-US/tiles/tiles.ftl
+++ b/Resources/Locale/en-US/tiles/tiles.ftl
@@ -87,6 +87,7 @@ tiles-gold-tile = gold tile
 tiles-silver-tile = silver tile
 tiles-glass-floor = glass floor
 tiles-reinforced-glass-floor = reinforced glass floor
+tiles-metal-foam = metal foam floor
 tiles-green-circuit-floor = green circuit floor
 tiles-blue-circuit-floor = blue circuit floor
 tiles-snow = snow
@@ -126,4 +127,4 @@ tiles-mowed-astro-grass = mowed astro-grass
 tiles-jungle-astro-grass = jungle astro-grass
 tiles-astro-ice = astro-ice
 tiles-astro-snow = astro-snow
-tiles-wood-large = large wood
\ No newline at end of file
+tiles-wood-large = large wood
diff --git a/Resources/Locale/en-US/tools/components/tool-openable-component.ftl b/Resources/Locale/en-US/tools/components/tool-openable-component.ftl
new file mode 100644
index 00000000000..c45b6c69daf
--- /dev/null
+++ b/Resources/Locale/en-US/tools/components/tool-openable-component.ftl
@@ -0,0 +1,6 @@
+tool-openable-component-examine-closed = The {$name} is closed.
+tool-openable-component-examine-opened = The {$name} is open.
+
+tool-openable-component-verb-close = Close
+tool-openable-component-verb-open = Open
+tool-openable-component-verb-cant-close = You can't close the {$name} with that.
diff --git a/Resources/Locale/en-US/traitor/traitor-codes-component.ftl b/Resources/Locale/en-US/traitor/traitor-codes-component.ftl
new file mode 100644
index 00000000000..35246037f6a
--- /dev/null
+++ b/Resources/Locale/en-US/traitor/traitor-codes-component.ftl
@@ -0,0 +1,3 @@
+traitor-codes-message-singular = syndicate codeword:
+traitor-codes-message-plural = syndicate codewords:
+traitor-codes-none = no known codewords
diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl
index 6dd834e8a1b..d9f09cc68aa 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -5,7 +5,7 @@ trait-poor-vision-name = Short-sighted
 trait-poor-vision-desc = Your eyes are not what they once were, you have difficulty seeing things far away without corrective glasses.
 
 trait-narcolepsy-name = Narcolepsy
-trait-narcolepsy-desc = You fall asleep randomly
+trait-narcolepsy-desc = You fall asleep randomly.
 
 trait-pacifist-name = Pacifist
 trait-pacifist-desc = You cannot attack or hurt any living beings.
@@ -13,13 +13,13 @@ trait-pacifist-desc = You cannot attack or hurt any living beings.
 permanent-blindness-trait-examined = [color=lightblue]{CAPITALIZE(POSS-ADJ($target))} eyes are glassy and unfocused. It doesn't seem like {SUBJECT($target)} can see you well, if at all.[/color]
 
 trait-lightweight-name = Lightweight drunk
-trait-lightweight-desc = Alcohol has a stronger effect on you
+trait-lightweight-desc = Alcohol has a stronger effect on you.
 
 trait-muted-name = Muted
-trait-muted-desc = You can't speak
+trait-muted-desc = You can't speak.
 
 trait-paracusia-name = Paracusia
-trait-paracusia-desc = You hear sounds that aren't really there
+trait-paracusia-desc = You hear sounds that aren't really there.
 
 trait-unrevivable-name = Unrevivable
 trait-unrevivable-desc = You are unable to be revived by defibrillators.
@@ -31,10 +31,10 @@ trait-accentless-name = Accentless
 trait-accentless-desc = You don't have the accent that your species would usually have
 
 trait-frontal-lisp-name = Frontal lisp
-trait-frontal-lisp-desc = You thpeak with a lithp
+trait-frontal-lisp-desc = You thpeak with a lithp.
 
-trait-socialanxiety-name = Social anxiety
-trait-socialanxiety-desc = You are anxious when you speak and stutter.
+trait-socialanxiety-name = Stutter
+trait-socialanxiety-desc = You speak with a stutter.
 
 trait-southern-name = Southern drawl
 trait-southern-desc = You have a different way of speakin'.
diff --git a/Resources/Locale/en-US/weapons/ranged/gun.ftl b/Resources/Locale/en-US/weapons/ranged/gun.ftl
index fe60f3eed1d..31ac7d5bf23 100644
--- a/Resources/Locale/en-US/weapons/ranged/gun.ftl
+++ b/Resources/Locale/en-US/weapons/ranged/gun.ftl
@@ -6,6 +6,7 @@ gun-selected-mode = Selected {$mode}
 gun-disabled = You can't use guns!
 gun-clumsy = The gun blows up in your face!
 gun-set-fire-mode = Set to {$mode}
+gun-magazine-whitelist-fail = That won't fit into the gun!
 
 # SelectiveFire
 gun-SemiAuto = semi-auto
diff --git a/Resources/Locale/en-US/wieldable/wieldable-component.ftl b/Resources/Locale/en-US/wieldable/wieldable-component.ftl
index 84b58224a77..585d6110164 100644
--- a/Resources/Locale/en-US/wieldable/wieldable-component.ftl
+++ b/Resources/Locale/en-US/wieldable/wieldable-component.ftl
@@ -18,3 +18,5 @@ wieldable-component-not-in-hands = { CAPITALIZE(THE($item)) } isn't in your hand
 wieldable-component-requires = { CAPITALIZE(THE($item))} must be wielded!
 
 gunwieldbonus-component-examine = This weapon has improved accuracy when wielded.
+
+gunrequireswield-component-examine = This weapon can only be fired when wielded.
diff --git a/Resources/Maps/Dungeon/lava_brig.yml b/Resources/Maps/Dungeon/lava_brig.yml
index 8885dce4323..ebf267a9c2e 100644
--- a/Resources/Maps/Dungeon/lava_brig.yml
+++ b/Resources/Maps/Dungeon/lava_brig.yml
@@ -7345,7 +7345,7 @@ entities:
     - type: Transform
       pos: 18.47467,24.458666
       parent: 588
-- proto: ClothingOuterCoatDetective
+- proto: ClothingOuterCoatDetectiveLoadout
   entities:
   - uid: 574
     components:
diff --git a/Resources/Maps/Dungeon/snowy_labs.yml b/Resources/Maps/Dungeon/snowy_labs.yml
index 1211d7a6642..3ce318951c9 100644
--- a/Resources/Maps/Dungeon/snowy_labs.yml
+++ b/Resources/Maps/Dungeon/snowy_labs.yml
@@ -10731,7 +10731,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 52.5,14.5
       parent: 1653
-- proto: MagicalLamp
+- proto: ArabianLamp
   entities:
   - uid: 1204
     components:
diff --git a/Resources/Maps/Nonstations/nukieplanet.yml b/Resources/Maps/Nonstations/nukieplanet.yml
index 20fb68f2ccd..2063451a0ee 100644
--- a/Resources/Maps/Nonstations/nukieplanet.yml
+++ b/Resources/Maps/Nonstations/nukieplanet.yml
@@ -1625,8 +1625,6 @@ entities:
     - type: GasTileOverlay
     - type: SpreaderGrid
     - type: GridPathfinding
-    - type: BecomesStation
-      id: SyndicateOutpost
   - uid: 1295
     components:
     - type: MetaData
@@ -11002,13 +11000,6 @@ entities:
     - type: Transform
       pos: 18.918644,6.663283
       parent: 104
-- proto: SyndicateMicrowave
-  entities:
-  - uid: 10
-    components:
-    - type: Transform
-      pos: 13.5,-6.5
-      parent: 104
 - proto: KitchenReagentGrinder
   entities:
   - uid: 1257
@@ -13234,6 +13225,13 @@ entities:
       - SurveillanceCameraEntertainment
       nameSet: True
       id: Weeh
+- proto: SyndicateMicrowave
+  entities:
+  - uid: 10
+    components:
+    - type: Transform
+      pos: 13.5,-6.5
+      parent: 104
 - proto: SyndicatePersonalAI
   entities:
   - uid: 160
@@ -13723,13 +13721,6 @@ entities:
     - 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
diff --git a/Resources/Maps/Test/dev_map.yml b/Resources/Maps/Test/dev_map.yml
index 910a059ee72..4cd09dfe80f 100644
--- a/Resources/Maps/Test/dev_map.yml
+++ b/Resources/Maps/Test/dev_map.yml
@@ -385,11 +385,11 @@ entities:
     - type: Transform
     - type: Map
     - type: PhysicsMap
+    - type: GridTree
+    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
     - type: LoadedMap
-    - type: GridTree
-    - type: MovedGrids
 - proto: AirAlarm
   entities:
   - uid: 800
@@ -401,8 +401,6 @@ entities:
     - type: DeviceList
       devices:
       - 801
-    - type: AtmosDevice
-      joinedGrid: 179
 - proto: AirCanister
   entities:
   - uid: 458
@@ -410,8 +408,6 @@ entities:
     - type: Transform
       pos: 7.5,-0.5
       parent: 179
-    - type: AtmosDevice
-      joinedGrid: 179
 - proto: Airlock
   entities:
   - uid: 48
@@ -901,33 +897,21 @@ entities:
     - type: Transform
       pos: -2.5,-14.5
       parent: 179
-    - type: DeviceLinkSink
-      links:
-      - 1013
   - uid: 697
     components:
     - type: Transform
       pos: 1.5,-14.5
       parent: 179
-    - type: DeviceLinkSink
-      links:
-      - 1014
   - uid: 698
     components:
     - type: Transform
       pos: 1.5,-16.5
       parent: 179
-    - type: DeviceLinkSink
-      links:
-      - 1014
   - uid: 984
     components:
     - type: Transform
       pos: -2.5,-16.5
       parent: 179
-    - type: DeviceLinkSink
-      links:
-      - 1013
 - proto: BoozeDispenser
   entities:
   - uid: 752
@@ -2660,13 +2644,6 @@ entities:
     - type: Transform
       pos: 24.5,5.5
       parent: 179
-- proto: chem_master
-  entities:
-  - uid: 311
-    components:
-    - type: Transform
-      pos: 8.5,11.5
-      parent: 179
 - proto: ChemDispenser
   entities:
   - uid: 583
@@ -2704,6 +2681,13 @@ entities:
     - type: Transform
       pos: 6.4651074,9.828774
       parent: 179
+- proto: ChemMaster
+  entities:
+  - uid: 311
+    components:
+    - type: Transform
+      pos: 8.5,11.5
+      parent: 179
 - proto: ChemMasterMachineCircuitboard
   entities:
   - uid: 718
@@ -3031,27 +3015,18 @@ entities:
     - type: Transform
       pos: -2.5,-15.5
       parent: 179
-    - type: DeviceLinkSink
-      links:
-      - 699
   - uid: 259
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 1.5,-14.5
       parent: 179
-    - type: DeviceLinkSink
-      links:
-      - 983
   - uid: 463
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 1.5,-16.5
       parent: 179
-    - type: DeviceLinkSink
-      links:
-      - 983
   - uid: 677
     components:
     - type: Transform
@@ -3063,61 +3038,40 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -1.5,11.5
       parent: 179
-    - type: DeviceLinkSink
-      links:
-      - 722
   - uid: 720
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -0.5,11.5
       parent: 179
-    - type: DeviceLinkSink
-      links:
-      - 722
   - uid: 721
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 0.5,11.5
       parent: 179
-    - type: DeviceLinkSink
-      links:
-      - 722
   - uid: 985
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 1.5,-13.5
       parent: 179
-    - type: DeviceLinkSink
-      links:
-      - 983
   - uid: 989
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 1.5,-15.5
       parent: 179
-    - type: DeviceLinkSink
-      links:
-      - 983
   - uid: 990
     components:
     - type: Transform
       pos: -2.5,-13.5
       parent: 179
-    - type: DeviceLinkSink
-      links:
-      - 699
   - uid: 991
     components:
     - type: Transform
       pos: -2.5,-16.5
       parent: 179
-    - type: DeviceLinkSink
-      links:
-      - 699
 - proto: CrateEngineeringToolbox
   entities:
   - uid: 692
@@ -3575,8 +3529,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,-3.5
       parent: 179
-    - type: AtmosDevice
-      joinedGrid: 179
 - proto: GasMixer
   entities:
   - uid: 747
@@ -3585,8 +3537,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,-2.5
       parent: 179
-    - type: AtmosDevice
-      joinedGrid: 179
 - proto: GasOutletInjector
   entities:
   - uid: 429
@@ -3595,8 +3545,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 6.5,-1.5
       parent: 179
-    - type: AtmosDevice
-      joinedGrid: 179
 - proto: GasPipeBend
   entities:
   - uid: 727
@@ -3635,8 +3583,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 6.5,-0.5
       parent: 179
-    - type: AtmosDevice
-      joinedGrid: 179
 - proto: GasPressurePump
   entities:
   - uid: 171
@@ -3645,8 +3591,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 4.5,-3.5
       parent: 179
-    - type: AtmosDevice
-      joinedGrid: 179
 - proto: GasValve
   entities:
   - uid: 168
@@ -3655,8 +3599,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 4.5,-2.5
       parent: 179
-    - type: AtmosDevice
-      joinedGrid: 179
 - proto: GasVentPump
   entities:
   - uid: 729
@@ -3665,8 +3607,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 6.5,-3.5
       parent: 179
-    - type: AtmosDevice
-      joinedGrid: 179
 - proto: GasVentScrubber
   entities:
   - uid: 452
@@ -3675,8 +3615,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 6.5,-2.5
       parent: 179
-    - type: AtmosDevice
-      joinedGrid: 179
 - proto: GasVolumePump
   entities:
   - uid: 160
@@ -3685,8 +3623,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 4.5,-1.5
       parent: 179
-    - type: AtmosDevice
-      joinedGrid: 179
 - proto: GeigerCounter
   entities:
   - uid: 759
@@ -4228,12 +4164,8 @@ entities:
   - uid: 1078
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
       pos: 12.5,24.5
       parent: 179
-    - type: DeviceLinkSink
-      links:
-      - 1083
 - proto: MachineFrame
   entities:
   - uid: 533
@@ -4387,8 +4319,6 @@ entities:
     - type: Transform
       pos: 7.5,-1.5
       parent: 179
-    - type: AtmosDevice
-      joinedGrid: 179
 - proto: Ointment
   entities:
   - uid: 148
@@ -4408,8 +4338,6 @@ entities:
     - type: Transform
       pos: 7.5,-3.5
       parent: 179
-    - type: AtmosDevice
-      joinedGrid: 179
 - proto: PaperBin10
   entities:
   - uid: 977
@@ -4443,8 +4371,6 @@ entities:
     - type: Transform
       pos: 7.5,-2.5
       parent: 179
-    - type: AtmosDevice
-      joinedGrid: 179
 - proto: PlasticFlapsAirtightClear
   entities:
   - uid: 997
@@ -5120,7 +5046,7 @@ entities:
     - type: Transform
       pos: -6.5,-12.5
       parent: 179
-- proto: soda_dispenser
+- proto: SodaDispenser
   entities:
   - uid: 751
     components:
@@ -5172,20 +5098,6 @@ entities:
     - type: Transform
       pos: -3.5,4.5
       parent: 179
-- proto: SpawnVehicleATV
-  entities:
-  - uid: 1176
-    components:
-    - type: Transform
-      pos: -7.5,1.5
-      parent: 179
-- proto: SpawnVehicleJanicart
-  entities:
-  - uid: 904
-    components:
-    - type: Transform
-      pos: 5.5,16.5
-      parent: 179
 - proto: Spear
   entities:
   - uid: 185
@@ -5817,20 +5729,6 @@ entities:
     - type: Transform
       pos: -7.5,4.5
       parent: 179
-- proto: VehicleKeyATV
-  entities:
-  - uid: 1187
-    components:
-    - type: Transform
-      pos: -6.8905525,1.5128828
-      parent: 179
-- proto: VehicleKeyJanicart
-  entities:
-  - uid: 14
-    components:
-    - type: Transform
-      pos: 6.5,16.5
-      parent: 179
 - proto: VendingMachineCigs
   entities:
   - uid: 870
diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml
index fd14a6ab762..1b85698b6e7 100644
--- a/Resources/Migrations/migration.yml
+++ b/Resources/Migrations/migration.yml
@@ -237,12 +237,12 @@ AirlockExternalGlassEasyPryLocked: AirlockExternalGlassLocked
 AirlockGlassShuttleEasyPryLocked: AirlockExternalGlassShuttleLocked
 AirlockShuttleEasyPryLocked: AirlockExternalShuttleLocked
 
-#2024-03-10
-#ClothingBackpackFilledDetective: ClothingBackpackSecurityFilledDetective
-#ClothingBackpackDuffelFilledDetective: ClothingBackpackDuffelSecurityFilledDetective
-#ClothingBackpackSatchelFilledDetective: ClothingBackpackSatchelSecurityFilledDetective
+# 2024-03-10
 FoodChili: FoodChiliPepper
 FoodChilly: FoodChillyPepper
+# ClothingBackpackFilledDetective: ClothingBackpackSecurityFilledDetective
+# ClothingBackpackDuffelFilledDetective: ClothingBackpackDuffelSecurityFilledDetective
+# ClothingBackpackSatchelFilledDetective: ClothingBackpackSatchelSecurityFilledDetective
 
 # 2024-03-11
 ImprovisedExplosive: FireBomb
@@ -336,9 +336,34 @@ DoorRemoteFirefight: null
 # 2024-06-03
 AirlockServiceCaptainLocked: AirlockCaptainLocked
 
+# 2024-06-15
+ClothingOuterCoatInspector: ClothingOuterCoatJensen
+
 # 2024-06-23
 FloorTileItemReinforced: PartRodMetal1
 
 
 #2024-06-25
 BookChefGaming: BookHowToCookForFortySpaceman
+
+#2024-06-29
+IntercomAssesmbly: IntercomAssembly
+
+# 2024-07-7
+SignScience1: SignScience
+SignScience2: SignScience
+SignXenobio2: SignXenobio
+SignXenolab: SignXenobio
+SignToxins2: SignToxins
+SignMinerDock: SignShipDock
+SignChemistry1: SignChem
+SignChemistry2: SignChem
+SignCourt: SignLawyer
+SignAtmosMinsky: SignAtmos
+SignDrones: SignMaterials
+SignShield: null # what was this even for?
+SignHydro2: SignHydro1
+SignHydro3: SignHydro1
+
+# 2024-07-27
+LogicGate: LogicGateOr
diff --git a/Resources/Prototypes/Accents/word_replacements.yml b/Resources/Prototypes/Accents/word_replacements.yml
index ebeefd5a0e1..5704dc8d06e 100644
--- a/Resources/Prototypes/Accents/word_replacements.yml
+++ b/Resources/Prototypes/Accents/word_replacements.yml
@@ -430,6 +430,13 @@
     chatsan-word-47: chatsan-replacement-47
     chatsan-word-48: chatsan-replacement-48
     chatsan-word-49: chatsan-replacement-49
+    chatsan-word-50: chatsan-replacement-50
+    chatsan-word-51: chatsan-replacement-51
+    chatsan-word-52: chatsan-replacement-52
+    chatsan-word-53: chatsan-replacement-53
+    chatsan-word-54: chatsan-replacement-54
+    chatsan-word-55: chatsan-replacement-55
+    chatsan-word-56: chatsan-replacement-56
 
 - type: accent
   id: liar
@@ -478,3 +485,15 @@
     liar-word-40: liar-word-replacement-40
     liar-word-41: liar-word-replacement-41
     liar-word-42: liar-word-replacement-42
+
+- type: accent
+  id: russian
+  wordReplacements:
+    accent-russian-words-1: accent-russian-words-replace-1
+    accent-russian-words-2: accent-russian-words-replace-2
+    accent-russian-words-3: accent-russian-words-replace-3
+    accent-russian-words-3-2: accent-russian-words-replace-3
+    accent-russian-words-3-3: accent-russian-words-replace-3
+    accent-russian-words-4: accent-russian-words-replace-4
+    accent-russian-words-5: accent-russian-words-replace-5
+    accent-russian-words-6: accent-russian-words-replace-6
\ No newline at end of file
diff --git a/Resources/Prototypes/Actions/ninja.yml b/Resources/Prototypes/Actions/ninja.yml
index adaf563692d..47cb8a83f44 100644
--- a/Resources/Prototypes/Actions/ninja.yml
+++ b/Resources/Prototypes/Actions/ninja.yml
@@ -2,7 +2,7 @@
 - type: entity
   id: ActionToggleNinjaGloves
   name: Toggle ninja gloves
-  description: Toggles all glove actions on left click. Includes your doorjack, draining power, stunning enemies, downloading research and calling in a threat.
+  description: Toggles all glove actions on left click. Includes your doorjack, draining power, stunning enemies and hacking certain computers.
   components:
   - type: InstantAction
     priority: -13
@@ -21,7 +21,7 @@
       state: icon
     itemIconStyle: NoItem
     priority: -10
-    event: !type:CreateThrowingStarEvent {}
+    event: !type:CreateItemEvent {}
 
 - type: entity
   id: ActionRecallKatana
@@ -59,7 +59,7 @@
     # have to plan (un)cloaking ahead of time
     useDelay: 5
     priority: -9
-    event: !type:ToggleStealthEvent
+    event: !type:ToggleActionEvent
 
 # katana
 - type: entity
@@ -72,6 +72,10 @@
       sprite: Objects/Magic/magicactions.rsi
       state: blink
     itemIconStyle: NoItem
+    sound:
+      path: /Audio/Magic/blink.ogg
+      params:
+        volume: 5
     priority: -12
     event: !type:DashEvent
     checkCanAccess: false
diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml
index 4b3d75bf920..af1333e14c5 100644
--- a/Resources/Prototypes/Actions/types.yml
+++ b/Resources/Prototypes/Actions/types.yml
@@ -37,6 +37,7 @@
   description: Turn the light on and off.
   components:
   - type: InstantAction
+    useDelay: 1
     icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
     iconOn: { sprite: Objects/Tools/flashlight.rsi, state: flashlight-on }
     event: !type:ToggleActionEvent
@@ -165,6 +166,8 @@
   name: Morph into Geras
   description:  Morphs you into a Geras - a miniature version of you which allows you to move fast, at the cost of your inventory.
   components:
+  - type: ConfirmableAction
+    popup: gera-transformation-popup
   - type: InstantAction
     itemIconStyle: BigAction
     useDelay: 10 # prevent spam
diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml
index c08453460f4..ff66f2586b0 100644
--- a/Resources/Prototypes/Alerts/alerts.yml
+++ b/Resources/Prototypes/Alerts/alerts.yml
@@ -87,7 +87,7 @@
 - type: alert
   id: Fire
   icons: [ /Textures/Interface/Alerts/Fire/fire.png ]
-  onClick: !type:ResistFire  { }
+  clickEvent: !type:ResistFireAlertEvent
   name: alerts-on-fire-name
   description: alerts-on-fire-desc
 
@@ -136,14 +136,14 @@
 
 - type: alert
   id: Handcuffed
-  onClick: !type:RemoveCuffs  { }
+  clickEvent: !type:RemoveCuffsAlertEvent
   icons: [ /Textures/Interface/Alerts/Handcuffed/Handcuffed.png ]
   name: alerts-handcuffed-name
   description: alerts-handcuffed-desc
 
 - type: alert
   id: Ensnared
-  onClick: !type:RemoveEnsnare  { }
+  clickEvent: !type:RemoveEnsnareAlertEvent
   icons:
   - sprite: /Textures/Interface/Alerts/ensnared.rsi
     state: ensnared
@@ -153,7 +153,7 @@
 - type: alert
   id: Buckled
   category: Buckled
-  onClick: !type:Unbuckle  { }
+  clickEvent: !type:UnbuckleAlertEvent
   icons: [ /Textures/Interface/Alerts/Buckle/buckled.png ]
   name: alerts-buckled-name
   description: alerts-buckled-desc
@@ -275,7 +275,7 @@
 - type: alert
   id: Internals
   category: Internals
-  onClick: !type:ToggleInternals {}
+  clickEvent: !type:ToggleInternalsAlertEvent
   icons:
   - sprite: /Textures/Interface/Alerts/internals.rsi
     state: internal0
@@ -291,7 +291,7 @@
 - type: alert
   id: PilotingShuttle
   category: Piloting
-  onClick: !type:StopPiloting { }
+  clickEvent: !type:StopPilotingAlertEvent
   icons: [ /Textures/Interface/Alerts/piloting.png ]
   name: alerts-piloting-name
   description: alerts-piloting-desc
@@ -365,27 +365,27 @@
   id: VowOfSilence
   icons: [ /Textures/Interface/Alerts/Abilities/silenced.png ]
   name: alerts-vow-silence-name
-  onClick: !type:BreakVow  { }
+  clickEvent: !type:BreakVowAlertEvent
   description: alerts-vow-silence-desc
 
 - type: alert
   id: VowBroken
   icons: [ /Textures/Interface/Actions/scream.png ]
   name: alerts-vow-broken-name
-  onClick: !type:RetakeVow  { }
+  clickEvent: !type:RetakeVowAlertEvent
   description: alerts-vow-broken-desc
 
 - type: alert
   id: Pulled
   icons: [ /Textures/Interface/Alerts/Pull/pulled.png ]
-  onClick: !type:StopBeingPulled  { }
+  clickEvent: !type:StopBeingPulledAlertEvent
   name: alerts-pulled-name
   description: alerts-pulled-desc
 
 - type: alert
   id: Pulling
   icons: [ /Textures/Interface/Alerts/Pull/pulling.png ]
-  onClick: !type:StopPulling  { }
+  clickEvent: !type:StopPullingAlertEvent
   name: alerts-pulling-name
   description: alerts-pulling-desc
 
diff --git a/Resources/Prototypes/Anomaly/behaviours.yml b/Resources/Prototypes/Anomaly/behaviours.yml
index dea1ddb69c3..924a4a75004 100644
--- a/Resources/Prototypes/Anomaly/behaviours.yml
+++ b/Resources/Prototypes/Anomaly/behaviours.yml
@@ -20,10 +20,12 @@
     InconstancyParticle: 0.5
     FullUnknown: 0.5
     Jumping: 0.3
+    Invisibility: 0.5
   #Complex
     FastUnknown: 0.2
     JumpingUnknown: 0.1
     InconstancyParticleUnknown: 0.1
+    InvisibilityJumping: 0.1
 
 
 # Easy x0.5 point production
@@ -153,6 +155,17 @@
     randomStartSecretMin: 4
     randomStartSecretMax: 6
 
+- type: anomalyBehavior
+  id: Invisibility
+  earnPointModifier: 1.6
+  description: anomaly-behavior-invisibility
+  components:
+  - type: Stealth
+    maxVisibility: 1.2
+  - type: StealthOnMove
+    passiveVisibilityRate: -0.37
+    movementVisibilityRate: 0.20
+
 # Complex Effects
 
 - type: anomalyBehavior
@@ -170,7 +183,6 @@
     randomStartSecretMin: 3
     randomStartSecretMax: 5
 
-
 - type: anomalyBehavior
   id: FastUnknown
   earnPointModifier: 1.9
@@ -191,4 +203,21 @@
     prob: 0.5
   - type: SecretDataAnomaly
     randomStartSecretMin: 3
-    randomStartSecretMax: 5
\ No newline at end of file
+    randomStartSecretMax: 5
+
+- type: anomalyBehavior
+  id: InvisibilityJumping
+  earnPointModifier: 1.95
+  description: anomaly-behavior-invisibility
+  components:
+  - type: ChaoticJump
+    jumpMinInterval: 15
+    jumpMaxInterval: 25
+    rangeMin: 1
+    rangeMax: 1
+    effect: PuddleSparkle
+  - type: Stealth
+    maxVisibility: 1.2
+  - type: StealthOnMove
+    passiveVisibilityRate: -0.37
+    movementVisibilityRate: 0.20
\ No newline at end of file
diff --git a/Resources/Prototypes/Atmospherics/gases.yml b/Resources/Prototypes/Atmospherics/gases.yml
index 6572b85e550..5c703c0eae6 100644
--- a/Resources/Prototypes/Atmospherics/gases.yml
+++ b/Resources/Prototypes/Atmospherics/gases.yml
@@ -79,7 +79,7 @@
   specificHeat: 40
   heatCapacityRatio: 1.3
   molarMass: 44
-  color: 2887E8
+  color: 8F00FF
   reagent: NitrousOxide
   pricePerMole: 1
 
diff --git a/Resources/Prototypes/Body/Organs/Animal/animal.yml b/Resources/Prototypes/Body/Organs/Animal/animal.yml
index 2f50821df35..8384e006df7 100644
--- a/Resources/Prototypes/Body/Organs/Animal/animal.yml
+++ b/Resources/Prototypes/Body/Organs/Animal/animal.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: BaseAnimalOrganUnGibbable
   parent: BaseItem
   abstract: true
@@ -34,7 +34,7 @@
   id: OrganAnimalLungs
   parent: BaseAnimalOrgan
   name: lungs
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     layers:
@@ -65,7 +65,7 @@
   id: OrganAnimalStomach
   parent: BaseAnimalOrgan
   name: stomach
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: stomach
@@ -91,7 +91,7 @@
   id: OrganMouseStomach
   parent: OrganAnimalStomach
   name: stomach
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: SolutionContainerManager
     solutions:
@@ -102,7 +102,7 @@
   id: OrganAnimalLiver
   parent: BaseAnimalOrgan
   name: liver
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: liver
@@ -118,7 +118,7 @@
   id: OrganAnimalHeart
   parent: BaseAnimalOrgan
   name: heart
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: heart-on
@@ -135,7 +135,7 @@
   id: OrganAnimalKidneys
   parent: BaseAnimalOrgan
   name: kidneys
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     layers:
diff --git a/Resources/Prototypes/Body/Organs/Animal/bloodsucker.yml b/Resources/Prototypes/Body/Organs/Animal/bloodsucker.yml
index 8a1afc37bb1..e360f362d82 100644
--- a/Resources/Prototypes/Body/Organs/Animal/bloodsucker.yml
+++ b/Resources/Prototypes/Body/Organs/Animal/bloodsucker.yml
@@ -1,8 +1,8 @@
-- type: entity
+- type: entity
   id: OrganBloodsuckerStomach
   parent: OrganAnimalStomach
   name: stomach
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Metabolizer
     metabolizerTypes: [ Bloodsucker ]
@@ -11,7 +11,7 @@
   id: OrganBloodsuckerLiver
   parent: OrganAnimalLiver
   name: liver
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Metabolizer
     metabolizerTypes: [ Bloodsucker ]
@@ -20,7 +20,7 @@
   id: OrganBloodsuckerHeart
   parent: OrganAnimalHeart
   name: heart
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Metabolizer
     metabolizerTypes: [ Bloodsucker ]
diff --git a/Resources/Prototypes/Body/Organs/Animal/ruminant.yml b/Resources/Prototypes/Body/Organs/Animal/ruminant.yml
index 3c3062ddec0..3b00e1a2237 100644
--- a/Resources/Prototypes/Body/Organs/Animal/ruminant.yml
+++ b/Resources/Prototypes/Body/Organs/Animal/ruminant.yml
@@ -1,8 +1,8 @@
-- type: entity
+- type: entity
   id: OrganAnimalRuminantStomach
   parent: OrganAnimalStomach
   name: ruminant stomach
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: SolutionContainerManager
     solutions:
diff --git a/Resources/Prototypes/Body/Organs/arachnid.yml b/Resources/Prototypes/Body/Organs/arachnid.yml
index c1e199e1121..29ca393d137 100644
--- a/Resources/Prototypes/Body/Organs/arachnid.yml
+++ b/Resources/Prototypes/Body/Organs/arachnid.yml
@@ -105,7 +105,7 @@
   parent: BaseHumanOrgan
   name: liver
   description: "Pairing suggestion: chianti and fava beans."
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: liver
@@ -122,7 +122,7 @@
   parent: BaseHumanOrgan
   name: kidneys
   description: "Filters toxins from the bloodstream."
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     layers:
diff --git a/Resources/Prototypes/Body/Organs/diona.yml b/Resources/Prototypes/Body/Organs/diona.yml
index 69fc630b9e4..e248355df2c 100644
--- a/Resources/Prototypes/Body/Organs/diona.yml
+++ b/Resources/Prototypes/Body/Organs/diona.yml
@@ -126,7 +126,7 @@
 - type: entity
   id: OrganDionaBrainNymph
   parent: OrganDionaBrain
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: brain
   description: "The source of incredible, unending intelligence. Honk."
   components:
@@ -138,7 +138,7 @@
 - type: entity
   id: OrganDionaStomachNymph
   parent: OrganDionaStomach
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: stomach
   description: "Gross. This is hard to stomach."
   components:
@@ -148,7 +148,7 @@
 - type: entity
   id: OrganDionaLungsNymph
   parent: OrganDionaLungs
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: lungs
   description: "Filters oxygen from an atmosphere, which is then sent into the bloodstream to be used as an electron carrier."
   components:
@@ -159,7 +159,7 @@
 - type: entity
   id: OrganDionaNymphBrain
   parent: MobDionaNymph
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: diona nymph
   suffix: Brain
   description: Contains the brain of a formerly fully-formed Diona. Killing this would kill the Diona forever. You monster.
@@ -171,7 +171,7 @@
 - type: entity
   id: OrganDionaNymphStomach
   parent: MobDionaNymphAccent 
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: diona nymph
   suffix: Stomach
   description: Contains the stomach of a formerly fully-formed Diona. It doesn't taste any better for it. 
@@ -183,7 +183,7 @@
 - type: entity
   id: OrganDionaNymphLungs
   parent: MobDionaNymphAccent
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: diona nymph
   suffix: Lungs
   description: Contains the lungs of a formerly fully-formed Diona. Breathtaking. 
diff --git a/Resources/Prototypes/Body/Organs/moth.yml b/Resources/Prototypes/Body/Organs/moth.yml
index 9b94e77b7eb..bad1149fd42 100644
--- a/Resources/Prototypes/Body/Organs/moth.yml
+++ b/Resources/Prototypes/Body/Organs/moth.yml
@@ -1,7 +1,7 @@
-- type: entity
+- type: entity
   id: OrganMothStomach
   parent: [OrganAnimalStomach, OrganHumanStomach]
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Stomach
     specialDigestible:
diff --git a/Resources/Prototypes/Body/Organs/reptilian.yml b/Resources/Prototypes/Body/Organs/reptilian.yml
index f8423582cc2..34c736aec8b 100644
--- a/Resources/Prototypes/Body/Organs/reptilian.yml
+++ b/Resources/Prototypes/Body/Organs/reptilian.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: OrganReptilianStomach
   parent: OrganAnimalStomach
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Stomach
     specialDigestible:
diff --git a/Resources/Prototypes/Body/Parts/animal.yml b/Resources/Prototypes/Body/Parts/animal.yml
index 4db026b40fb..347b052c8bc 100644
--- a/Resources/Prototypes/Body/Parts/animal.yml
+++ b/Resources/Prototypes/Body/Parts/animal.yml
@@ -36,7 +36,7 @@
   id: HandsAnimal
   name: animal hands
   parent: PartAnimal
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     layers:
@@ -50,7 +50,7 @@
   id: LegsAnimal
   name: animal legs
   parent: PartAnimal
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     layers:
@@ -64,7 +64,7 @@
   id: FeetAnimal
   name: animal feet
   parent: PartAnimal
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     layers:
@@ -77,7 +77,7 @@
   id: TorsoAnimal
   name: animal torso
   parent: PartAnimal
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     layers:
diff --git a/Resources/Prototypes/Body/Parts/gingerbread.yml b/Resources/Prototypes/Body/Parts/gingerbread.yml
index 661835ab843..f95e66145be 100644
--- a/Resources/Prototypes/Body/Parts/gingerbread.yml
+++ b/Resources/Prototypes/Body/Parts/gingerbread.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: PartGingerbread
   parent: [BaseItem, BasePart]
-  name: "gingerbead body part"
+  name: "gingerbread body part"
   abstract: true
   components:
   - type: Extractable
diff --git a/Resources/Prototypes/Body/Parts/rat.yml b/Resources/Prototypes/Body/Parts/rat.yml
index 6a66eecc489..bd51e006f70 100644
--- a/Resources/Prototypes/Body/Parts/rat.yml
+++ b/Resources/Prototypes/Body/Parts/rat.yml
@@ -4,7 +4,7 @@
   id: TorsoRat
   name: "animal torso"
   parent: PartAnimal
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: BodyPart
     partType: Torso
diff --git a/Resources/Prototypes/Body/Parts/silicon.yml b/Resources/Prototypes/Body/Parts/silicon.yml
index 2f5a621ab0e..6b2b3f57d26 100644
--- a/Resources/Prototypes/Body/Parts/silicon.yml
+++ b/Resources/Prototypes/Body/Parts/silicon.yml
@@ -24,7 +24,8 @@
       Steel: 25
   - type: GuideHelp
     guides:
-      - Cyborgs
+    - Cyborgs
+    - Robotics
 
 - type: entity
   id: BaseBorgArmLeft
diff --git a/Resources/Prototypes/Body/Prototypes/a_ghost.yml b/Resources/Prototypes/Body/Prototypes/a_ghost.yml
index 09784c3ef53..7d358a57622 100644
--- a/Resources/Prototypes/Body/Prototypes/a_ghost.yml
+++ b/Resources/Prototypes/Body/Prototypes/a_ghost.yml
@@ -1,6 +1,6 @@
 - type: body
   id: Aghost
-  name: "aGhost"
+  name: "aghost"
   root: torso
   slots:
     torso:
diff --git a/Resources/Prototypes/Body/Prototypes/arachnid.yml b/Resources/Prototypes/Body/Prototypes/arachnid.yml
index 97af67933cb..a3caa42a6eb 100644
--- a/Resources/Prototypes/Body/Prototypes/arachnid.yml
+++ b/Resources/Prototypes/Body/Prototypes/arachnid.yml
@@ -1,6 +1,6 @@
 - type: body
   id: Arachnid
-  name: "Arachnid"
+  name: "arachnid"
   root: torso
   slots:
     head:
diff --git a/Resources/Prototypes/Body/Prototypes/moth.yml b/Resources/Prototypes/Body/Prototypes/moth.yml
index 7ebeda7fefa..b3271834417 100644
--- a/Resources/Prototypes/Body/Prototypes/moth.yml
+++ b/Resources/Prototypes/Body/Prototypes/moth.yml
@@ -1,6 +1,6 @@
 - type: body
   id: Moth
-  name: "Moth"
+  name: "moth"
   root: torso
   slots:
     head:
diff --git a/Resources/Prototypes/Catalog/Bounties/bounties.yml b/Resources/Prototypes/Catalog/Bounties/bounties.yml
index 08bb2a14225..b4847731df8 100644
--- a/Resources/Prototypes/Catalog/Bounties/bounties.yml
+++ b/Resources/Prototypes/Catalog/Bounties/bounties.yml
@@ -1,4 +1,4 @@
-- type: cargoBounty
+- type: cargoBounty
   id: BountyArtifact
   reward: 2500
   description: bounty-description-artifact
@@ -500,6 +500,11 @@
     whitelist:
       components:
       - TemperatureProtection
+      tags:
+      - Scarf
+    blacklist:
+      components:
+      - ToggleableClothing
 
 - type: cargoBounty
   id: BountyBattery
@@ -728,3 +733,13 @@
       tags:
       - MicrowaveMachineBoard
 
+- type: cargoBounty
+  id: BountyFlashes
+  reward: 5500
+  description: bounty-description-flashes
+  entries:
+  - name: bounty-item-flash
+    amount: 6
+    whitelist:
+      components:
+      - Flash
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml
index 7ca6af84518..d4e2b4c60dc 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml
@@ -28,6 +28,16 @@
   category: cargoproduct-category-name-engineering
   group: market
 
+- type: cargoProduct
+  id: EngineeringFoamGrenade
+  icon:
+    sprite: Objects/Weapons/Grenades/metalfoam.rsi
+    state: icon
+  product: CrateEngineeringFoamGrenade
+  cost: 2500
+  category: cargoproduct-category-name-engineering
+  group: market
+
 - type: cargoProduct
   id: EngineeringCableBulk
   icon:
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
index 0f930ddfd6a..4701d50c013 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
@@ -198,3 +198,12 @@
   category: cargoproduct-category-name-service
   group: market
 
+- type: cargoProduct
+  id: ServiceCandles
+  icon:
+    sprite: Objects/Misc/candles.rsi
+    state: candle-big
+  product: CrateCandles
+  cost: 500
+  category: cargoproduct-category-name-service
+  group: market
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
deleted file mode 100644
index 749818310e9..00000000000
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ /dev/null
@@ -1,422 +0,0 @@
-- type: entity
-  parent: ClothingBackpack
-  id: ClothingBackpackFilled
-  noSpawn: true
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackClown
-  id: ClothingBackpackClownFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxHug
-      - id: RubberStampClown
-      - id: CrayonRainbow
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSecurity
-  id: ClothingBackpackSecurityFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-#      - id: MagazinePistol # DeltaV - Security doesn't get an extra mag
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSecurity
-  id: ClothingBackpackSecurityFilledDetective
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: ForensicPad
-      - id: ForensicScanner
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackMedical
-  id: ClothingBackpackMedicalFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackMedical
-  id: ClothingBackpackParamedicFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-      - id: EmergencyRollerBedSpawnFolded
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackCaptain
-  id: ClothingBackpackCaptainFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- name: StationCharter
-      #- name: TelescopicBaton
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackEngineering
-  id: ClothingBackpackChiefEngineerFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackScience
-  id: ClothingBackpackResearchDirectorFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpack
-  id: ClothingBackpackHOPFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackIan
-  id: ClothingBackpackHOPIanFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackMedical
-  id: ClothingBackpackCMOFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackCargo
-  id: ClothingBackpackQuartermasterFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSecurity
-  id: ClothingBackpackHOSFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: MagazinePistol
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackEngineering
-  id: ClothingBackpackEngineeringFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackAtmospherics
-  id: ClothingBackpackAtmosphericsFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackScience
-  id: ClothingBackpackScienceFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackHydroponics
-  id: ClothingBackpackHydroponicsFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackMime
-  id: ClothingBackpackMimeFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: RubberStampMime
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackChemistry
-  id: ClothingBackpackChemistryFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpack
-  id: ClothingBackpackChaplainFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Bible
-      - id: RubberStampChaplain
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpack
-  id: ClothingBackpackLawyerFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: RubberStampLawyer
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpack
-  id: ClothingBackpackMusicianFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-        - id: AcousticGuitarInstrument
-        - id: SaxophoneInstrument
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpack
-  id: ClothingBackpackLibrarianFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-        - id: BookRandom
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpack
-  id: ClothingBackpackDetectiveFilled
-  components:
-    - type: StorageFill
-      contents:
-      - id: BoxSurvival
-      - id: Lighter
-      - id: CigPackBlack
-      - id: HandLabeler
-      - id: BoxForensicPad
-
-# ERT
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackERTLeader
-  id: ClothingBackpackERTLeaderFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvivalEngineering
-        - id: WeaponDisabler
-        - id: MedicatedSuture
-        - id: RegenerativeMesh
-        - id: BoxZiptie
-        - id: CrowbarRed
-        - id: MagazineMagnum
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackERTSecurity
-  id: ClothingBackpackERTSecurityFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvivalEngineering
-        - id: WeaponDisabler
-        - id: MedicatedSuture
-        - id: RegenerativeMesh
-        - id: BoxZiptie
-        - id: CrowbarRed
-        - id: MagazinePistol
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackERTMedical
-  id: ClothingBackpackERTMedicalFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvivalMedical
-        - id: Hypospray
-        - id: MedkitAdvancedFilled
-        - id: CrowbarRed
-        - id: OmnizineChemistryBottle
-        - id: EpinephrineChemistryBottle
-        - id: EpinephrineChemistryBottle
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackERTEngineer
-  id: ClothingBackpackERTEngineerFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvivalEngineering
-        - id: trayScanner
-        - id: RCD
-        - id: RCDAmmo
-          amount: 2
-        - id: CableMVStack
-        - id: CableHVStack
-        - id: CableApcStack
-        - id: SheetPlasteel
-        - id: SheetSteel
-        - id: SheetGlass
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackERTJanitor
-  id: ClothingBackpackERTJanitorFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvivalEngineering
-        - id: LightReplacer
-        - id: BoxLightMixed
-        - id: BoxLightMixed
-        - id: Soap
-        - id: CrowbarRed
-        - id: AdvMopItem
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackERTChaplain
-  id: ClothingBackpackERTChaplainFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvivalEngineering
-        - id: BoxCandle
-        - id: BoxBodyBag
-        - id: DrinkWaterMelonJuiceJug
-        - id: Lantern
-        - id: Lantern
-        - id: Bible
-        - id: CrowbarRed
-        - id: FoodBakedBunHotX
-        - id: FoodBakedBunHotX
-        - id: FoodBakedBunHotX
-        - id: FoodBakedBunHotX
-        - id: Lighter
-
-# Death Squad
-
-- type: entity
-  noSpawn: false
-  parent: ClothingBackpackERTSecurity
-  id: ClothingBackpackDeathSquadFilled
-  name: death squad backpack
-  description: Holds the kit of CentComm's most feared agents.
-  components:
-    - type: Storage
-      grid:
-      - 0,0,7,6
-    - type: StorageFill
-      contents:
-        - id: BoxSurvivalEngineering
-        - id: WeaponPulseRifle
-        - id: WeaponPulsePistol
-        - id: WeaponRevolverMateba
-        - id: SpeedLoaderMagnumAP
-        - id: SpeedLoaderMagnumAP
-        - id: BoxFlashbang
-        - id: ToolDebug # spanish army knife
-        - id: WelderExperimental
-        - id: Hypospray
-        - id: DeathAcidifierImplanter # crew will try to steal their amazing hardsuits
-        - id: FreedomImplanter
-
-# Cargo
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackCargo
-  id: ClothingBackpackCargoFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSalvage
-  id: ClothingBackpackSalvageFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-
-# Pirate
-
-- type: entity
-  parent: ClothingBackpackSatchelLeather
-  id: ClothingBackpackPirateFilled
-  suffix: Filled, Pirate
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-        - id: Cutlass
-        - id: WeaponRevolverPirate
-        - id: ClothingEyesEyepatch
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
deleted file mode 100644
index fc49adcd213..00000000000
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
+++ /dev/null
@@ -1,275 +0,0 @@
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffel
-  id: ClothingBackpackDuffelFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelClown
-  id: ClothingBackpackDuffelClownFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxHug
-      - id: RubberStampClown
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelSecurity
-  id: ClothingBackpackDuffelSecurityFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-#      - id: MagazinePistol # DeltaV - Security doesn't get an extra mag
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelSecurity
-  id: ClothingBackpackDuffelSecurityFilledDetective
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: ForensicPad
-      - id: ForensicScanner
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelBrigmedic
-  id: ClothingBackpackDuffelBrigmedicFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: Flash
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelMedical
-  id: ClothingBackpackDuffelMedicalFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelMedical
-  id: ClothingBackpackDuffelParamedicFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-      - id: EmergencyRollerBedSpawnFolded
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelCaptain
-  id: ClothingBackpackDuffelCaptainFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- name: StationCharter
-      #- name: TelescopicBaton
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelEngineering
-  id: ClothingBackpackDuffelChiefEngineerFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelScience
-  id: ClothingBackpackDuffelResearchDirectorFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffel
-  id: ClothingBackpackDuffelHOPFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelMedical
-  id: ClothingBackpackDuffelCMOFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelCargo
-  id: ClothingBackpackDuffelQuartermasterFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelSecurity
-  id: ClothingBackpackDuffelHOSFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: MagazinePistol
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelEngineering
-  id: ClothingBackpackDuffelEngineeringFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelAtmospherics
-  id: ClothingBackpackDuffelAtmosphericsFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelScience
-  id: ClothingBackpackDuffelScienceFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelHydroponics
-  id: ClothingBackpackDuffelHydroponicsFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelMime
-  id: ClothingBackpackDuffelMimeFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: RubberStampMime
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelChemistry
-  id: ClothingBackpackDuffelChemistryFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffel
-  id: ClothingBackpackDuffelChaplainFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Bible
-      - id: RubberStampChaplain
-  
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffel
-  id: ClothingBackpackDuffelLawyerFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: RubberStampLawyer
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffel
-  id: ClothingBackpackDuffelMusicianFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-        - id: AcousticGuitarInstrument
-        - id: SaxophoneInstrument
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffel
-  id: ClothingBackpackDuffelLibrarianFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-        - id: BookRandom
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffel
-  id: ClothingBackpackDuffelDetectiveFilled
-  components:
-    - type: StorageFill
-      contents:
-      - id: BoxSurvival
-      - id: Lighter
-      - id: CigPackBlack
-      - id: BoxForensicPad
-      - id: HandLabeler
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelCargo
-  id: ClothingBackpackDuffelCargoFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelSalvage
-  id: ClothingBackpackDuffelSalvageFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
deleted file mode 100644
index 665fcc182e6..00000000000
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
+++ /dev/null
@@ -1,300 +0,0 @@
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelTools
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Crowbar
-      - id: Wrench
-      - id: Screwdriver
-      - id: Wirecutter
-      - id: Welder
-      - id: Multitool
-
-- type: entity
-  parent: ClothingBackpackSatchelClown
-  id: ClothingBackpackSatchelClownFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxHug
-      - id: RubberStampClown
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelSecurity
-  id: ClothingBackpackSatchelSecurityFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-#      - id: MagazinePistol # DeltaV - Security doesn't get an extra mag
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelSecurity
-  id: ClothingBackpackSatchelSecurityFilledDetective
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: ForensicPad
-      - id: ForensicScanner
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelBrigmedic
-  id: ClothingBackpackSatchelBrigmedicFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: Flash
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelMedical
-  id: ClothingBackpackSatchelMedicalFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelMedical
-  id: ClothingBackpackSatchelParamedicFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-      - id: EmergencyRollerBedSpawnFolded
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelCaptain
-  id: ClothingBackpackSatchelCaptainFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- name: StationCharter
-      #- name: TelescopicBaton
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelEngineering
-  id: ClothingBackpackSatchelChiefEngineerFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelScience
-  id: ClothingBackpackSatchelResearchDirectorFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelHOPFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelMedical
-  id: ClothingBackpackSatchelCMOFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelCargo
-  id: ClothingBackpackSatchelQuartermasterFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelSecurity
-  id: ClothingBackpackSatchelHOSFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: MagazinePistol
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelEngineering
-  id: ClothingBackpackSatchelEngineeringFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelAtmospherics
-  id: ClothingBackpackSatchelAtmosphericsFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelScience
-  id: ClothingBackpackSatchelScienceFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelHydroponics
-  id: ClothingBackpackSatchelHydroponicsFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelChemistry
-  id: ClothingBackpackSatchelChemistryFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelChaplainFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Bible
-      - id: RubberStampChaplain
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelLawyerFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: RubberStampLawyer
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelMusicianFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-        - id: AcousticGuitarInstrument
-        - id: SaxophoneInstrument
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelLibrarianFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-        - id: BookRandom
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelDetectiveFilled
-  components:
-    - type: StorageFill
-      contents:
-      - id: BoxSurvival
-      - id: BoxForensicPad
-      - id: Lighter
-      - id: CigPackBlack
-      - id: HandLabeler
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelCargo
-  id: ClothingBackpackSatchelCargoFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelSalvage
-  id: ClothingBackpackSatchelSalvageFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelMime
-  id: ClothingBackpackSatchelMimeFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: RubberStampMime
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelHolding
-  id: ClothingBackpackSatchelHoldingAdmin
-  components:
-  - type: StorageFill
-    contents:
-    - id: GasAnalyzer
-    - id: trayScanner
-    - id: AccessConfiguratorUniversal
-  - type: Unremoveable
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
index c07b0eccf19..4dc965eb8d4 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -13,23 +13,6 @@
       - id: Retractor
       - id: Scalpel
 
-- type: entity
-  id: ClothingBackpackDuffelCBURNFilled
-  parent: ClothingBackpackDuffelCBURN
-  suffix: Filled
-  components:
-  - type: StorageFill
-    contents:
-    - id: BoxSurvivalEngineering
-    - id: WeaponShotgunDoubleBarreled
-    - id: BoxShotgunIncendiary
-      amount: 2
-    - id: GrenadeFlashBang
-      amount: 2
-    - id: PillAmbuzolPlus
-    - id: PillAmbuzol
-      amount: 4
-
 - type: entity
   parent: ClothingBackpackDuffelSyndicateMedicalBundle
   id: ClothingBackpackDuffelSyndicateFilledMedical
@@ -147,8 +130,8 @@
 - type: entity
   parent: ClothingBackpackDuffel
   id: ClothingBackpackDuffelSyndicateCostumeCentcom
-  name: CentCom official costume duffel bag
-  description: "Contains a full CentCom Official uniform set, headset and clipboard included. Encryption keys and ID access are not included."
+  name: CentComm official costume duffel bag
+  description: "Contains a full CentComm Official uniform set, headset and clipboard included. Encryption keys and ID access are not included."
   suffix: DO NOT MAP
   components:
   - type: Tag
@@ -264,6 +247,19 @@
       - id: DoubleEmergencyOxygenTankFilled
       - id: DoubleEmergencyNitrogenTankFilled
 
+- type: entity
+  parent: ClothingBackpackDuffelSyndicateBundle
+  id: ClothingBackpackDuffelSyndicateRaidBundle
+  name: syndicate raid suit bundle
+  description: "Contains the Syndicate's durable raid armor suit."
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingOuterArmorRaid
+      - id: ClothingHeadHelmetRaid
+      - id: ClothingMaskGasSyndicate
+      - id: ClothingHandsGlovesCombat
+
 - type: entity
   parent: ClothingBackpackDuffelSyndicateBundle
   id: ClothingBackpackDuffelSyndicateHardsuitBundle
@@ -320,38 +316,6 @@
       - id: PillAmbuzol
         amount: 3
 
-- type: entity
-  parent: ClothingBackpackDuffelSyndicateBundle
-  id: ClothingBackpackDuffelSyndicateOperative
-  name: operative duffelbag
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSyndicate
-      - id: WeaponPistolViper
-      - id: PinpointerSyndicateNuclear
-      - id: DeathAcidifierImplanter
-
-
-- type: entity
-  parent: ClothingBackpackDuffelSyndicateMedicalBundle
-  id: ClothingBackpackDuffelSyndicateOperativeMedic
-  name: operative medic duffelbag
-  description: A large duffel bag for holding extra medical supplies.
-  components:
-  - type: StorageFill
-    contents:
-      - id: SyndiHypo
-      - id: BoxSurvivalSyndicate
-      - id: SawAdvanced
-      - id: Cautery
-      - id: CombatKnife
-      - id: WeaponPistolViper
-      - id: PinpointerSyndicateNuclear
-      - id: HandheldHealthAnalyzer
-      - id: CombatMedipen
-      - id: DeathAcidifierImplanter
-
 - type: entity
   parent: ClothingBackpackDuffelSyndicateMedicalBundle
   id: ClothingBackpackDuffelSyndicateMedicalBundleFilled
diff --git a/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml b/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
index 09c7e165bfa..a0b6b57ec17 100644
--- a/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
+++ b/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
@@ -35,6 +35,8 @@
         orGroup: BookPool
       - id: BookChemicalCompendium
         orGroup: BookPool
+      - id: BookSpaceLaw
+        orGroup: BookPool
       - id: BookNarsieLegend
         prob: 0.1
         orGroup: BookAuthor
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
index 2fbaaeb6b7a..2cb46255f9f 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
@@ -1,149 +1,237 @@
 - type: entity
-  name: survival box
   parent: BoxCardboard
   id: BoxSurvival
+  name: survival box
   description: It's a box with basic internals inside.
+  suffix: Standard
   components:
   - type: StorageFill
     contents:
-      - id: ClothingMaskBreath
-      - id: EmergencyOxygenTankFilled
-      - id: SpaceMedipen
-      - id: EmergencyMedipen
-      - id: Flare
-      - id: FoodPSB # Nyanotrasen - Replace Tinned Meat with PSB
-      - id: DrinkWaterBottleFull
+    - id: ClothingMaskBreath
+    - id: EmergencyOxygenTankFilled
+    - id: EmergencyMedipen
+    - id: SpaceMedipen # DeltaV - keep spacepen
+    - id: Flare
+    - id: FoodPSB # DeltaV - replace nutribrick with PSB
+    - id: DrinkWaterBottleFull
   - type: Sprite
     layers:
-      - state: internals
-      - state: emergencytank
+    - state: internals
+    - state: emergencytank
+
+- type: entity
+  parent: BoxSurvival
+  id: BoxSurvivalNitrogen
+  suffix: Standard N2
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingMaskBreath
+    - id: EmergencyNitrogenTankFilled
+    - id: EmergencyMedipen
+    - id: SpaceMedipen # DeltaV - keep spacepen
+    - id: Flare
+    - id: FoodPSB # DeltaV - replace nutribrick with PSB
+    - id: DrinkWaterBottleFull
+  # Intentionally wrong picture on the box. NT did not care enough to change it.
+  - type: Label
+    currentLabel: reagent-name-nitrogen
 
 - type: entity
-  name: extended-capacity survival box
   parent: BoxCardboard
   id: BoxSurvivalEngineering
+  name: extended-capacity survival box
   description: It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank.
-  suffix: Engineering
+  suffix: Extended
   components:
   - type: StorageFill
     contents:
-      - id: ClothingMaskBreath
-      - id: ExtendedEmergencyOxygenTankFilled
-      - id: SpaceMedipen
-      - id: EmergencyMedipen
-      - id: Flare
-      - id: FoodPSB # Nyanotrasen - Replace Tinned Meat with PSB
-      - id: DrinkWaterBottleFull
+    - id: ClothingMaskBreath
+    - id: ExtendedEmergencyOxygenTankFilled
+    - id: EmergencyMedipen
+    - id: SpaceMedipen # DeltaV - keep spacepen
+    - id: Flare
+    - id: FoodPSB # DeltaV - replace nutribrick with PSB
+    - id: DrinkWaterBottleFull
   - type: Sprite
     layers:
-      - state: internals
-      - state: extendedtank
+    - state: internals
+    - state: extendedtank
+
+- type: entity
+  parent: BoxSurvivalEngineering
+  id: BoxSurvivalEngineeringNitrogen
+  suffix: Extended N2
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingMaskBreath
+    - id: ExtendedEmergencyNitrogenTankFilled
+    - id: EmergencyMedipen
+    - id: SpaceMedipen # DeltaV - keep spacepen
+    - id: Flare
+    - id: FoodPSB # DeltaV - replace nutribrick with PSB
+    - id: DrinkWaterBottleFull
+  # Intentionally wrong picture on the box. NT did not care enough to change it.
+  - type: Label
+    currentLabel: reagent-name-nitrogen
 
 - type: entity
-  name: survival box
   parent: BoxCardboard
   id: BoxSurvivalSecurity
+  name: survival box
   description: It's a box with basic internals inside.
   suffix: Security
   components:
   - type: StorageFill
     contents:
-      - id: ClothingMaskGasSecurity
-      - id: EmergencyOxygenTankFilled
-      - id: SpaceMedipen
-      - id: EmergencyMedipen
-      - id: Flare
-      - id: FoodPSB # Nyanotrasen - Replace Tinned Meat with PSB
-      - id: DrinkWaterBottleFull
+    - id: ClothingMaskGasSecurity
+    - id: EmergencyOxygenTankFilled
+    - id: EmergencyMedipen
+    - id: SpaceMedipen # DeltaV - keep spacepen
+    - id: Flare
+    - id: FoodPSB # DeltaV - replace nutribrick with PSB
+    - id: DrinkWaterBottleFull
   - type: Sprite
     layers:
-      - state: internals
-      - state: emergencytank
+    - state: internals
+    - state: emergencytank
 
 - type: entity
-  name: survival box
-  parent: BoxCardboard
-  id: BoxSurvivalBrigmedic
-  description: It's a box with basic internals inside.
-  suffix: MedSec
+  parent: BoxSurvivalSecurity
+  id: BoxSurvivalSecurityNitrogen
+  suffix: Security N2
   components:
   - type: StorageFill
     contents:
-      - id: ClothingMaskBreathMedicalSecurity
-      - id: EmergencyOxygenTankFilled
-      - id: SpaceMedipen
-      - id: EmergencyMedipen
-      - id: EmergencyMedipen
-      - id: FoodPSB # Nyanotrasen - Replace Tinned Meat with PSB
-      - id: DrinkWaterBottleFull
-  - type: Sprite
-    layers:
-      - state: internals
-      - state: emergencytank
+    - id: ClothingMaskGasSecurity
+    - id: EmergencyNitrogenTankFilled
+    - id: EmergencyMedipen
+    - id: SpaceMedipen # DeltaV - keep spacepen
+    - id: Flare
+    - id: FoodPSB # DeltaV - replace nutribrick with PSB
+    - id: DrinkWaterBottleFull
+  # Intentionally wrong picture on the box. NT did not care enough to change it.
+  - type: Label
+    currentLabel: reagent-name-nitrogen
 
 - type: entity
-  name: survival box
   parent: BoxCardboard
   id: BoxSurvivalMedical
+  name: survival box
   description: It's a box with basic internals inside.
   suffix: Medical
   components:
   - type: StorageFill
     contents:
-      - id: ClothingMaskBreathMedical
-      - id: EmergencyOxygenTankFilled
-      - id: SpaceMedipen
-      - id: EmergencyMedipen
-      - id: Flare
-      - id: FoodPSB # Nyanotrasen - Replace Tinned Meat with PSB
-      - id: DrinkWaterBottleFull
+    - id: ClothingMaskBreathMedical
+    - id: EmergencyOxygenTankFilled
+    - id: EmergencyMedipen
+    - id: SpaceMedipen # DeltaV - keep spacepen
+    - id: Flare
+    - id: FoodPSB # DeltaV - replace nutribrick with PSB
+    - id: DrinkWaterBottleFull
   - type: Sprite
     layers:
-      - state: internals
-      - state: emergencytank
+    - state: internals
+    - state: emergencytank
+
+- type: entity
+  parent: BoxSurvivalMedical
+  id: BoxSurvivalMedicalNitrogen
+  suffix: Medical N2
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingMaskBreathMedical
+    - id: EmergencyNitrogenTankFilled
+    - id: EmergencyMedipen
+    - id: SpaceMedipen # DeltaV - keep spacepen
+    - id: Flare
+    - id: FoodPSB # DeltaV - replace nutribrick with PSB
+    - id: DrinkWaterBottleFull
+  # Intentionally wrong picture on the box. NT did not care enough to change it.
+  - type: Label
+    currentLabel: reagent-name-nitrogen
 
 - type: entity
-  name: box of hugs
   parent: BoxCardboard
   id: BoxHug
+  name: box of hugs
   description: A special box for sensitive people.
   suffix: Emergency
   components:
   - type: Sprite
     layers:
-      - state: box_hug
-      - state: heart
+    - state: box_hug
+    - state: heart
   - type: Item
     heldPrefix: hug
   - type: StorageFill
     contents:
-      - id: ClothingMaskBreath
-      - id: EmergencyFunnyOxygenTankFilled
-      - id: SpaceMedipen
-      - id: EmergencyMedipen
-      - id: Flare
-      - id: FoodPSB # Nyanotrasen - Replace Tinned Meat with PSB
-      - id: DrinkWaterBottleFull
+    - id: ClothingMaskBreath
+    - id: EmergencyFunnyOxygenTankFilled
+    - id: EmergencyMedipen
+    - id: SpaceMedipen # DeltaV - keep spacepen
+    - id: Flare
+    - id: FoodPSB # DeltaV - replace nutribrick with PSB
+    - id: DrinkWaterBottleFull
   - type: Tag
     tags:
-      - BoxHug
+    - BoxHug
+
+- type: entity
+  parent: BoxHug
+  id: BoxHugNitrogen
+  suffix: Emergency N2
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingMaskBreath
+    - id: EmergencyNitrogenTankFilled
+    - id: EmergencyMedipen
+    - id: SpaceMedipen # DeltaV - keep spacepen
+    - id: Flare
+    - id: FoodPSB # DeltaV - replace nutribrick with PSB
+    - id: DrinkWaterBottleFull
+  - type: Label
+    currentLabel: reagent-name-nitrogen
 
 - type: entity
-  name: extended-capacity survival box
   parent: BoxCardboard
   id: BoxSurvivalSyndicate
+  name: extended-capacity survival box
   description: It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank.
   suffix: Syndicate
   components:
   - type: StorageFill
     contents:
-      - id: ClothingMaskGasSyndicate
-      - id: ExtendedEmergencyOxygenTankFilled
-      - id: EmergencyMedipen
-      - id: Flare
-      - id: FoodPSB # Nyanotrasen - Replace Tinned Meat with PSB
-      - id: DrinkWaterBottleFull
+    - id: ClothingMaskGasSyndicate
+    - id: ExtendedEmergencyOxygenTankFilled
+    - id: EmergencyMedipen
+    - id: SpaceMedipen # DeltaV - keep spacepen
+    - id: Flare
+    - id: FoodPSB # DeltaV - replace nutribrick with PSB
+    - id: DrinkWaterBottleFull # DeltaV - why didnt they get water???
   - type: Sprite
     layers:
-      - state: internals
-      - state: extendedtank
+    - state: internals
+    - state: extendedtank
+
+- type: entity
+  parent: BoxSurvivalSyndicate
+  id: BoxSurvivalSyndicateNitrogen
+  suffix: Syndicate N2
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingMaskGasSyndicate
+    - id: ExtendedEmergencyNitrogenTankFilled
+    - id: EmergencyMedipen
+    - id: SpaceMedipen # DeltaV - keep spacepen
+    - id: Flare
+    - id: FoodPSB # DeltaV - replace nutribrick with PSB
+    - id: DrinkWaterBottleFull # DeltaV - why didnt they get water???
+    # Intentionally wrong picture on the box to mimic the NT one
+  - type: Label
+    currentLabel: reagent-name-nitrogen
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
index 2b29962bd0c..99531fec17c 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -432,3 +432,17 @@
       - id: DartYellow
         amount: 2
 
+- type: entity
+  name: envelope box
+  parent: BoxCardboard
+  id: BoxEnvelope
+  description: A box filled with envelopes.
+  components:
+  - type: Sprite
+    layers:
+      - state: box
+      - state: envelope
+  - type: StorageFill
+    contents:
+      - id: Envelope
+        amount: 9
\ No newline at end of file
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
index 26a8910c735..62d07b0beda 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
@@ -76,6 +76,17 @@
       - id: CableHVStack
         amount: 3
 
+- type: entity
+  id: CrateEngineeringFoamGrenade
+  parent: CrateEngineeringSecure
+  name: sealant grenade crate
+  description: 5 metal foam sealant grenades.
+  components:
+  - type: StorageFill
+    contents:
+    - id: MetalFoamGrenade
+      amount: 5
+
 - type: entity
   id: CrateEngineeringCableBulk
   parent: CrateElectrical
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml b/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml
new file mode 100644
index 00000000000..4505a8cc7bf
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml
@@ -0,0 +1,372 @@
+- type: entity
+  name: Perma Escape Crate Spawner
+  id: CratePermaEscapeSpawner
+  parent: CrateEmptySpawner
+  components:
+  - type: RandomSpawner
+    prototypes:
+    # Please note any duplicates & alphabetize <3
+      - CrateEngineeringMiniJetpack
+      - CratePermaEscapeBureaucracy
+      - CratePermaEscapeEVA
+      - CratePermaEscapeGiftsFromSyndicate
+      - CratePermaEscapeGun
+      - CratePermaEscapeLights
+      - CratePermaEscapeMerc
+      - CrateServiceCustomSmokable
+      - CrateTrashCartFilled
+      - CratePermaEscapeComs # x2
+      - CratePermaEscapeComs
+      - CratePermaEscapeDigging # x2
+      - CratePermaEscapeDigging
+      - CratePermaEscapeMats #x2
+      - CratePermaEscapeMats
+      - CratePermaEscapeTowercap # x2
+      - CratePermaEscapeTowercap
+      - ClosetMaintenanceFilledRandom # x3
+      - ClosetMaintenanceFilledRandom
+      - ClosetMaintenanceFilledRandom
+    rarePrototypes:
+      - MobTick # These need to be killable by one dude with a shovel.
+    rareChance: .30
+    chance: 1
+    offset: 0.0
+
+- type: entity
+  id: CratePermaEscapeDigging
+  parent: CrateGenericSteel
+  suffix: Digging
+  components:
+  - type: StorageFill
+    contents:
+      - id: Shovel
+      - id: Pickaxe
+        prob: 0.90
+      - id: Pickaxe
+        prob: 0.40
+      - id: Pickaxe
+        prob: 0.10
+      - id: Shovel
+        prob: 0.50
+      - id: Shovel
+        prob: 0.20
+      - id: HydroponicsToolSpade
+        prob: 0.10
+      - id: HydroponicsToolHatchet
+        prob: 0.05
+
+- type: entity
+  id: CratePermaEscapeEVA
+  parent: CrateGenericSteel
+  suffix: EVAs
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingHeadHelmetEVALarge
+      - id: ClothingOuterHardsuitEVAPrisoner
+      - id: ClothingHeadHelmetEVALarge
+        prob: 0.80
+      - id: ClothingOuterHardsuitEVAPrisoner
+        prob: 0.80
+      - id: ClothingOuterHardsuitVoidParamed
+        prob: 0.10
+      - id: ClothingOuterRedRacoon
+        prob: 0.10
+      - id: ClothingOuterSanta
+        prob: 0.10
+      - id: ClothingOuterHardsuitSyndicate
+        prob: 0.20
+      - id: EmergencyOxygenTankFilled
+        prob: 0.25
+      - id: EmergencyOxygenTank
+        prob: 0.25
+      - id: OxygenTankFilled
+        prob: 0.05
+        
+- type: entity
+  id: CratePermaEscapeGun
+  parent: CrateGenericSteel
+  suffix: Gun
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponPistolMk58
+      prob: 0.15
+      orGroup: gun
+    - id: FoamCrossbow
+      prob: 0.10
+      orGroup: gun
+    - id: WeaponRifleFoam
+      prob: 0.05
+      orGroup: gun
+    - id: WeaponPistolFlintlock
+      prob: 0.20
+      orGroup: gun
+    - id: WeaponShotgunBlunderbuss
+      prob: 0.10
+      orGroup: gun
+    - id: WeaponShotgunBlunderbuss
+      prob: 0.15
+      orGroup: gun
+    - id: WeaponRevolverPirate
+      prob: 0.15
+      orGroup: gun
+    - id: WeaponProtoKineticAccelerator
+      prob: 0.20
+      orGroup: gun
+
+- type: entity
+  id: CratePermaEscapeBureaucracy
+  parent: CrateGenericSteel
+  suffix: Writing
+  components:
+  - type: StorageFill
+    contents:
+      - id: RubberStampApproved
+      - id: RubberStampDenied
+      - id: Pen
+      - id: Pen
+      - id: Pen
+      - id: BoxFolderBase
+        orGroup: folderA
+      - id: BoxFolderBlack
+        orGroup: folderA
+      - id: BoxFolderBlue
+        orGroup: folderA
+      - id: BoxFolderGreen
+        orGroup: folderA
+      - id: BoxFolderGrey
+        orGroup: folderA
+      - id: BoxFolderRed
+        orGroup: folderA
+      - id: BoxFolderWhite
+        orGroup: folderA
+      - id: BoxFolderYellow
+        orGroup: folderA
+      - id: BoxFolderBase
+        orGroup: folderB
+      - id: BoxFolderBlack
+        orGroup: folderB
+      - id: BoxFolderBlue
+        orGroup: folderB
+      - id: BoxFolderGreen
+        orGroup: folderB
+      - id: BoxFolderGrey
+        orGroup: folderB
+      - id: BoxFolderRed
+        orGroup: folderB
+      - id: BoxFolderWhite
+        orGroup: folderB
+      - id: BoxFolderYellow
+        orGroup: folderB
+      - id: CrayonBox
+        prob: 0.50
+      - id: CrayonBox
+        prob: 0.10
+      - id: ClearPDA # change to visitor one day.
+        prob: 0.10
+      - id: PersonalAI
+
+- type: entity
+  id: CratePermaEscapeLights
+  parent: CrateGenericSteel
+  suffix: Glowsticks
+  components:
+  - type: StorageFill
+    contents:
+      - id: GlowstickBlue
+        prob: 0.50
+      - id: GlowstickBlue
+        prob: 0.20
+      - id: GlowstickBlue
+        prob: 0.05
+      - id: GlowstickBase
+        prob: 0.50
+      - id: GlowstickBase
+        prob: 0.20
+      - id: GlowstickBase
+        prob: 0.05
+      - id: GlowstickPurple
+        prob: 0.50
+      - id: GlowstickPurple
+        prob: 0.20
+      - id: GlowstickPurple
+        prob: 0.05
+      - id: GlowstickRed
+        prob: 0.50
+      - id: GlowstickRed
+        prob: 0.20
+      - id: GlowstickRed
+        prob: 0.05
+      - id: GlowstickYellow
+        prob: 0.50
+      - id: GlowstickYellow
+        prob: 0.20
+      - id: GlowstickYellow
+        prob: 0.05
+
+- type: entity
+  id: CratePermaEscapeMats
+  parent: CrateGenericSteel
+  suffix: Mats
+  components:
+  - type: StorageFill
+    contents:
+      - id: SheetSteel
+        orGroup: matA
+      - id: PartRodMetal
+        orGroup: matA
+      - id: SheetSteel
+        orGroup: matB
+      - id: PartRodMetal
+        orGroup: matB
+
+- type: entity
+  id: CratePermaEscapeGiftsFromSyndicate
+  parent: CrateGenericSteel
+  suffix: Syndi Gifts
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingEyesGlassesOutlawGlasses
+      - id: ClothingHeadHatOutlawHat
+      - id: HappyHonkNukieSnacks
+      # - id: BaseUplinkRadio # too spicy I think.
+        # prob: 0.50
+      # - id: Telecrystal
+        # prob: 0.80
+      # - id: Telecrystal
+        # prob: 0.80
+      # - id: Telecrystal
+        # prob: 0.70
+      # - id: Telecrystal
+        # prob: 0.50
+      # - id: Telecrystal
+        # prob: 0.20
+      # - id: Telecrystal
+        # prob: 0.10
+      # - id: Telecrystal
+        # prob: 0.05
+      # - id: Telecrystal
+        # prob: 0.01
+      # - id: Telecrystal5
+        # prob: 0.01
+      - id: CyberPen
+        prob: 0.10
+      - id: CockroachCube
+        orGroup: cube
+      - id: AbominationCube
+        prob: 0.20
+        orGroup: cube
+      - id: SpaceCarpCube
+        prob: 0.20
+        orGroup: cube
+      - id: SyndicateSponge
+        prob: 0.20
+        orGroup: cube
+      - id: MindShieldImplanter
+        prob: 0.20
+      - id: ClothingHandsGlovesConducting # funny
+        prob: 0.30
+      - id: CigPackSyndicate
+        prob: 0.80
+      - id: StimpackMini
+        prob: 0.20
+      - id: StimpackMini
+        prob: 0.10
+      - id: CombatMedipen
+        prob: 0.05
+      - id: MedkitCombatFilled
+        prob: 0.01
+      - id: SoapSyndie
+        prob: 0.15
+      - id: DnaScramblerImplanter
+        prob: 0.005
+
+
+- type: entity
+  id: CratePermaEscapeMerc
+  parent: CrateGenericSteel
+  suffix: Merc
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingUniformJumpsuitMercenary
+      - id: ClothingHeadBandMerc
+        prob: 0.50
+      - id: ClothingHeadHatBeretMerc
+        prob: 0.20
+      - id: ClothingHeadHelmetMerc
+        prob: 0.05
+      - id: ClothingEyesGlassesMercenary
+        prob: 0.20
+      - id: ClothingMaskGasMerc
+        prob: 0.10
+      - id: ClothingHandsGlovesMercFingerless
+        prob: 0.20
+      - id: ClothingHandsMercGlovesCombat
+        prob: 0.05
+      - id: ClothingBackpackMerc
+        prob: 0.50
+      - id: ClothingShoesBootsMerc
+        prob: 0.50
+      - id: ClothingOuterVestWebMerc
+        prob: 0.25
+      - id: ClothingBeltMercWebbing
+        prob: 0.05
+
+- type: entity
+  id: CratePermaEscapeComs
+  parent: CrateGenericSteel
+  suffix: Coms
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingHeadsetMining
+        orGroup: coms
+      - id: ClothingHeadsetMining
+        orGroup: coms
+      - id: ClothingHeadsetMining
+        orGroup: coms
+      - id: ClothingHeadsetGrey
+        orGroup: coms
+      - id: ClothingHeadsetScience
+        orGroup: coms
+      - id: ClothingHeadsetService
+        orGroup: coms
+      - id: ClothingHeadsetEngineering
+        orGroup: coms
+      - id: ClothingHeadsetMedical
+        orGroup: coms
+      - id: EncryptionKeyCargo
+        prob: 0.05
+      - id: EncryptionKeyScience
+        prob: 0.05
+      - id: EncryptionKeyService
+        prob: 0.05
+      - id: EncryptionKeyMedical
+        prob: 0.05
+      - id: EncryptionKeyEngineering
+        prob: 0.05
+      - id: EncryptionKeySecurity
+        prob: 0.01
+
+- type: entity
+  id: CratePermaEscapeTowercap
+  parent: CrateGenericSteel
+  suffix: Towercap
+  components:
+  - type: StorageFill
+    contents:
+      - id: TowercapSeeds
+      - id: TowercapSeeds
+        prob: 0.80
+      - id: TowercapSeeds
+        prob: 0.50
+      - id: TowercapSeeds
+        prob: 0.20
+      - id: SteelcapSeeds
+        prob: 0.10
+      - id: SteelLog
+      - id: HydroponicsToolHatchet
+        prob: 0.75
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
index c1168f68d42..7313de7700b 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
@@ -28,7 +28,7 @@
 - type: entity
   id: CrateSalvageAssortedGoodies
   suffix: Filled, Salvage Random
-  noSpawn: true # You should use SalvageMaterialCrateSpawner instead
+  categories: [ HideSpawnMenu ] # You should use SalvageMaterialCrateSpawner instead
   parent: CrateGenericSteel
   components:
   - type: StorageFill
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
index 149cb1acf32..3987560e0f8 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -133,6 +133,7 @@
     - id: BoxFolderRed
     - id: BoxFolderYellow
     - id: NewtonCradle
+    - id: BoxEnvelope
 
 - type: entity
   id: CrateServiceFaxMachine
@@ -188,6 +189,7 @@
       - id: BookMedicalReferenceBook
       - id: BookHowToSurvive
       - id: BookChemicalCompendium
+      - id: BookSpaceLaw
 
 - type: entity
   id: CrateServiceSodaDispenser
@@ -337,3 +339,16 @@
           prob: 0.1
         - id: ShardGlassPlasma
           prob: 0.1
+
+- type: entity
+  id: CrateCandles
+  parent: CrateGenericSteel
+  name: candles crate
+  description: Contains 4 boxes of candles, 2 large and 2 small. For atmosphere or something.
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxCandle
+        amount: 2
+      - id: BoxCandleSmall
+        amount: 2
diff --git a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
index f1b259f829c..6b6929c038a 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
@@ -71,7 +71,7 @@
     contents:
       - id: SyringePhalanximine
       - id: RadAutoInjector
-      - id: EmergencyMedipen
+      - id: PillCanisterPotassiumIodide
       - id: PillCanisterHyronalin
 
 - type: entity
diff --git a/Resources/Prototypes/Catalog/Fills/Items/misc.yml b/Resources/Prototypes/Catalog/Fills/Items/misc.yml
index 543cd604a2f..e835c1aa630 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/misc.yml
@@ -1,12 +1,32 @@
 - type: entity
   id: ClothingShoesBootsCombatFilled
-  parent: ClothingShoesBootsCombat
-  suffix: Filled
-  components:
-  - type: ContainerFill
-    containers:
-      item:
-      - CombatKnife
+  parent:
+  - ClothingShoesBootsCombat
+  - ClothingShoesBootsSecFilled
+
+- type: entity
+  id: ClothingShoesBootsJackFilled
+  parent:
+  - ClothingShoesBootsJack
+  - ClothingShoesBootsSecFilled
+
+- type: entity
+  id: ClothingShoesBootsWinterSecFilled
+  parent:
+  - ClothingShoesBootsWinterSec
+  - ClothingShoesBootsSecFilled
+
+- type: entity
+  id: ClothingShoesBootsCowboyBlackFilled
+  parent:
+  - ClothingShoesBootsCowboyBlack
+  - ClothingShoesBootsSecFilled
+
+- type: entity
+  id: ClothingShoesHighheelBootsFilled
+  parent:
+  - ClothingShoesHighheelBoots
+  - ClothingShoesBootsSecFilled
 
 - type: entity
   id: ClothingShoesBootsMercFilled
@@ -18,3 +38,12 @@
       item:
       - KukriKnife
 
+- type: entity
+  id: ClothingShoesBootsSyndieFilled
+  parent: ClothingShoesBootsCombat
+  suffix: Filled, Throwing Knife
+  components:
+  - type: ContainerFill
+    containers:
+      item:
+      - ThrowingKnife
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
index b1a92711584..5e57d9efd88 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
@@ -105,6 +105,7 @@
       - id: ClothingHandsGlovesColorPurple
       - id: ClothingEyesGlasses
       - id: ClothingOuterWinterRD
+      - id: ClothingOuterCoatRD
 
 - type: entity
   id: DresserWardenFilled
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index c488eb2fae7..e2f3831a380 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -350,12 +350,15 @@
       - id: BoxEncryptionKeySecurity
       - id: HoloprojectorSecurity
       - id: BookSecretDocuments
-      - id: BoxPDASecurity # Delta-V
-      - id: WeaponEnergyGunMultiphase # DeltaV - HoS Energy Gun
-      - id: HoSIDCard # Delta-V
-      - id: ClothingShoesBootsWinterHeadOfSecurity #Delta V: Add departmental winter boots
-      - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
+      - id: BookSpaceLaw
+      # Begin DeltaV additions
+      - id: BoxPDASecurity
+      - id: WeaponEnergyGunMultiphase
+      - id: HoSIDCard
+      - id: ClothingShoesBootsWinterHeadOfSecurity
+      - id: LunchboxCommandFilledRandom
         prob: 0.3
+      # End DeltaV additions
 
 - type: entity
   id: LockerHeadOfSecurityFilled
@@ -379,12 +382,15 @@
       - id: BoxEncryptionKeySecurity
       - id: HoloprojectorSecurity
       - id: BookSecretDocuments
-      - id: BoxPDASecurity # Delta-V
-      - id: WeaponEnergyGunMultiphase # DeltaV - HoS Energy Gun
-      - id: HoSIDCard # Delta-V
-      - id: ClothingShoesBootsWinterHeadOfSecurity #Delta V: Add departmental winter boots
-      - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
+      - id: BookSpaceLaw
+      # Begin DeltaV additions
+      - id: BoxPDASecurity
+      - id: WeaponEnergyGunMultiphase
+      - id: HoSIDCard
+      - id: ClothingShoesBootsWinterHeadOfSecurity
+      - id: LunchboxCommandFilledRandom
         prob: 0.3
+      # End DeltaV additions
 
 - type: entity
   id: LockerFreezerVaultFilled
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
index fac36ba710c..a5b06fca03c 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -20,16 +20,16 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingOuterSuitEmergency
       - id: ClothingMaskBreath
+      - id: ClothingOuterSuitEmergency
       - id: EmergencyOxygenTankFilled
-        prob: 0.80
-        orGroup: EmergencyTankOrRegularTank
+        prob: 0.5
+        orGroup: OxygenTank
       - id: OxygenTankFilled
-        prob: 0.20
-        orGroup: EmergencyTankOrRegularTank
+        prob: 0.5
+        orGroup: OxygenTank
       - id: ToolboxEmergencyFilled
-        prob: 0.4
+        prob: 0.5
       - id: MedkitOxygenFilled
         prob: 0.2
       - id: WeaponFlareGun
@@ -44,16 +44,16 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingOuterSuitEmergency
       - id: ClothingMaskBreath
+      - id: ClothingOuterSuitEmergency
       - id: EmergencyOxygenTankFilled
-        prob: 0.80
-        orGroup: EmergencyTankOrRegularTank
+        prob: 0.5
+        orGroup: OxygenTank
       - id: OxygenTankFilled
-        prob: 0.20
-        orGroup: EmergencyTankOrRegularTank
+        prob: 0.5
+        orGroup: OxygenTank
       - id: ToolboxEmergencyFilled
-        prob: 0.4
+        prob: 0.5
       - id: MedkitOxygenFilled
         prob: 0.2
       - id: WeaponFlareGun
@@ -69,39 +69,62 @@
   - type: StorageFill
     contents:
       - id: ClothingMaskBreath
+      - id: ClothingOuterSuitEmergency
       - id: EmergencyNitrogenTankFilled
-        prob: 0.80
-        orGroup: EmergencyTankOrRegularTank
+        prob: 0.5
+        orGroup: NitrogenTank
       - id: NitrogenTankFilled
-        prob: 0.20
-        orGroup: EmergencyTankOrRegularTank
+        prob: 0.5
+        orGroup: NitrogenTank
 
 - type: entity
   id: ClosetFireFilled
   parent: ClosetFire
   suffix: Filled
   components:
-    - type: StorageFill
-      contents:
-        - id: ClothingOuterSuitFire
-        - id: ClothingHeadHelmetFire
-        - id: ClothingMaskGas
-        - id: OxygenTankFilled
-        - id: FireExtinguisher
-          prob: 0.25
+  - type: StorageFill
+    contents:
+      - id: ClothingOuterSuitFire
+      - id: ClothingHeadHelmetFire
+      - id: ClothingMaskGas
+      - id: EmergencyOxygenTankFilled
+        prob: 0.5
+        orGroup: OxygenTank
+      - id: OxygenTankFilled
+        prob: 0.5
+        orGroup: OxygenTank
+      - id: CrowbarRed
+      - id: FireExtinguisher
+        prob: 0.98
+        orGroup: FireExtinguisher
+      - id: SprayBottleWater #It's just budget cut after budget cut man
+        prob: 0.02
+        orGroup: FireExtinguisher
+
 - type: entity
   id: ClosetWallFireFilledRandom
   parent: ClosetWallFire
   suffix: Filled
   components:
-    - type: StorageFill
-      contents:
-        - id: ClothingOuterSuitFire
-        - id: ClothingHeadHelmetFire
-        - id: ClothingMaskGas
-        - id: OxygenTankFilled
-        - id: FireExtinguisher
-          prob: 0.25
+  - type: StorageFill
+    contents:
+      - id: ClothingOuterSuitFire
+      - id: ClothingHeadHelmetFire
+      - id: ClothingMaskGas
+      - id: EmergencyOxygenTankFilled
+        prob: 0.5
+        orGroup: OxygenTank
+      - id: OxygenTankFilled
+        prob: 0.5
+        orGroup: OxygenTank
+      - id: CrowbarRed
+      - id: FireExtinguisher
+        prob: 0.98
+        orGroup: FireExtinguisher
+      - id: SprayBottleWater #It's just budget cut after budget cut man
+        prob: 0.02
+        orGroup: FireExtinguisher
+
 - type: entity
   id: ClosetMaintenanceFilledRandom
   suffix: Filled, Random
@@ -170,6 +193,8 @@
           prob: 0.20
         - id: BarberScissors
           prob: 0.05
+        - id: Wristwatch
+          prob: 0.05
         - id: BookRandomStory
           prob: 0.1
         # Syndicate loot
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index 582b039c3bf..12c22ae744d 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -20,11 +20,14 @@
       - id: DoorRemoteArmory
       - id: ClothingOuterHardsuitCombatWarden # DeltaV - ClothingOuterHardsuitWarden replaced in favour of warden's riot combat hardsuit.
       - id: HoloprojectorSecurity
-      - id: BoxPDAPrisoner # Delta-V
-      - id: ClothingShoesBootsWinterWarden #Delta V: Add departmental winter boots
-      - id: BoxEncryptionKeyPrisoner #Delta-V
-      - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
+      - id: BookSpaceLaw
+      # Begin DeltaV additions
+      - id: BoxPDAPrisoner
+      - id: ClothingShoesBootsWinterWarden
+      - id: BoxEncryptionKeyPrisoner
+      - id: LunchboxSecurityFilledRandom
         prob: 0.3
+      # End DeltaV additions
 
 - type: entity
   id: LockerWardenFilled
@@ -47,11 +50,14 @@
       - id: RubberStampWarden
       - id: DoorRemoteArmory
       - id: HoloprojectorSecurity
-      - id: BoxPDAPrisoner # Delta-V
-      - id: ClothingShoesBootsWinterWarden #Delta V: Add departmental winter boots
-      - id: BoxEncryptionKeyPrisoner #Delta-V
-      - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
+      - id: BookSpaceLaw
+      # Begin DeltaV additions
+      - id: BoxPDAPrisoner
+      - id: ClothingShoesBootsWinterWarden
+      - id: BoxEncryptionKeyPrisoner
+      - id: LunchboxSecurityFilledRandom
         prob: 0.3
+      # End DeltaV additions
 
 - type: entity
   id: LockerSecurityFilled
@@ -94,6 +100,8 @@
         prob: 0.1
       - id: HoloprojectorSecurity
         prob: 0.6
+      - id: BookSpaceLaw
+        prob: 0.5
       - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
         prob: 0.3
 
@@ -192,6 +200,7 @@
       - id: RubberStampDetective
       - id: HoloprojectorSecurity
       - id: BoxEvidenceMarkers
+      - id: HandLabeler
       - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
         prob: 0.3
 
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml
index 5a96ea8cf4f..c8dfa9203ac 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml
@@ -24,6 +24,8 @@
     RubberStampApproved: 1
     RubberStampDenied: 1
     Paper: 10
+    Envelope: 10
+    HandLabeler: 2
 # Begin Delta-V subtractions
   #  EncryptionKeyCargo: 2
   #  EncryptionKeyEngineering: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
index bc6ddc96fb8..7343233b6b9 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
@@ -17,7 +17,7 @@
     FoodContainerEgg: 1
     DrinkMilkCarton: 2
     DrinkSoyMilkCarton: 1
-    FoodButter: 4
+    FoodButter: 3
     FoodCheese: 1
     FoodMeat: 6
     LunchboxGenericFilledRandom: 5 # Delta-V Adds Lunchbox
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml
index 433210dce7b..2323d2f88b6 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml
@@ -9,6 +9,7 @@
     ClothingBackpackSatchelChemistry: 2
     ClothingBackpackDuffelChemistry: 2
     ChemBag: 2
+    HandLabeler: 3
     ClothingBeltMedical: 2
     ClothingHandsGlovesLatex: 2
     ClothingHeadsetMedical: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
index f45dd229a2a..91e45c83916 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
@@ -4,7 +4,7 @@
     ClothingUniformJumpsuitDetective: 2
     ClothingUniformJumpskirtDetective: 2
     ClothingShoesColorBrown: 2
-    ClothingOuterCoatDetective: 2
+    ClothingOuterCoatDetectiveLoadout: 2
     ClothingHeadHatFedoraBrown: 2
     ClothingUniformJumpsuitDetectiveGrey: 2
     ClothingUniformJumpskirtDetectiveGrey: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
index 33803ffd842..5c3fd1d9a3c 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
@@ -15,10 +15,14 @@
     ClothingHeadsetJustice: 2 # DeltaV - Justice dept
     ClothingNeckLawyerbadge: 2
     BriefcaseBrown: 2
+    BookSpaceLaw: 3
     LuxuryPen: 2
-    RubberStampLawyer: 3 # DeltaV - add lawyer stamp to lawdrobe
-    ClothingOuterCoatOvercoat: 2 # DeltaV - add overcoat to LawDrobe
-    BoxFolderClipboard: 5 # DeltaV - add clipboards for Justice Dept
+    HandLabeler: 2
+    # Begin DeltaV additions
+    RubberStampLawyer: 3
+    ClothingOuterCoatOvercoat: 2
+    BoxFolderClipboard: 5
+    # End DeltaV additions
   contrabandInventory:
     ClothingOuterRobesJudge: 1
     ClothingHeadHatPwig: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/magivend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/magivend.yml
index 7617186dd9c..821c916353c 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/magivend.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/magivend.yml
@@ -9,6 +9,6 @@
     ClothingHeadHatVioletwizard: 3
     ClothingOuterWizardViolet: 3
     ClothingShoesWizard: 9
-    #TO DO:
+    #TODO:
     #only missing staff
     #and if wizarditis reagent when hacked if we want this.
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
index 14bc1764981..5041f01de30 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
@@ -26,5 +26,9 @@
     ClothingEyesBlindfold: 1
     ClothingShoesBootsCombat: 1
     ClothingShoesBootsWinterSec: 2
+    # Begin DeltaV additions
     ClothingShoesBootsCowboyBlack: 1
     ClothingHeadHatCowboyBlack: 1
+    # End DeltaV additions
+  contrabandInventory:
+    ClothingMaskClownSecurity: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml b/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml
index aa25e87a528..5f6806afbb1 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml
@@ -8,7 +8,7 @@
   id: AtmosDrobeAds
   values:
     prefix: advertisement-atmosdrobe-
-    count: 3
+    count: 5
 
 - type: localizedDataset
   id: BarDrobeAds
@@ -38,7 +38,7 @@
   id: ChefDrobeAds
   values:
     prefix: advertisement-chefdrobe-
-    count: 3
+    count: 4
 
 - type: localizedDataset
   id: ChefvendAds
@@ -50,7 +50,7 @@
   id: ChemDrobeAds
   values:
     prefix: advertisement-chemdrobe-
-    count: 3
+    count: 4
 
 - type: localizedDataset
   id: CigaretteMachineAds
@@ -110,7 +110,7 @@
   id: DonutAds
   values:
     prefix: advertisement-donut-
-    count: 5
+    count: 6
 
 - type: localizedDataset
   id: EngiDrobeAds
@@ -146,19 +146,19 @@
   id: HyDrobeAds
   values:
     prefix: advertisement-hydrobe-
-    count: 4
+    count: 5
 
 - type: localizedDataset
   id: JaniDrobeAds
   values:
     prefix: advertisement-janidrobe-
-    count: 3
+    count: 5
 
 - type: localizedDataset
   id: LawDrobeAds
   values:
     prefix: advertisement-lawdrobe-
-    count: 8
+    count: 9
 
 - type: localizedDataset
   id: MagiVendAds
@@ -170,7 +170,7 @@
   id: MediDrobeAds
   values:
     prefix: advertisement-medidrobe-
-    count: 3
+    count: 4
 
 - type: localizedDataset
   id: MegaSeedAds
diff --git a/Resources/Prototypes/Catalog/thief_toolbox_sets.yml b/Resources/Prototypes/Catalog/thief_toolbox_sets.yml
index 588bfbd847b..6c897493f78 100644
--- a/Resources/Prototypes/Catalog/thief_toolbox_sets.yml
+++ b/Resources/Prototypes/Catalog/thief_toolbox_sets.yml
@@ -16,6 +16,7 @@
   - ClothingShoesChameleon
   - BarberScissors
   - ChameleonProjector
+  - AgentIDCard
 
 - type: thiefBackpackSet
   id: ToolsSet
@@ -57,9 +58,10 @@
     sprite: Objects/Specific/Syndicate/telecrystal.rsi
     state: telecrystal
   content:
-  - AgentIDCard
+  - RadioJammer
+  - TraitorCodePaper
   - Emag
-  - SyndicatePersonalAI
+  - Lighter
   - CigPackSyndicate
   - Telecrystal10 #The thief cannot use them, but it may induce communication with traitors
 
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index a29b5d18c62..0cef7b1c51a 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -785,7 +785,7 @@
   description: uplink-slipocalypse-clustersoap-desc
   productEntity: SlipocalypseClusterSoap
   cost:
-    Telecrystal: 3
+    Telecrystal: 2
   categories:
   - UplinkDisruption
 
@@ -912,7 +912,7 @@
 - type: listing
   id: UplinkReinforcementRadioSyndicate
   name: uplink-reinforcement-radio-name
-  description: uplink-reinforcement-radio-desc
+  description: uplink-reinforcement-radio-traitor-desc
   productEntity: ReinforcementRadioSyndicate
   icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-urist }
   cost:
@@ -926,11 +926,11 @@
           - NukeOpsUplink
 
 - type: listing
-  id: UplinkReinforcementRadioSyndicateNukeops # Version for Nukeops that spawns an agent with the NukeOperative component.
-  name: uplink-reinforcement-radio-name
-  description: uplink-reinforcement-radio-desc
+  id: UplinkReinforcementRadioSyndicateNukeops # Version for Nukeops that spawns another nuclear operative without the uplink.
+  name: uplink-reinforcement-radio-nukeops-name
+  description: uplink-reinforcement-radio-nukeops-desc
   productEntity: ReinforcementRadioSyndicateNukeops
-  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-urist }
+  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-nukeop }
   cost:
     Telecrystal: 20 # DV - Was 35
   categories:
@@ -1308,6 +1308,22 @@
   categories:
   - UplinkWearables
 
+- type: listing
+  id: UplinkClothingOuterArmorRaid
+  name: uplink-syndie-raid-name
+  description: uplink-syndie-raid-desc
+  icon: { sprite: /Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi, state: icon }
+  productEntity: ClothingBackpackDuffelSyndicateRaidBundle
+  cost:
+    Telecrystal: 8
+  categories:
+  - UplinkWearables
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - NukeOpsUplink
+
 - type: listing
   id: UplinkHardsuitSyndieElite
   name: uplink-hardsuit-syndieelite-name
@@ -1315,7 +1331,7 @@
   icon: { sprite: /Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi, state: icon }
   productEntity: ClothingBackpackDuffelSyndicateEliteHardsuitBundle
   cost:
-    Telecrystal: 10
+    Telecrystal: 12
   categories:
   - UplinkWearables
 
diff --git a/Resources/Prototypes/Chemistry/mixing_types.yml b/Resources/Prototypes/Chemistry/mixing_types.yml
index 20d58e70abd..fd732564108 100644
--- a/Resources/Prototypes/Chemistry/mixing_types.yml
+++ b/Resources/Prototypes/Chemistry/mixing_types.yml
@@ -51,3 +51,17 @@
   icon:
     sprite: Objects/Specific/Chapel/bible.rsi
     state: icon
+
+- type: mixingCategory
+  id: Shake
+  verbText: mixing-verb-shake
+  icon:
+    sprite: Objects/Consumable/Drinks/shaker.rsi
+    state: icon
+
+- type: mixingCategory
+  id: Stir
+  verbText: mixing-verb-stir
+  icon:
+    sprite: Objects/Misc/utensils.rsi
+    state: spoon
diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml
index dea09c324eb..671e9d80eac 100644
--- a/Resources/Prototypes/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/Damage/modifier_sets.yml
@@ -297,40 +297,8 @@
     Heat: 2.5
     Caustic: 0.0
 
-# terminator's flesh damage set
+# protects against radiation
 - type: damageModifierSet
-  id: CyberneticFlesh
+  id: PotassiumIodide
   coefficients:
-    Blunt: 0.2
-    Slash: 0.2
-    Piercing: 0.1
-    # fire and lasers burn it good
-    Heat: 1.0
-    # zap
-    Shock: 1.5
-    Cold: 0.25
-    Caustic: 0.25
-    # doesnt have organs to poison
-    Poison: 0.0
-    Cellular: 0.0
-
-# terminator's endoskeleton damage set
-- type: damageModifierSet
-  id: Cybernetic
-  coefficients:
-    # bonk
-    Blunt: 1.0
-    # alloy too hard to cut or shoot
-    Slash: 0.0
-    Piercing: 0.0
-    # no burning anymore
-    Heat: 0.0
-    # zap zap
-    Shock: 2.5
-    Cold: 0.0
-    Caustic: 0.0
-    Poison: 0.0
-    Cellular: 0.0
-  flatReductions:
-    # can't punch the endoskeleton to death
-    Blunt: 5
+    Radiation: 0.1
diff --git a/Resources/Prototypes/Datasets/Names/fortunes.yml b/Resources/Prototypes/Datasets/Names/fortunes.yml
index fc3c5d9d713..b38e04dc61c 100644
--- a/Resources/Prototypes/Datasets/Names/fortunes.yml
+++ b/Resources/Prototypes/Datasets/Names/fortunes.yml
@@ -24,7 +24,7 @@
   - You will be pleasantly surprised in the tool storage.
   - There is an impostor among us.
   - A fun adventure awaits you in the maintenance tunnels.
-  - CentCom is proud of you!
+  - CentComm is proud of you!
   - The head of your deparment is proud of you!
   - Ian is proud of you!
   - Do it for Ian!
@@ -58,7 +58,7 @@
   - An apple a day keeps the doctor away.
   - Don't drink and set up singulo.
   - Stare into the singulo, and the singulo stares back at you.
-  - Every good and perfect gift is from CentCom.
+  - Every good and perfect gift is from CentComm.
   - There’s no such thing as Space Station 13.
   - There is a time for caution, but not for fear.
   - The smart thing to do is to begin trusting your intuitions.
diff --git a/Resources/Prototypes/Datasets/figurines.yml b/Resources/Prototypes/Datasets/figurines.yml
new file mode 100644
index 00000000000..212139b37d4
--- /dev/null
+++ b/Resources/Prototypes/Datasets/figurines.yml
@@ -0,0 +1,263 @@
+- type: localizedDataset
+  id: FigurinesHoP
+  values:
+    prefix: figurines-hop-
+    count: 2
+
+- type: localizedDataset
+  id: FigurinesPassenger
+  values:
+    prefix: figurines-passenger-
+    count: 2
+
+- type: localizedDataset
+  id: FigurinesGreytider
+  values:
+    prefix: figurines-greytider-
+    count: 5
+
+- type: localizedDataset
+  id: FigurinesClown
+  values:
+    prefix: figurines-clown-
+    count: 5
+
+- type: localizedDataset
+  id: FigurinesHoloClown
+  values:
+    prefix: figurines-holoclown-
+    count: 1
+
+- type: localizedDataset
+  id: FigurinesMime
+  values:
+    prefix: figurines-mime-
+    count: 5
+
+- type: localizedDataset
+  id: FigurinesMusician
+  values:
+    prefix: figurines-musician-
+    count: 2
+
+# - type: localizedDataset # TODO add something
+#   id: FigurinesBoxer
+#   values:
+#     prefix: figurines-boxer-
+#     count: 0
+
+- type: localizedDataset
+  id: FigurinesCaptain
+  values:
+    prefix: figurines-captain-
+    count: 1
+
+- type: localizedDataset
+  id: FigurinesHoS
+  values:
+    prefix: figurines-hos-
+    count: 2
+
+- type: localizedDataset
+  id: FigurinesWarden
+  values:
+    prefix: figurines-warden-
+    count: 1
+
+- type: localizedDataset
+  id: FigurinesDetective
+  values:
+    prefix: figurines-detective-
+    count: 1
+
+- type: localizedDataset
+  id: FigurinesSecurity
+  values:
+    prefix: figurines-security-
+    count: 2
+
+- type: localizedDataset
+  id: FigurinesLawyer
+  values:
+    prefix: figurines-lawyer-
+    count: 2
+
+- type: localizedDataset
+  id: FigurinesCargoTech
+  values:
+    prefix: figurines-cargotech-
+    count: 3
+
+- type: localizedDataset
+  id: FigurinesSalvage
+  values:
+    prefix: figurines-salvage-
+    count: 1
+
+- type: localizedDataset
+  id: FigurinesQM
+  values:
+    prefix: figurines-qm-
+    count: 7
+
+- type: localizedDataset
+  id: FigurinesCE
+  values:
+    prefix: figurines-ce-
+    count: 5
+
+- type: localizedDataset
+  id: FigurinesEngineer
+  values:
+    prefix: figurines-engineer-
+    count: 3
+
+- type: localizedDataset
+  id: FigurinesAtmosTech
+  values:
+    prefix: figurines-atmostech-
+    count: 5
+
+- type: localizedDataset
+  id: FigurinesRD
+  values:
+    prefix: figurines-rd-
+    count: 2
+
+- type: localizedDataset
+  id: FigurinesScientist
+  values:
+    prefix: figurines-scientist-
+    count: 5
+
+- type: localizedDataset
+  id: FigurinesCMO
+  values:
+    prefix: figurines-cmo-
+    count: 2
+
+- type: localizedDataset
+  id: FigurinesChemist
+  values:
+    prefix: figurines-chemist-
+    count: 1
+
+- type: localizedDataset
+  id: FigurinesParamedic
+  values:
+    prefix: figurines-paramedic-
+    count: 2
+
+- type: localizedDataset
+  id: FigurinesDoctor
+  values:
+    prefix: figurines-doctor-
+    count: 3
+
+- type: localizedDataset
+  id: FigurinesLibrarian
+  values:
+    prefix: figurines-librarian-
+    count: 2
+
+- type: localizedDataset
+  id: FigurinesChaplain
+  values:
+    prefix: figurines-chaplain-
+    count: 3
+
+- type: localizedDataset
+  id: FigurinesChef
+  values:
+    prefix: figurines-chef-
+    count: 1
+
+- type: localizedDataset
+  id: FigurinesBartender
+  values:
+    prefix: figurines-bartender-
+    count: 2
+
+- type: localizedDataset
+  id: FigurinesBotanist
+  values:
+    prefix: figurines-botanist-
+    count: 2
+
+- type: localizedDataset
+  id: FigurinesJanitor
+  values:
+    prefix: figurines-janitor-
+    count: 2
+
+- type: localizedDataset
+  id: FigurinesNukie
+  values:
+    prefix: figurines-nukie-
+    count: 4
+
+- type: localizedDataset
+  id: FigurinesNukieElite
+  values:
+    prefix: figurines-nukie-elite-
+    count: 3
+
+- type: localizedDataset
+  id: FigurinesNukieCommander
+  values:
+    prefix: figurines-nukie-commander-
+    count: 1
+
+- type: localizedDataset
+  id: FigurinesFootsoldier
+  values:
+    prefix: figurines-footsoldier-
+    count: 2
+
+- type: localizedDataset
+  id: FigurinesWizard
+  values:
+    prefix: figurines-wizard-
+    count: 1
+
+- type: localizedDataset
+  id: FigurinesSpaceDragon
+  values:
+    prefix: figurines-space-dragon-
+    count: 1
+
+# - type: localizedDataset # TODO add something
+#   id: FigurinesQueen
+#   values:
+#     prefix: figurines-queen-
+#     count: 0
+
+- type: localizedDataset
+  id: FigurinesRatKing
+  values:
+    prefix: figurines-rat-king-
+    count: 3
+
+- type: localizedDataset
+  id: FigurinesRatServant
+  values:
+    prefix: figurines-rat-servant-
+    count: 2
+
+- type: localizedDataset
+  id: FigurinesMouse
+  values:
+    prefix: figurines-mouse-
+    count: 7
+
+- type: localizedDataset
+  id: FigurinesSlime
+  values:
+    prefix: figurines-slime-
+    count: 3
+
+- type: localizedDataset
+  id: FigurinesHamlet
+  values:
+    prefix: figurines-hamlet-
+    count: 8
diff --git a/Resources/Prototypes/Datasets/ion_storm.yml b/Resources/Prototypes/Datasets/ion_storm.yml
index f4941b1d136..a274954cb7d 100644
--- a/Resources/Prototypes/Datasets/ion_storm.yml
+++ b/Resources/Prototypes/Datasets/ion_storm.yml
@@ -214,7 +214,7 @@
   - BOTANY
   - BRAZIL
   - CANADA
-  - CENTCOM
+  - CENTCOMM
   - CHEMICAL LAB
   - CHINA
   - CLOWN PLANET
@@ -921,7 +921,7 @@
   - BOOGEYMEN
   - CAPITALISTS
   - CARP
-  - CENTCOM OFFICERS
+  - CENTCOMM OFFICERS
   - CLOWNS
   - COMMUNISTS
   - CORGIS
diff --git a/Resources/Prototypes/Decals/Overlays/markups.yml b/Resources/Prototypes/Decals/Overlays/markups.yml
new file mode 100644
index 00000000000..cb8d56834e4
--- /dev/null
+++ b/Resources/Prototypes/Decals/Overlays/markups.yml
@@ -0,0 +1,39 @@
+- type: decal
+  id: MarkupSquare
+  tags: ["overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/markups.rsi
+    state: square
+
+- type: decal
+  id: MarkupRectangle1x2
+  tags: ["overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/markups.rsi
+    state: rectangle1x2
+
+- type: decal
+  id: MarkupRectangle1x2Center
+  tags: ["overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/markups.rsi
+    state: rectangle1x2center
+
+- type: decal
+  id: MarkupSquareQuater
+  tags: ["overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/markups.rsi
+    state: squareQuater
+
+- type: decal
+  id: MarkupSquareQuaterCenter
+  tags: ["overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/markups.rsi
+    state: squareQuaterCenter
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/emergency.yml
new file mode 100644
index 00000000000..48fcf3bbe01
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/emergency.yml
@@ -0,0 +1,32 @@
+- type: entity
+  parent: BoxSurvival
+  id: BoxSurvivalBrigmedic
+  suffix: MedSec
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingMaskBreathMedicalSecurity
+    - id: EmergencyOxygenTankFilled
+    - id: EmergencyMedipen
+    - id: SpaceMedipen # DeltaV - keep spacepen
+    - id: Flare
+    - id: FoodPSB # DeltaV - replace nutribrick with PSB
+    - id: DrinkWaterBottleFull
+
+- type: entity
+  parent: BoxSurvivalBrigmedic
+  id: BoxSurvivalBrigmedicNitrogen
+  suffix: MedSec N2
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingMaskBreathMedicalSecurity
+    - id: EmergencyNitrogenTankFilled
+    - id: EmergencyMedipen
+    - id: SpaceMedipen # DeltaV - keep spacepen
+    - id: Flare
+    - id: FoodPSB # DeltaV - replace nutribrick with PSB
+    - id: DrinkWaterBottleFull
+  # Intentionally wrong picture on the box. NT did not care enough to change it.
+  - type: Label
+    currentLabel: reagent-name-nitrogen
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/misc.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/misc.yml
deleted file mode 100644
index f97a5be4c4e..00000000000
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/misc.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- type: entity
-  id: ClothingShoesBootsJackFilled
-  parent: ClothingShoesBootsJack
-  suffix: Filled
-  components:
-  - type: ContainerFill
-    containers:
-      item:
-      - CombatKnife
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Hands/gloves.yml
index 1dc8942c097..38b02d0474a 100644
--- a/Resources/Prototypes/DeltaV/Entities/Clothing/Hands/gloves.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Hands/gloves.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: ClothingHandsBase
+  parent: ClothingHandsGlovesCombat
   id: ClothingHandsGlovesInspection
   name: inspection gloves
   description: A fancy pair of white gloves, both durable and delicate.
@@ -8,16 +8,12 @@
     sprite: DeltaV/Clothing/Hands/Gloves/inspection.rsi
   - type: Clothing
     sprite: DeltaV/Clothing/Hands/Gloves/inspection.rsi
-  - type: GloveHeatResistance
-    heatResistance: 1400
-  - type: Insulated
   - type: Fiber
     fiberMaterial: fibers-leather
     fiberColor: fibers-white
-  - type: FingerprintMask
 
 - type: entity
-  parent: ClothingHandsBase
+  parent: ClothingHandsGlovesInspection
   id: ClothingHandsGlovesRyuzoGauntlets
   name: golden gauntlets
   description: Because sometimes, things just need to be based on your fists.
@@ -27,13 +23,6 @@
     sprite: DeltaV/Clothing/Hands/Gloves/ryuzogauntlets.rsi
   - type: Clothing
     sprite: DeltaV/Clothing/Hands/Gloves/ryuzogauntlets.rsi
-  - type: GloveHeatResistance
-    heatResistance: 1400
-  - type: Insulated
-  - type: Fiber
-    fiberMaterial: fibers-leather
-    fiberColor: fibers-white
-  - type: FingerprintMask
   - type: StaminaDamageOnHit
     damage: 20
   - type: MeleeWeapon
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml
index 1f4eb696c65..e2541def035 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml
@@ -26,4 +26,3 @@
   - type: NpcFactionMember
     factions:
     - NanoTrasen
-  - type: PotentialPsionic
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml
index 06abe8c45fa..ea2357a5c06 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml
@@ -24,7 +24,6 @@
     - type: NpcFactionMember
       factions:
         - NanoTrasen
-    - type: PotentialPsionic
     - type: Respirator
       damage:
        types:
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
index edb3fe60d19..13644e5454b 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
@@ -130,14 +130,10 @@
 #    templateId: digitigrade
     displacements:
       jumpsuit:
-        layer:
-          sprite: DeltaV/Mobs/Species/Harpy/displacement.rsi
-          state: jumpsuit
-          copyToShaderParameters:
-            # Value required, provide a dummy. Gets overridden when applied.
-            layerKey: dummy
-            parameterTexture: displacementMap
-            parameterUV: displacementUV
+        sizeMaps:
+          32:
+            sprite: DeltaV/Mobs/Species/Harpy/displacement.rsi
+            state: jumpsuit
   - type: HarpyVisuals
   - type: UltraVision
 
@@ -155,14 +151,10 @@
     speciesId: harpy
     displacements:
       jumpsuit:
-        layer:
-          sprite: DeltaV/Mobs/Species/Harpy/displacement.rsi
-          state: jumpsuit
-          copyToShaderParameters:
-            # Value required, provide a dummy. Gets overridden when applied.
-            layerKey: dummy
-            parameterTexture: displacementMap
-            parameterUV: displacementUV
+        sizeMaps:
+          32:
+            sprite: DeltaV/Mobs/Species/Harpy/displacement.rsi
+            state: jumpsuit
   - type: Sprite
     scale: 0.9, 0.9
     layers:
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml
index da206587138..9ddcc724f45 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml
@@ -3,39 +3,39 @@
   id: ChiefJusticeIDCard
   name: chief justice ID card
   components:
-    - type: PresetIdCard
-      jobName: ChiefJustice
-    - type: Sprite
-      layers:
-        - state: default
-        - sprite: DeltaV/Objects/Misc/id_cards.rsi
-          state: idchiefjustice
+  - type: PresetIdCard
+    name: ChiefJustice
+  - type: Sprite
+    layers:
+    - state: default
+    - sprite: DeltaV/Objects/Misc/id_cards.rsi
+      state: idchiefjustice
 
 - type: entity
   parent: IDCardStandard
   id: ClerkIDCard
   name: clerk ID card
   components:
-    - type: PresetIdCard
-      jobName: Clerk
-    - type: Sprite
-      layers:
-        - state: default
-        - sprite: DeltaV/Objects/Misc/id_cards.rsi
-          state: idclerk
+  - type: PresetIdCard
+    name: Clerk
+  - type: Sprite
+    layers:
+    - state: default
+    - sprite: DeltaV/Objects/Misc/id_cards.rsi
+      state: idclerk
 
 - type: entity
   parent: IDCardStandard
   id: ProsecutorIDCard
   name: presecutor ID card
   components:
-    - type: PresetIdCard
-      jobName: Prosecutor
-    - type: Sprite
-      layers:
-        - state: default
-        - sprite: DeltaV/Objects/Misc/id_cards.rsi
-          state: idprosecutor
+  - type: PresetIdCard
+    name: Prosecutor
+  - type: Sprite
+    layers:
+    - state: default
+    - sprite: DeltaV/Objects/Misc/id_cards.rsi
+      state: idprosecutor
 
 - type: entity
   parent: IDCardStandard
@@ -48,7 +48,7 @@
     - sprite: DeltaV/Objects/Misc/id_cards.rsi
       state: nyanomailcarrier
   - type: PresetIdCard
-    jobName: Courier
+    name: Courier
 
 ## Alternate Job Titles
 
@@ -59,32 +59,32 @@
   id: VisitorIDCard
   name: visitor ID card
   components:
-  - type: PresetIdCard
-    virtualJobName: job-name-visitor
+  - type: IdCard
+    jobTitle: Visitor
 
 - type: entity
   parent: PassengerIDCard
   id: TouristIDCard
   name: tourist ID card
   components:
-  - type: PresetIdCard
-    virtualJobName: job-name-tourist
+  - type: IdCard
+    jobTitle: Tourist
 
 - type: entity
   parent: PassengerIDCard
   id: OffDutyCrewIDCard
   name: off-duty crew ID card
   components:
-  - type: PresetIdCard
-    virtualJobName: job-name-off-duty
+  - type: IdCard
+    jobTitle: Off-Duty Crew
 
 - type: entity
   parent: PassengerIDCard
   id: StudentIDCard
   name: student ID card
   components:
-  - type: PresetIdCard
-    virtualJobName: job-name-student
+  - type: IdCard
+    jobTitle: Student
 
 # Bartender
 
@@ -93,8 +93,8 @@
   id: MixologistIDCard
   name: mixologist ID card
   components:
-  - type: PresetIdCard
-    virtualJobName: job-name-mixologist
+  - type: IdCard
+    jobTitle: Mixologist
 
 # Chef
 
@@ -103,24 +103,24 @@
   id: BakerIDCard
   name: baker ID card
   components:
-  - type: PresetIdCard
-    virtualJobName: job-name-baker
+  - type: IdCard
+    jobTitle: Baker
 
 - type: entity
   parent: ChefIDCard
   id: ButcherIDCard
   name: butcher ID card
   components:
-  - type: PresetIdCard
-    virtualJobName: job-name-butcher
+  - type: IdCard
+    jobTitle: Butcher
 
 - type: entity
   parent: ChefIDCard
   id: PizzaioloIDCard
   name: pizzaiolo ID card
   components:
-  - type: PresetIdCard
-    virtualJobName: job-name-pizzaiolo
+  - type: IdCard
+    jobTitle: Pizzaiolo
 
 # Medical Intern
 
@@ -129,16 +129,16 @@
   id: PracticalNurseIDCard
   name: practical nurse ID card
   components:
-  - type: PresetIdCard
-    virtualJobName: job-name-practical-nurse
+  - type: IdCard
+    jobTitle: Practical Nurse
 
 - type: entity
   parent: MedicalInternIDCard
   id: ResidentIDCard
   name: resident ID card
   components:
-  - type: PresetIdCard
-    virtualJobName: job-name-resident
+  - type: IdCard
+    jobTitle: Resident
 
 # Medical Doctor
 
@@ -147,8 +147,8 @@
   id: ClinicianIDCard
   name: clinician ID card
   components:
-  - type: PresetIdCard
-    virtualJobName: job-name-clinician
+  - type: IdCard
+    jobTitle: Clinician
 
 # Atmospheric Technician
 
@@ -157,16 +157,16 @@
   id: LifeSupportTechIDCard
   name: life support technician ID card
   components:
-  - type: PresetIdCard
-    virtualJobName: job-name-life-support-tech
+  - type: IdCard
+    jobTitle: Life Support Technician
 
 - type: entity
   parent: AtmosIDCard
   id: PlasmaScientistIDCard
   name: plasma scientist ID card
   components:
-  - type: PresetIdCard
-    virtualJobName: job-name-plasma-scientist
+  - type: IdCard
+    jobTitle: Plasma Scientist
 
 # Station Engineer
 
@@ -175,16 +175,16 @@
   id: ElectricianIDCard
   name: electrician ID card
   components:
-  - type: PresetIdCard
-    virtualJobName: job-name-electrician
+  - type: IdCard
+    jobTitle: Electrician
 
 - type: entity
   parent: EngineeringIDCard
   id: MechanicIDCard
   name: mechanic ID card
   components:
-  - type: PresetIdCard
-    virtualJobName: job-name-mechanic
+  - type: IdCard
+    jobTitle: Mechanic
 
 # Cargo Technician
 
@@ -193,16 +193,16 @@
   id: DeckWorkerIDCard
   name: deck worker ID card
   components:
-  - type: PresetIdCard
-    virtualJobName: job-name-deck-worker
+  - type: IdCard
+    jobTitle: Deck Worker
 
 - type: entity
   parent: CargoIDCard
   id: InventoryAssociateIDCard
   name: inventory associate ID card
   components:
-  - type: PresetIdCard
-    virtualJobName: job-name-inventory-associate
+  - type: IdCard
+    jobTitle: Inventory Associate
 
 # Salvage Specialist
 
@@ -211,16 +211,16 @@
   id: ProspectorIDCard
   name: prospector ID card
   components:
-  - type: PresetIdCard
-    virtualJobName: job-name-prospector
+  - type: IdCard
+    jobTitle: Prospector
 
 - type: entity
   parent: SalvageIDCard
   id: ExcavatorIDCard
   name: excavator ID card
   components:
-  - type: PresetIdCard
-    virtualJobName: job-name-excavator
+  - type: IdCard
+    jobTitle: Excavator
 
 # Scientist
 
@@ -229,24 +229,24 @@
   id: LabTechIDCard
   name: lab technician ID card
   components:
-  - type: PresetIdCard
-    virtualJobName: job-name-lab-tech
+  - type: IdCard
+    jobTitle: Lab Technician
 
 - type: entity
   parent: ResearchIDCard
   id: XenoarchIDCard
   name: xenoarchaeologist ID card
   components:
-  - type: PresetIdCard
-    virtualJobName: job-name-xenoarch
+  - type: IdCard
+    jobTitle: Xenoarchaeologist
 
 - type: entity
   parent: ResearchIDCard
   id: RoboticistIDCard
   name: roboticist ID card
   components:
-  - type: PresetIdCard
-    virtualJobName: job-name-roboticist
+  - type: IdCard
+    jobTitle: Roboticist
 
 # Clown
 
@@ -255,13 +255,13 @@
   id: JesterIDCard
   name: jester ID card
   components:
-  - type: PresetIdCard
-    virtualJobName: job-name-jester
+  - type: IdCard
+    jobTitle: Jester
 
 - type: entity
   parent: ClownIDCard
   id: FoolIDCard
   name: fool ID card
   components:
-  - type: PresetIdCard
-    virtualJobName: job-name-fool
+  - type: IdCard
+    jobTitle: Fool
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paperslips.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paperslips.yml
index c2ed32fdf46..39dc009b318 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paperslips.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paperslips.yml
@@ -159,18 +159,18 @@
   name: corporate plastic card
   description: A plastic card for confidential corporate matters.
   components:
-    - type: Paper
-      canEdit: false
-    - type: Sprite
-      layers:
-        - state: corpslip
-        - state: corpslip_words
-          map: [ "enum.PaperVisualLayers.Writing" ]
-          visible: false
-    - type: PaperVisuals
-      backgroundImagePath: "/Textures/DeltaV/Interface/Paper/paper_background_corpcard.svg.96dpi.png"
-      contentMargin: 70.0, 16.0, 70.0, 16.0
-      maxWritableArea: 400.0, 600.0
+  - type: Paper
+    editingDisabled: true
+  - type: Sprite
+    layers:
+      - state: corpslip
+      - state: corpslip_words
+        map: [ "enum.PaperVisualLayers.Writing" ]
+        visible: false
+  - type: PaperVisuals
+    backgroundImagePath: "/Textures/DeltaV/Interface/Paper/paper_background_corpcard.svg.96dpi.png"
+    contentMargin: 70.0, 16.0, 70.0, 16.0
+    maxWritableArea: 400.0, 600.0
 
 
 - type: entity
diff --git a/Resources/Prototypes/DeltaV/GameRules/events.yml b/Resources/Prototypes/DeltaV/GameRules/events.yml
index cc82d19e6bf..2e2f9217b12 100644
--- a/Resources/Prototypes/DeltaV/GameRules/events.yml
+++ b/Resources/Prototypes/DeltaV/GameRules/events.yml
@@ -1,7 +1,6 @@
 - type: entity
   id: XenoVents
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-xeno-vent-start-announcement
@@ -33,7 +32,6 @@
 - type: entity
   id: MothroachSpawn
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: StationEvent
     earliestStart: 15
@@ -48,7 +46,6 @@
 - type: entity
   id: ListeningPost
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: StationEvent
     earliestStart: 15
@@ -101,7 +98,6 @@
   - type: MidRoundAntagRule
 
 #- type: entity
-#  noSpawn: true
 #  parent: BaseMidRoundAntag
 #  id: RatKingSpawn
 #  components:
diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Cargo/cargo_technician.yml
index b6cc588da0f..3db26712131 100644
--- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Cargo/cargo_technician.yml
+++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Cargo/cargo_technician.yml
@@ -1,27 +1,15 @@
 # PDA
 - type: loadout
-  id: CargoPDA
-  equipment: CargoPDA
-
-- type: startingGear
   id: CargoPDA
   equipment:
     id: CargoPDA
 
 - type: loadout
-  id: DeckWorkerPDA
-  equipment: DeckWorkerPDA
-
-- type: startingGear
   id: DeckWorkerPDA
   equipment:
     id: DeckWorkerPDA
 
 - type: loadout
-  id: InventoryAssociatePDA
-  equipment: InventoryAssociatePDA
-
-- type: startingGear
   id: InventoryAssociatePDA
   equipment:
     id: InventoryAssociatePDA
diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Cargo/courier.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Cargo/courier.yml
index 5810185c4e8..a01f92d0d9d 100644
--- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Cargo/courier.yml
+++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Cargo/courier.yml
@@ -1,57 +1,33 @@
 # Head
 - type: loadout
-  id: CourierHead
-  equipment: CourierHead
-
-- type: startingGear
   id: CourierHead
   equipment:
       head: ClothingHeadCourier
 
 # Jumpsuit
 - type: loadout
-  id: CourierJumpsuit
-  equipment: CourierJumpsuit
-
-- type: startingGear
   id: CourierJumpsuit
   equipment:
       jumpsuit: ClothingUniformCourier
 
 - type: loadout
-  id: CourierJumpskirt
-  equipment: CourierJumpskirt
-
-- type: startingGear
   id: CourierJumpskirt
   equipment:
       jumpsuit: ClothingUniformSkirtCourier
 
 # Shoes
 - type: loadout
-  id: RollerSkates
-  equipment: RollerSkates
-
-- type: startingGear
   id: RollerSkates
   equipment:
       shoes: ClothingShoesSkates
 
 # PDA
 - type: loadout
-  id: CourierPDA
-  equipment: CourierPDA
-
-- type: startingGear
   id: CourierPDA
   equipment:
       id: CourierPDA
 
 - type: loadout
-  id: MailCarrierPDA
-  equipment: MailCarrierPDA
-
-- type: startingGear
   id: MailCarrierPDA
   equipment:
       id: MailCarrierPDA
diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Cargo/salvage_technician.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Cargo/salvage_technician.yml
index fb1b0b7a3a9..5facd6f5689 100644
--- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Cargo/salvage_technician.yml
+++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Cargo/salvage_technician.yml
@@ -1,27 +1,15 @@
 # PDA
 - type: loadout
-  id: SalvagePDA
-  equipment: SalvagePDA
-
-- type: startingGear
   id: SalvagePDA
   equipment:
     id: SalvagePDA
 
 - type: loadout
-  id: ProspectorPDA
-  equipment: ProspectorPDA
-
-- type: startingGear
   id: ProspectorPDA
   equipment:
     id: ProspectorPDA
 
 - type: loadout
-  id: ExcavatorPDA
-  equipment: ExcavatorPDA
-
-- type: startingGear
   id: ExcavatorPDA
   equipment:
     id: ExcavatorPDA
diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/bartender.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/bartender.yml
index c3668d7f407..d2992bf8405 100644
--- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/bartender.yml
+++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/bartender.yml
@@ -1,18 +1,10 @@
 # PDA
 - type: loadout
-  id: BartenderPDA
-  equipment: BartenderPDA
-
-- type: startingGear
   id: BartenderPDA
   equipment:
     id: BartenderPDA
 
 - type: loadout
-  id: MixologistPDA
-  equipment: MixologistPDA
-
-- type: startingGear
   id: MixologistPDA
   equipment:
     id: MixologistPDA
diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/chef.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/chef.yml
index 9c9b3cf4c27..6ed3f729f93 100644
--- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/chef.yml
+++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/chef.yml
@@ -1,36 +1,20 @@
 # PDA
 - type: loadout
-  id: ChefPDA
-  equipment: ChefPDA
-
-- type: startingGear
   id: ChefPDA
   equipment:
     id: ChefPDA
 
 - type: loadout
-  id: BakerPDA
-  equipment: BakerPDA
-
-- type: startingGear
   id: BakerPDA
   equipment:
     id: BakerPDA
 
 - type: loadout
-  id: ButcherPDA
-  equipment: ButcherPDA
-
-- type: startingGear
   id: ButcherPDA
   equipment:
     id: ButcherPDA
 
 - type: loadout
-  id: PizzaioloPDA
-  equipment: PizzaioloPDA
-
-- type: startingGear
   id: PizzaioloPDA
   equipment:
     id: PizzaioloPDA
diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/clown.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/clown.yml
index 6be67037c54..168b9884ca0 100644
--- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/clown.yml
+++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/clown.yml
@@ -1,27 +1,15 @@
 # PDA
 - type: loadout
-  id: ClownPDA
-  equipment: ClownPDA
-
-- type: startingGear
   id: ClownPDA
   equipment:
     id: ClownPDA
 
 - type: loadout
-  id: JesterPDA
-  equipment: JesterPDA
-
-- type: startingGear
   id: JesterPDA
   equipment:
     id: JesterPDA
 
 - type: loadout
-  id: FoolPDA
-  equipment: FoolPDA
-
-- type: startingGear
   id: FoolPDA
   equipment:
     id: FoolPDA
diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/passenger.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/passenger.yml
index ea1e9b61ad5..7949d30fc68 100644
--- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/passenger.yml
+++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/passenger.yml
@@ -1,45 +1,25 @@
 # PDA
 - type: loadout
-  id: PassengerPDA
-  equipment: PassengerPDA
-
-- type: startingGear
   id: PassengerPDA
   equipment:
     id: PassengerPDA
 
 - type: loadout
-  id: VisitorPDA
-  equipment: VisitorPDA
-
-- type: startingGear
   id: VisitorPDA
   equipment:
     id: VisitorPDA
 
 - type: loadout
-  id: TouristPDA
-  equipment: TouristPDA
-
-- type: startingGear
   id: TouristPDA
   equipment:
     id: TouristPDA
 
 - type: loadout
-  id: OffDutyCrewPDA
-  equipment: OffDutyCrewPDA
-
-- type: startingGear
   id: OffDutyCrewPDA
   equipment:
     id: OffDutyCrewPDA
 
 - type: loadout
-  id: StudentPDA
-  equipment: StudentPDA
-
-- type: startingGear
   id: StudentPDA
   equipment:
     id: StudentPDA
diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/service_worker.yml
index 582f4cd2504..dab9b0d5ea4 100644
--- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/service_worker.yml
+++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/service_worker.yml
@@ -1,27 +1,15 @@
 # Head
 - type: loadout
-  id: ServiceWorkerCap
-  equipment: ServiceWorkerCap
-
-- type: startingGear
   id: ServiceWorkerCap
   equipment:
     head: ClothingHeadHatGreensoft
 
 - type: loadout
-  id: ServiceWorkerCapFlip
-  equipment: ServiceWorkerCapFlip
-
-- type: startingGear
   id: ServiceWorkerCapFlip
   equipment:
     head: ClothingHeadHatGreensoftFlipped
 
 - type: loadout
-  id: ServiceWorkerBandana
-  equipment: ServiceWorkerBandana
-
-- type: startingGear
   id: ServiceWorkerBandana
   equipment:
     head: ClothingHeadBandGreen
@@ -29,37 +17,21 @@
 # Jumpsuit
 
 - type: loadout
-  id: ServiceWorkerJumpsuit
-  equipment: ServiceWorkerJumpsuit
-
-- type: startingGear
   id: ServiceWorkerJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorGreen
 
 - type: loadout
-  id: ServiceWorkerJumpskirt
-  equipment: ServiceWorkerJumpskirt
-
-- type: startingGear
   id: ServiceWorkerJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtColorGreen
 
 - type: loadout
-  id: ServiceWorkerJumpsuitDark
-  equipment: ServiceWorkerJumpsuitDark
-
-- type: startingGear
   id: ServiceWorkerJumpsuitDark
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorDarkGreen
 
 - type: loadout
-  id: ServiceWorkerJumpskirtDark
-  equipment: ServiceWorkerJumpskirtDark
-
-- type: startingGear
   id: ServiceWorkerJumpskirtDark
   equipment:
     jumpsuit: ClothingUniformJumpskirtColorDarkGreen
diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Command/head_of_personnel.yml
index 12372eb6671..e0ced347a26 100644
--- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Command/head_of_personnel.yml
@@ -1,103 +1,59 @@
 # Jumpsuit
 
 - type: loadout
-  id: HoPFormal
-  equipment: HoPFormal
-
-- type: startingGear
   id: HoPFormal
   equipment:
     jumpsuit: ClothingUniformJumpsuitHoPFormal
 
 - type: loadout
-  id: HoPMessSkirt
-  equipment: HoPMessSkirt
-
-- type: startingGear
   id: HoPMessSkirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtHoPMess
-    
-- type: loadout
-  id: HoPMessSuit
-  equipment: HoPMessSuit
 
-- type: startingGear
+- type: loadout
   id: HoPMessSuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitHoPMess
 
 - type: loadout
-  id: HoPBoatswain
-  equipment: HoPBoatswain
-
-- type: startingGear
   id: HoPBoatswain
   equipment:
     jumpsuit: ClothingUniformJumpsuitBoatswain
 
 # Outerclothing
-- type: loadout 
-  id: HoPFormalCoat
-  equipment: HoPFormalCoat
-
-- type: startingGear
+- type: loadout
   id: HoPFormalCoat
   equipment:
     outerClothing: ClothingOuterCoatHoPFormal
 
 - type: loadout
-  id: HoPArmoredCoat
-  equipment: HoPArmoredCoat
-
-- type: startingGear
   id: HoPArmoredCoat
   equipment:
     outerClothing: ClothingOuterCoatHoPArmored
 
 # Gloves
-- type: loadout 
-  id: HoPGloves
-  equipment: HoPGloves
-
-- type: startingGear
+- type: loadout
   id: HoPGloves
   equipment:
     gloves: ClothingHandsGlovesHop
 
 # Shoes
 - type: loadout
-  id: BrownLeatherShoes
-  equipment: BrownLeatherShoes
-
-- type: startingGear
   id: BrownLeatherShoes
   equipment:
     shoes: ClothingShoesLeather
 
-- type: loadout 
-  id: WhiteLeatherShoes
-  equipment: WhiteLeatherShoes
-
-- type: startingGear 
+- type: loadout
   id: WhiteLeatherShoes
   equipment:
     shoes: ClothingShoesMiscWhite
 
 - type: loadout
-  id: LaceupShoes
-  equipment: LaceupShoes
-
-- type: startingGear
   id: LaceupShoes
   equipment:
     shoes: ClothingShoesBootsLaceup
 
-- type: loadout 
-  id: HoPWinterBoots
-  equipment: HoPWinterBoots
-
-- type: startingGear 
+- type: loadout
   id: HoPWinterBoots
   equipment:
     shoes: ClothingShoesBootsWinterHeadOfPersonel
diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Engineering/atmospheric_technician.yml
index 1a3f84047a2..2a89f63eec5 100644
--- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Engineering/atmospheric_technician.yml
+++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Engineering/atmospheric_technician.yml
@@ -1,27 +1,15 @@
 # PDA
 - type: loadout
-  id: AtmosPDA
-  equipment: AtmosPDA
-
-- type: startingGear
   id: AtmosPDA
   equipment:
     id: AtmosPDA
 
 - type: loadout
-  id: LifeSupportTechPDA
-  equipment: LifeSupportTechPDA
-
-- type: startingGear
   id: LifeSupportTechPDA
   equipment:
     id: LifeSupportTechPDA
 
 - type: loadout
-  id: PlasmaScientistPDA
-  equipment: PlasmaScientistPDA
-
-- type: startingGear
   id: PlasmaScientistPDA
   equipment:
     id: PlasmaScientistPDA
diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Engineering/station_engineer.yml
index 2017f82b674..9c135fd0186 100644
--- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Engineering/station_engineer.yml
+++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Engineering/station_engineer.yml
@@ -1,18 +1,10 @@
 # PDA
 - type: loadout
-  id: ElectricianPDA
-  equipment: ElectricianPDA
-
-- type: startingGear
   id: ElectricianPDA
   equipment:
     id: ElectricianPDA
 
 - type: loadout
-  id: MechanicPDA
-  equipment: MechanicPDA
-
-- type: startingGear
   id: MechanicPDA
   equipment:
     id: MechanicPDA
diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/chiefjustice.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/chiefjustice.yml
index db7c2e6ddbc..723ec47a758 100644
--- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/chiefjustice.yml
+++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/chiefjustice.yml
@@ -1,76 +1,44 @@
 # Head
 - type: loadout
-  id: CJToque
-  equipment: CJToque
-
-- type: startingGear
   id: CJToque
   equipment:
       head: ClothingHeadHatCJToque
 
 # Jumpsuit
 - type: loadout
-  id: ChiefJusticeJumpsuit
-  equipment: ChiefJusticeJumpsuit
-
-- type: startingGear
   id: ChiefJusticeJumpsuit
   equipment:
       jumpsuit: ClothingUniformJumpsuitChiefJustice
       
 - type: loadout
-  id: ChiefJusticeJumpskirt
-  equipment: ChiefJusticeJumpskirt
-
-- type: startingGear
   id: ChiefJusticeJumpskirt
   equipment:
       jumpsuit: ClothingUniformJumpskirtChiefJustice
 
 - type: loadout
-  id: ChiefJusticeFormalJumpsuit
-  equipment: ChiefJusticeFormalJumpsuit
-
-- type: startingGear
   id: ChiefJusticeFormalJumpsuit
   equipment:
       jumpsuit: ClothingUniformJumpsuitChiefJusticeFormal
 
 - type: loadout
-  id: ChiefJusticeWhiteJumpsuit
-  equipment: ChiefJusticeWhiteJumpsuit
-
-- type: startingGear
   id: ChiefJusticeWhiteJumpsuit
   equipment:
       jumpsuit: ClothingUniformJumpsuitChiefJusticeWhite
 
 # Neck
 - type: loadout
-  id: ChiefJusticeCloak
-  equipment: ChiefJusticeCloak
-
-- type: startingGear
   id: ChiefJusticeCloak
   equipment:
       neck: ClothingNeckCloakCJ
 
 # Outer Clothing
 - type: loadout
-  id: ChiefJusticeRobe
-  equipment: ChiefJusticeRobe
-
-- type: startingGear
   id: ChiefJusticeRobe
   equipment:
       outerClothing: ClothingOuterChiefJustice
 
 # Shoes
 - type: loadout
-  id: LeatherShoes
-  equipment: LeatherShoes
-
-- type: startingGear
   id: LeatherShoes
   equipment:
       shoes: ClothingShoesLeather
diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/clerk.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/clerk.yml
index 0d4bc067a80..f580f4e662b 100644
--- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/clerk.yml
+++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/clerk.yml
@@ -1,83 +1,47 @@
 # Jumpsuit
 - type: loadout
-  id: ClerkJumpsuit
-  equipment: ClerkJumpsuit
-
-- type: startingGear
   id: ClerkJumpsuit
   equipment:
-      jumpsuit: ClothingUniformJumpsuitClerk
-      
-- type: loadout
-  id: ClerkJumpskirt
-  equipment: ClerkJumpskirt
+    jumpsuit: ClothingUniformJumpsuitClerk
 
-- type: startingGear
+- type: loadout
   id: ClerkJumpskirt
   equipment:
-      jumpsuit: ClothingUniformJumpskirtClerk
+    jumpsuit: ClothingUniformJumpskirtClerk
 
 # Neck
 - type: loadout
-  id: BlackTie
-  equipment: BlackTie
-
-- type: startingGear
   id: BlackTie
   equipment:
-      neck: ClothingNeckTieBlack
-      
-- type: loadout
-  id: BlueTie
-  equipment: BlueTie
+    neck: ClothingNeckTieBlack
 
-- type: startingGear
+- type: loadout
   id: BlueTie
   equipment:
-      neck: ClothingNeckTieBlue
-      
-- type: loadout
-  id: BrownTie
-  equipment: BrownTie
+    neck: ClothingNeckTieBlue
 
-- type: startingGear
+- type: loadout
   id: BrownTie
   equipment:
-      neck: ClothingNeckTieBrown
-      
-- type: loadout
-  id: GreenTie
-  equipment: GreenTie
+    neck: ClothingNeckTieBrown
 
-- type: startingGear
+- type: loadout
   id: GreenTie
   equipment:
-      neck: ClothingNeckTieGreen
+    neck: ClothingNeckTieGreen
 
 - type: loadout
-  id: RedTie
-  equipment: RedTie
-
-- type: startingGear
   id: RedTie
   equipment:
-      neck: ClothingNeckTieRed
+    neck: ClothingNeckTieRed
 
 - type: loadout
-  id: WhiteTie
-  equipment: WhiteTie
-
-- type: startingGear
   id: WhiteTie
   equipment:
-      neck: ClothingNeckTieWhite
+    neck: ClothingNeckTieWhite
 
 # Outer Clothing
 - type: loadout
-  id: ClerkVest
-  equipment: ClerkVest
-
-- type: startingGear
   id: ClerkVest
   equipment:
-      outerClothing: ClothingOuterClerkVest
+    outerClothing: ClothingOuterClerkVest
diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/prosecutor.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/prosecutor.yml
index ab506996670..ac016ccbdb1 100644
--- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/prosecutor.yml
+++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/prosecutor.yml
@@ -1,28 +1,16 @@
 # Jumpsuit
 - type: loadout
-  id: ProsecutorJumpsuit
-  equipment: ProsecutorJumpsuit
-
-- type: startingGear
   id: ProsecutorJumpsuit
   equipment:
-      jumpsuit: ClothingUniformJumpsuitProsecutor
+    jumpsuit: ClothingUniformJumpsuitProsecutor
 
 - type: loadout
-  id: ProsecutorJumpskirt
-  equipment: ProsecutorJumpskirt
-
-- type: startingGear
   id: ProsecutorJumpskirt
   equipment:
-      jumpsuit: ClothingUniformJumpskirtProsecutor
+    jumpsuit: ClothingUniformJumpskirtProsecutor
 
 # Neck
 - type: loadout
-  id: ProsecutorNeck
-  equipment: ProsecutorNeck
-
-- type: startingGear
   id: ProsecutorNeck
   equipment:
-      neck: ClothingNeckProsecutorbadge
+    neck: ClothingNeckProsecutorbadge
diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/medical_doctor.yml
index 72412b15339..93e06f0fd3f 100644
--- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/medical_doctor.yml
+++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/medical_doctor.yml
@@ -1,9 +1,5 @@
 # PDA
 - type: loadout
-  id: ClinicianPDA
-  equipment: ClinicianPDA
-
-- type: startingGear
   id: ClinicianPDA
   equipment:
     id: ClinicianPDA
diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/medical_intern.yml
index 99343781dc9..171d5bbc9c4 100644
--- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/medical_intern.yml
+++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/medical_intern.yml
@@ -1,27 +1,15 @@
 # PDA
 - type: loadout
-  id: MedicalInternPDA
-  equipment: MedicalInternPDA
-
-- type: startingGear
   id: MedicalInternPDA
   equipment:
     id: MedicalInternPDA
 
 - type: loadout
-  id: PracticalNursePDA
-  equipment: PracticalNursePDA
-
-- type: startingGear
   id: PracticalNursePDA
   equipment:
     id: PracticalNursePDA
 
 - type: loadout
-  id: ResidentPDA
-  equipment: ResidentPDA
-
-- type: startingGear
   id: ResidentPDA
   equipment:
     id: ResidentPDA
diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Science/mystagogue.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Science/mystagogue.yml
index 27d490919aa..06e7af22f42 100644
--- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Science/mystagogue.yml
+++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Science/mystagogue.yml
@@ -1,17 +1,9 @@
 - type: loadout
-  id: MystagogueCloak
-  equipment: MystagogueCloak
-
-- type: startingGear
   id: MystagogueCloak
   equipment:
     neck: ClothingNeckCloakMystagogue
 
 - type: loadout
-  id: MystagogueBeret
-  equipment: MystagogueBeret
-
-- type: startingGear
   id: MystagogueBeret
   equipment:
     head: ClothingHeadHatBeretMysta
diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Science/scientist.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Science/scientist.yml
index 8d27e1b6631..dcdc9936ad0 100644
--- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Science/scientist.yml
+++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Science/scientist.yml
@@ -1,27 +1,15 @@
 # PDA
 - type: loadout
-  id: LabTechPDA
-  equipment: LabTechPDA
-
-- type: startingGear
   id: LabTechPDA
   equipment:
     id: LabTechPDA
 
 - type: loadout
-  id: XenoarchPDA
-  equipment: XenoarchPDA
-
-- type: startingGear
   id: XenoarchPDA
   equipment:
     id: XenoarchPDA
 
 - type: loadout
-  id: RoboticistPDA
-  equipment: RoboticistPDA
-
-- type: startingGear
   id: RoboticistPDA
   equipment:
     id: RoboticistPDA
diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Security/brigmedic.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Security/brigmedic.yml
index a86ce988a79..37e3ea3c3c2 100644
--- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Security/brigmedic.yml
+++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Security/brigmedic.yml
@@ -1,56 +1,32 @@
 # Head
 - type: loadout
-  id: CorpsmanBeret
-  equipment: CorpsmanBeret
-
-- type: startingGear
   id: CorpsmanBeret
   equipment:
       head: ClothingHeadHatBeretCorpsman
 
 # Jumpsuit
 - type: loadout
-  id: BrigMedicJumpsuit
-  equipment: BrigMedicJumpsuit
-
-- type: startingGear
   id: BrigMedicJumpsuit
   equipment:
       jumpsuit: ClothingUniformJumpsuitBrigmedic
 
 - type: loadout
-  id: BrigMedicJumpskirt
-  equipment: BrigMedicJumpskirt
-
-- type: startingGear
   id: BrigMedicJumpskirt
   equipment:
       jumpsuit: ClothingUniformJumpskirtBrigmedic
 
 # Back
 - type: loadout
-  id: BrigMedicBackpack
-  equipment: BrigMedicBackpack
-
-- type: startingGear
   id: BrigMedicBackpack
   equipment:
       back: ClothingBackpackBrigmedicDeltaVFilled
 
 - type: loadout
-  id: BrigMedicSatchel
-  equipment: BrigMedicSatchel
-
-- type: startingGear
   id: BrigMedicSatchel
   equipment:
       back: ClothingBackpackSatchelBrigmedicDeltaVFilled
 
 - type: loadout
-  id: BrigMedicDuffel
-  equipment: BrigMedicDuffel
-
-- type: startingGear
   id: BrigMedicDuffel
   equipment:
       back: ClothingBackpackDuffelBrigmedicDeltaVFilled
diff --git a/Resources/Prototypes/DeltaV/Loadouts/Miscellaneous/scarfs.yml b/Resources/Prototypes/DeltaV/Loadouts/Miscellaneous/scarfs.yml
index f2a51d7c9d8..90df78381cd 100644
--- a/Resources/Prototypes/DeltaV/Loadouts/Miscellaneous/scarfs.yml
+++ b/Resources/Prototypes/DeltaV/Loadouts/Miscellaneous/scarfs.yml
@@ -1,90 +1,54 @@
 # Neck
 #Red
 - type: loadout
-  id: ScarfRed
-  equipment: ScarfRed
-
-- type: startingGear
   id: ScarfRed
   equipment:
     neck: ClothingNeckScarfStripedRed
 
 #Blue
 - type: loadout
-  id: ScarfBlue
-  equipment: ScarfBlue
-
-- type: startingGear
   id: ScarfBlue
   equipment:
     neck: ClothingNeckScarfStripedBlue
 
 #LightBlue
 - type: loadout
-  id: ScarfLightBlue
-  equipment: ScarfLightBlue
-
-- type: startingGear
   id: ScarfLightBlue
   equipment:
     neck: ClothingNeckScarfStripedLightBlue
 
 #Green
 - type: loadout
-  id: ScarfGreen
-  equipment: ScarfGreen
-
-- type: startingGear
   id: ScarfGreen
   equipment:
     neck: ClothingNeckScarfStripedGreen
 
 #Purple
 - type: loadout
-  id: ScarfPurple
-  equipment: ScarfPurple
-
-- type: startingGear
   id: ScarfPurple
   equipment:
     neck: ClothingNeckScarfStripedPurple
 
 #Brown
 - type: loadout
-  id: ScarfBrown
-  equipment: ScarfBrown
-
-- type: startingGear
   id: ScarfBrown
   equipment:
     neck: ClothingNeckScarfStripedBrown
 
 #Orange
 - type: loadout
-  id: ScarfOrange
-  equipment: ScarfOrange
-
-- type: startingGear
   id: ScarfOrange
   equipment:
     neck: ClothingNeckScarfStripedOrange
 
 #Black
 - type: loadout
-  id: ScarfBlack
-  equipment: ScarfBlack
-
-- type: startingGear
   id: ScarfBlack
   equipment:
     neck: ClothingNeckScarfStripedBlack
 
 #Zebra
 - type: loadout
-  id: ScarfZebra
-  equipment: ScarfZebra
-
-- type: startingGear
   id: ScarfZebra
   equipment:
     neck: ClothingNeckScarfStripedZebra
diff --git a/Resources/Prototypes/DeltaV/Loadouts/Miscellaneous/survival.yml b/Resources/Prototypes/DeltaV/Loadouts/Miscellaneous/survival.yml
new file mode 100644
index 00000000000..dceacb043cf
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Loadouts/Miscellaneous/survival.yml
@@ -0,0 +1,26 @@
+# Corpsman
+- type: loadout
+  id: EmergencyOxygenCorpsman
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: OxygenBreather
+  storage:
+    back:
+    - BoxSurvivalBrigmedic
+
+- type: loadout
+  id: EmergencyNitrogenCorpsman
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: NitrogenBreather
+  storage:
+    back:
+    - BoxSurvivalBrigmedicNitrogen
+
+- type: loadout
+  id: LoadoutSpeciesBreathToolCorpsman
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: EffectSpeciesVox
+  equipment:
+    mask: ClothingMaskBreathMedicalSecurity
diff --git a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml
index ec6b03ca4ee..9d35f9e582a 100644
--- a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml
@@ -102,7 +102,34 @@
   - BrigMedicBackpack
   - BrigMedicSatchel
   - BrigMedicDuffel
-  
+
+- type: loadoutGroup
+  id: SurvivalCorpsman
+  name: loadout-group-survival-corpsman
+  minLimit: 2
+  hidden: true
+  loadouts:
+  - EmergencyNitrogenCorpsman
+  - EmergencyOxygenCorpsman
+  - LoadoutSpeciesVoxNitrogen
+
+- type: loadoutGroup
+  id: GroupSpeciesBreathToolCorpsman
+  name: loadout-group-breath-tool
+  minLimit: 1
+  maxLimit: 1
+  hidden: true
+  loadouts:
+  - LoadoutSpeciesBreathToolCorpsman
+
+## Security Cadet
+- type: loadoutGroup
+  id: SecurityCadetHead
+  name: loadout-group-security-cadet-head
+  minLimit: 0
+  loadouts:
+  - MimeHead
+
 # Justice
 ## Chief Justice
 - type: loadoutGroup
diff --git a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml
index 8b6299e564d..a49e6d2dde4 100644
--- a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml
@@ -9,7 +9,9 @@
   - CourierPDA
   - CargoTechnicianBackpack
   - CourierShoes
+  - Survival
   - Trinkets
+  - GroupSpeciesBreathTool
 
 # Security
 - type: roleLoadout
@@ -22,8 +24,10 @@
   - SecurityShoes
   - SecurityOuterClothing
   - MedicalGloves
+  - SurvivalCorpsman
   - Trinkets
-  
+  - GroupSpeciesBreathToolCorpsman
+
 # Justice
 - type: roleLoadout
   id: JobChiefJustice
@@ -35,8 +39,10 @@
   - CommonBackpack
   - ChiefJusticeShoes
   - Glasses
+  - Survival
   - Trinkets
-  
+  - GroupSpeciesBreathTool
+
 - type: roleLoadout
   id: JobClerk
   groups:
@@ -46,13 +52,18 @@
   - CommonBackpack
   - ClerkShoes
   - Glasses
+  - Survival
   - Trinkets
-  
+  - GroupSpeciesBreathTool
+
 - type: roleLoadout
   id: JobProsecutor
   groups:
+  - GroupTankHarness
   - ProsecutorJumpsuit
   - ProsecutorNeck
-  - LawyerBackpack
+  - CommonBackpack
   - Glasses
+  - Survival
   - Trinkets
+  - GroupSpeciesBreathTool
diff --git a/Resources/Prototypes/DeltaV/Objectives/fugitive.yml b/Resources/Prototypes/DeltaV/Objectives/fugitive.yml
index aac440e5c5e..7361e44f56d 100644
--- a/Resources/Prototypes/DeltaV/Objectives/fugitive.yml
+++ b/Resources/Prototypes/DeltaV/Objectives/fugitive.yml
@@ -4,7 +4,7 @@
   id: BaseFugitiveObjective
   components:
   - type: Objective
-    issuer: self
+    issuer: objective-issuer-self
     difficulty: 1
   - type: RoleRequirement
     roles:
diff --git a/Resources/Prototypes/DeltaV/Objectives/paradox_anomaly.yml b/Resources/Prototypes/DeltaV/Objectives/paradox_anomaly.yml
index c75142ed6ba..453c37acbb4 100644
--- a/Resources/Prototypes/DeltaV/Objectives/paradox_anomaly.yml
+++ b/Resources/Prototypes/DeltaV/Objectives/paradox_anomaly.yml
@@ -5,7 +5,7 @@
   components:
   - type: Objective
     difficulty: 1
-    issuer: self
+    issuer: objective-issuer-self
   - type: RoleRequirement
     roles:
       components:
diff --git a/Resources/Prototypes/DeltaV/Roles/Antags/fugitive.yml b/Resources/Prototypes/DeltaV/Roles/Antags/fugitive.yml
index 79be8493701..980278fb45a 100644
--- a/Resources/Prototypes/DeltaV/Roles/Antags/fugitive.yml
+++ b/Resources/Prototypes/DeltaV/Roles/Antags/fugitive.yml
@@ -15,7 +15,7 @@
     jumpsuit: ClothingUniformJumpsuitPrisoner
     ears: ClothingHeadsetGrey
     gloves: ClothingHandsGlovesColorYellow
-    back: ClothingBackpackFilled
+    back: ClothingBackpackSatchel
     shoes: ClothingShoesChameleonNoSlips
     id: PassengerPDA
   #innerClothingSkirt: ClothingUniformJumpskirtPrisoner # FIXME doesnt work
diff --git a/Resources/Prototypes/DeltaV/Roles/Antags/recruiter.yml b/Resources/Prototypes/DeltaV/Roles/Antags/recruiter.yml
index e69a18e7ad9..2098b1675a5 100644
--- a/Resources/Prototypes/DeltaV/Roles/Antags/recruiter.yml
+++ b/Resources/Prototypes/DeltaV/Roles/Antags/recruiter.yml
@@ -15,7 +15,7 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitDetectiveGrey
     jumpskirt: ClothingUniformJumpskirtDetectiveGrey
-    back: ClothingBackpackSatchelFilled
+    back: ClothingBackpackSatchel
     head: ClothingHeadHatFedoraBrown
     eyes: ClothingEyesGlassesSunglasses
     gloves: ClothingHandsGlovesColorWhite
diff --git a/Resources/Prototypes/DeltaV/Roles/Antags/synthesis_specialist.yml b/Resources/Prototypes/DeltaV/Roles/Antags/synthesis_specialist.yml
index b1584c58da1..21032f40f05 100644
--- a/Resources/Prototypes/DeltaV/Roles/Antags/synthesis_specialist.yml
+++ b/Resources/Prototypes/DeltaV/Roles/Antags/synthesis_specialist.yml
@@ -15,7 +15,7 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitSyndieFormal
     jumpskirt: ClothingUniformJumpskirtSyndieFormalDress
-    back: ClothingBackpackChemistryFilled
+    back: ClothingBackpackChemistry
     belt: ChemBag
     eyes: ClothingEyesGlassesChemical
     gloves: ClothingHandsGlovesChemist
diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml
index c4d5fbfe20d..60487dfe146 100644
--- a/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml
+++ b/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml
@@ -1,6 +1,7 @@
 - type: department
   id: Justice
-  description: department-justice-description
+  name: department-Justice
+  description: department-Justice-description
   color: "#701442"
   roles:
   - ChiefJustice
diff --git a/Resources/Prototypes/DeltaV/StatusEffects/job.yml b/Resources/Prototypes/DeltaV/StatusIcon/job.yml
similarity index 61%
rename from Resources/Prototypes/DeltaV/StatusEffects/job.yml
rename to Resources/Prototypes/DeltaV/StatusIcon/job.yml
index a7f1105f5bd..fef4f4489a0 100644
--- a/Resources/Prototypes/DeltaV/StatusEffects/job.yml
+++ b/Resources/Prototypes/DeltaV/StatusIcon/job.yml
@@ -1,34 +1,47 @@
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconMedicalBorg
   icon:
     sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
     state: MedicalBorg
+  jobName: job-name-medical-borg
 
-- type: statusIcon
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconCourier
+  icon:
+    sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
+    state: nyanoMailCarrier
+  jobName: job-name-courier
+
+- type: jobIcon
   parent: JobIcon
   id: JobIconChiefJustice
   icon:
     sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
     state: ChiefJustice
+  jobName: job-name-chief-justice
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconClerk
   icon:
     sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
     state: Clerk
+  jobName: job-name-clerk
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconProsecutor
   icon:
     sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
     state: Prosecutor
+  jobName: job-name-prosecutor
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconSecurityBorg
   icon:
     sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
     state: SecurityBorg
+  jobName: job-name-security-borg
diff --git a/Resources/Prototypes/DeltaV/StatusIcon/security.yml b/Resources/Prototypes/DeltaV/StatusIcon/security.yml
index 71d4edd9f13..ce8f3763f6e 100644
--- a/Resources/Prototypes/DeltaV/StatusIcon/security.yml
+++ b/Resources/Prototypes/DeltaV/StatusIcon/security.yml
@@ -1,4 +1,5 @@
-- type: statusIcon # DeltaV - HUD state for crew subpeonaed by Justice Dept. 
+# HUD state for crew subpeonaed by Justice Dept.
+- type: securityIcon
   parent: SecurityIcon
   id: SecurityIconSubpoenaed
   icon:
diff --git a/Resources/Prototypes/DeltaV/Traits/disabilities.yml b/Resources/Prototypes/DeltaV/Traits/disabilities.yml
new file mode 100644
index 00000000000..a4c83523d5f
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Traits/disabilities.yml
@@ -0,0 +1,7 @@
+- type: trait
+  id: Uncloneable
+  name: trait-uncloneable-name
+  description: trait-uncloneable-desc
+  category: Disabilities
+  components:
+  - type: Uncloneable
diff --git a/Resources/Prototypes/DeltaV/status_effects.yml b/Resources/Prototypes/DeltaV/status_effects.yml
index c837b6b0d34..e69de29bb2d 100644
--- a/Resources/Prototypes/DeltaV/status_effects.yml
+++ b/Resources/Prototypes/DeltaV/status_effects.yml
@@ -1,6 +0,0 @@
-- type: statusIcon
-  parent: JobIcon
-  id: JobIconCourier
-  icon:
-    sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
-    state: nyanoMailCarrier
diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
index 107a6938eec..304323c0975 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -258,6 +258,16 @@
   - type: Sprite
     sprite: Clothing/Back/Backpacks/ertchaplain.rsi
 
+- type: entity
+  parent: ClothingBackpackERTSecurity
+  id: ClothingBackpackDeathSquad
+  name: death squad backpack
+  description: Holds the kit of CentComm's most feared agents.
+  components:
+    - type: Storage
+      grid:
+      - 0,0,7,6
+
 #Syndicate
 - type: entity
   parent: ClothingBackpack
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index 66a9c60511b..32170331ff3 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -269,6 +269,7 @@
         - Radio
         - DiscreteHealthAnalyzer
         - SurgeryTool
+        - Dropper
       components:
         - Hypospray
         - Injector
@@ -343,6 +344,7 @@
         - Bottle
         - Syringe
         - CigPack
+        - Dropper
       components:
         - Seed
         - Smokable
diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
index df160f8e5a7..bd149ea9923 100644
--- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
@@ -78,7 +78,7 @@
 - type: entity
   parent: ClothingHeadset
   id: ClothingHeadsetCentCom
-  name: CentCom headset
+  name: CentComm headset
   description: A headset used by the upper echelons of Nanotrasen.
   components:
   - type: ContainerFill
@@ -278,7 +278,7 @@
   parent: ClothingHeadset
   id: ClothingHeadsetFreelance
   name: freelancer headset
-  description: This is used by a roaming group of freelancers
+  description: This is used by a roaming group of freelancers.
   components:
     - type: ContainerFill
       containers:
diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml
index 5dfa1df150b..193f199eee7 100644
--- a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml
+++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml
@@ -29,7 +29,7 @@
 - type: entity
   parent: ClothingHeadsetAlt
   id: ClothingHeadsetAltCentCom
-  name: CentCom over-ear headset
+  name: CentComm over-ear headset
   components:
   - type: ContainerFill
     containers:
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
index 90232de20a5..dbee9663185 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
@@ -63,6 +63,8 @@
   - type: Clothing
     sprite: Clothing/Eyes/Glasses/meson.rsi
   - type: EyeProtection
+  - type: IdentityBlocker
+    coverage: EYES
   - type: Tag
     tags:
     - SecDogWearable # DeltaV - let Laika wear meson goggles
@@ -183,6 +185,7 @@
   - type: GuideHelp
     guides:
     - Security
+    - Antagonists
   - type: IdentityBlocker
     coverage: EYES
 
@@ -199,6 +202,8 @@
   - type: FlashImmunity
   - type: EyeProtection
     protectionTime: 5
+  - type: IdentityBlocker
+    coverage: EYES
 
 #Make a scanner category when these actually function and we get the trayson
 - type: entity
@@ -216,6 +221,8 @@
       coefficients:
         Heat: 0.95
   - type: GroupExamine
+  - type: IdentityBlocker
+    coverage: EYES
 
 - type: entity
   parent: ClothingEyesBase
@@ -228,6 +235,8 @@
     - type: Clothing
       sprite: Clothing/Eyes/Glasses/science.rsi
     - type: SolutionScanner
+    - type: IdentityBlocker
+      coverage: EYES
 
 - type: entity
   parent: ClothingEyesBase
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
index 0c7fc5b2a1f..b22320a82f8 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: ShowSecurityIcons
   abstract: true
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: ShowJobIcons
   - type: ShowMindShieldIcons
@@ -10,7 +10,7 @@
 - type: entity
   id: ShowMedicalIcons
   abstract: true
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: ShowHealthBars
     damageContainers:
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
index 02cf0ab6f67..c1a53ccf6e5 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
@@ -23,6 +23,10 @@
     tags:
     - ClothMade
     - WhitelistChameleon
+  - type: DamageOnInteractProtection
+    damageProtection:
+      flatReductions:
+        Heat: 5 # the average lightbulb only does around four damage!
 
 - type: entity
   abstract: true
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml
index 0fa298b648b..556442cee11 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml
@@ -283,8 +283,6 @@
         color: "#535353"
   - type: Clothing
     sprite: Clothing/Hands/Gloves/Color/black.rsi
-  - type: GloveHeatResistance
-    heatResistance: 1400
   - type: Butcherable
     butcheringType: Knife
     spawned:
@@ -305,8 +303,6 @@
     sprite: Clothing/Hands/Gloves/Color/yellow.rsi
   - type: Clothing
     sprite: Clothing/Hands/Gloves/Color/yellow.rsi
-  - type: GloveHeatResistance
-    heatResistance: 1400
   - type: Butcherable
     butcheringType: Knife
     spawned:
@@ -323,9 +319,6 @@
   name: budget insulated gloves
   description: These gloves are cheap knockoffs of the coveted ones - no way this can end badly.
   components:
-  - type: GloveHeatResistance
-    # can't take out lights using budgets
-    heatResistance: 0
   - type: RandomInsulation
     # Why repeated numbers? So some numbers are more common, of course!
     list:
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
index 8b73eee0d24..53a165cd571 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
@@ -103,8 +103,6 @@
     sprite: Clothing/Hands/Gloves/captain.rsi
   - type: Clothing
     sprite: Clothing/Hands/Gloves/captain.rsi
-  - type: GloveHeatResistance
-    heatResistance: 1400
   - type: Insulated
   - type: Fiber
     fiberMaterial: fibers-durathread
@@ -169,8 +167,6 @@
     sprite: Clothing/Hands/Gloves/leather.rsi
   - type: Clothing
     sprite: Clothing/Hands/Gloves/leather.rsi
-  - type: GloveHeatResistance
-    heatResistance: 1400
   - type: Fiber
     fiberMaterial: fibers-leather
     fiberColor: fibers-brown
@@ -206,7 +202,7 @@
   - type: FingerprintMask
 
 - type: entity
-  parent: ClothingHandsBase
+  parent: [ClothingHandsBase, BaseToggleClothing]
   id: ClothingHandsGlovesSpaceNinja
   name: space ninja gloves
   description: These black nano-enhanced gloves insulate from electricity and provide fire resistance.
@@ -225,8 +221,6 @@
         enum.ToggleVisuals.Layer:
           True: {state: icon-green}
           False: {state: icon}
-  - type: GloveHeatResistance
-    heatResistance: 1400
   - type: Insulated
   - type: Fiber
     fiberMaterial: fibers-nanomachines
@@ -234,7 +228,31 @@
   - type: Thieving
     stripTimeReduction: 1
     stealthy: true
+  - type: ToggleClothing
+    action: ActionToggleNinjaGloves
   - type: NinjaGloves
+    abilities:
+    - components:
+      - type: BatteryDrainer
+      - type: StunProvider
+        noPowerPopup: ninja-no-power
+        whitelist:
+          components:
+          - Stamina
+      - type: EmagProvider
+        whitelist:
+          components:
+          - Airlock
+    - objective: StealResearchObjective
+      components:
+      - type: ResearchStealer
+    - objective: TerrorObjective
+      components:
+      - type: CommsHacker
+        threats: NinjaThreats
+    - objective: MassArrestObjective
+      components:
+      - type: CriminalRecordsHacker
 
 - type: entity
   parent: ClothingHandsGlovesColorBlack
@@ -246,8 +264,6 @@
     sprite: Clothing/Hands/Gloves/combat.rsi
   - type: Clothing
     sprite: Clothing/Hands/Gloves/combat.rsi
-  - type: GloveHeatResistance
-    heatResistance: 1400
   - type: Insulated
   - type: Fiber
     fiberMaterial: fibers-insulative
@@ -263,8 +279,6 @@
     sprite: Clothing/Hands/Gloves/tacticalmaidgloves.rsi
   - type: Clothing
     sprite: Clothing/Hands/Gloves/tacticalmaidgloves.rsi
-  - type: GloveHeatResistance
-    heatResistance: 1400
   - type: Insulated
   - type: Fiber
     fiberColor: fibers-black
@@ -300,6 +314,10 @@
   - type: Fiber
     fiberMaterial: fibers-synthetic
     fiberColor: fibers-black
+  - type: DamageOnInteractProtection
+    damageProtection:
+      flatReductions:
+        Heat: 0 # no protection
 
 - type: entity
   parent: ClothingHandsBase
@@ -314,6 +332,10 @@
   - type: Fiber
     fiberMaterial: fibers-insulative
     fiberColor: fibers-yellow
+  - type: DamageOnInteractProtection
+    damageProtection:
+      flatReductions:
+        Heat: 0 # no protection
 
 - type: entity
   parent: ClothingHandsButcherable
@@ -328,6 +350,10 @@
   - type: Fiber
     fiberMaterial: fibers-insulative
     fiberColor: fibers-olive
+  - type: DamageOnInteractProtection
+    damageProtection:
+      flatReductions:
+        Heat: 0 # no protection
 
 - type: entity
   # Intentionally named after regular gloves, they're meant to be sneaky.
diff --git a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml
index 51a56f1f1d6..007cba3f220 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml
@@ -7,6 +7,8 @@
     folded: true
   - type: Mask
     isToggled: true
+    enabled: false
+    disableOnFolded: true
   - type: IngestionBlocker
     enabled: false
   - type: IdentityBlocker
@@ -20,6 +22,8 @@
     - state: icon_mask
       map: [ "unfoldedLayer" ]
       visible: false
+  - type: HideLayerClothing # needed since head bandana inherits from mask bandana
+    slots: []
   - type: Tag
     tags:
     - Bandana
diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
index 462032547b2..66356afacfc 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
@@ -59,7 +59,7 @@
   parent: ClothingHeadBase
   id: ClothingHeadLightBase
   name: base helmet with light
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     layers:
@@ -151,7 +151,7 @@
   # No parent since we aren't actually an item.
   id: ClothingHeadHardsuitBase
   name: base hardsuit helmet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: BreathMask
   - type: Sprite
@@ -195,7 +195,7 @@
   parent: ClothingHeadHardsuitBase
   id: ClothingHeadHardsuitWithLightBase
   name: base hardsuit helmet with light
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     layers:
@@ -247,7 +247,7 @@
   id: ClothingHeadHatHoodWinterBase
   name: base winter coat hood
   description: A hood, made to keep your head warm.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: icon
diff --git a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
index 530c23a5781..dd1bfd91bc6 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
@@ -74,7 +74,7 @@
   parent: ClothingHeadEVAHelmetBase
   id: ClothingHeadHelmetAncient
   name: NTSRA void helmet
-  description: An ancient space helmet, designed by the NTSRA branch of CentCom.
+  description: An ancient space helmet, designed by the NTSRA branch of CentComm.
   components:
   - type: Sprite
     sprite: Clothing/Head/Helmets/ancientvoidsuit.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
index 29db61071bc..19191f31b90 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -111,6 +111,8 @@
       - state: equipped-head
       - state: equipped-head-unshaded
         shader: unshaded
+  - type: PointLight
+    radius: 6
   - type: PressureProtection
     highPressureMultiplier: 0.72
     lowPressureMultiplier: 1000
@@ -136,7 +138,7 @@
 - type: entity
   parent: ClothingHeadHardsuitBase
   id: ClothingHeadHelmetHardsuitMaxim
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: salvager maxim helmet
   description: A predication of decay washes over your mind.
   components:
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index 992b9073846..d8d26b07a29 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -28,7 +28,7 @@
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatBeretFrench
-  name: French beret
+  name: french beret
   description: A French beret, "vive la France".
   components:
   - type: Sprite
@@ -62,7 +62,7 @@
   parent: ClothingHeadBase
   id: ClothingHeadHatCasa
   name: casa
-  description: Cone-shaped hat
+  description: Cone-shaped hat.
   components:
     - type: Sprite
       sprite: Clothing/Head/Hats/casa.rsi
@@ -224,7 +224,7 @@
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatCentcom
-  name: CentCom brand hat
+  name: CentComm brand hat
   description: "It's good to be the emperor."
   components:
   - type: Sprite
@@ -393,7 +393,6 @@
   - type: HideLayerClothing
     slots:
     - Hair
-    - Snout
     - HeadTop
     - HeadSide
 
@@ -417,7 +416,7 @@
   parent: ClothingHeadBase
   id: ClothingHeadHatSantahat
   name: santa hat
-  description: "A festive hat worn by Santa Claus"
+  description: A festive hat worn by Santa Claus.
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/santahat.rsi
@@ -891,7 +890,7 @@
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatCentcomcap
-  name: CentCom cap
+  name: CentComm cap
   description: An extravagant, fancy Central Commander cap.
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
index 54e69ff708f..1593aecc01f 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -357,6 +357,24 @@
   - type: Clothing
     sprite: Clothing/Head/Helmets/ert_janitor.rsi
 
+- type: entity
+  parent: ClothingHeadHelmetBasic
+  id: ClothingHeadHelmetRaid
+  name: syndicate raid helmet
+  description: An armored helmet for use with the syndicate raid suit. Very stylish.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/syndie-raid.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Helmets/syndie-raid.rsi
+  - type: Armor
+    modifiers: #There's gotta be SOME reason to use this over other helmets.
+      coefficients:
+        Blunt: 0.85
+        Slash: 0.85
+        Piercing: 0.85
+        Heat: 0.85
+
 #Bone Helmet
 - type: entity
   parent: ClothingHeadHelmetBasic
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
index 5f937e42c25..86cc83ddca2 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
@@ -89,7 +89,7 @@
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatHoodChaplainHood
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: chaplain's hood
   description: Maximum piety in this star system.
   components:
@@ -155,6 +155,7 @@
       coefficients:
         Heat: 0.95
         Radiation: 0.65
+  - type: IdentityBlocker
   - type: BreathMask
   - type: HideLayerClothing
     slots:
@@ -183,7 +184,7 @@
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatHoodIan
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: ian hood
   description: A hood to complete the 'Good boy' look.
   components:
@@ -198,7 +199,7 @@
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatHoodCarp
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: carp hood
   description: A gnarly hood adorned with plastic space carp teeth.
   components:
@@ -213,7 +214,7 @@
 - type: entity
   parent: ClothingHeadHatHoodCarp
   id: ClothingHeadHelmetHardsuitCarp
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: PressureProtection
     highPressureMultiplier: 0.6
@@ -251,7 +252,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterDefault
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: default winter coat hood
   components:
   - type: Sprite
@@ -262,7 +263,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterBartender
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: bartender winter coat hood
   components:
   - type: Sprite
@@ -273,7 +274,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterCaptain
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: captain's winter coat hood
   description: An expensive hood, to keep the captain's head warm.
   components:
@@ -285,7 +286,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterCargo
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: logistics winter coat hood # DeltaV - Logistics Department replacing Cargo
   components:
   - type: Sprite
@@ -296,7 +297,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterCE
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: chief engineer's winter coat hood
   components:
   - type: Sprite
@@ -307,8 +308,8 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterCentcom
-  noSpawn: true
-  name: Centcom winter coat hood
+  categories: [ HideSpawnMenu ]
+  name: CentComm winter coat hood
   description: A hood for keeping the central comander's head warm.
   components:
   - type: Sprite
@@ -319,7 +320,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterChem
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: chemist winter coat hood
   components:
   - type: Sprite
@@ -330,7 +331,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterCMO
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: chief medical officer's winter coat hood
   components:
   - type: Sprite
@@ -341,7 +342,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterEngineer
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: engineer winter coat hood
   components:
   - type: Sprite
@@ -352,7 +353,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterHOP
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: head of personel's winter coat hood
   components:
   - type: Sprite
@@ -363,7 +364,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterHOS
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: head of security's winter coat hood
   components:
   - type: Sprite
@@ -374,7 +375,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterHydro
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: hydroponics coat hood
   components:
   - type: Sprite
@@ -385,7 +386,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterJani
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: janitor coat hood
   components:
   - type: Sprite
@@ -396,7 +397,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterMed
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: medic coat hood
   components:
   - type: Sprite
@@ -407,7 +408,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterMime
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: mime coat hood
   components:
   - type: Sprite
@@ -418,7 +419,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterMiner
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: miner coat hood
   components:
   - type: Sprite
@@ -429,7 +430,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterPara
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: paramedic coat hood
   components:
   - type: Sprite
@@ -440,7 +441,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterQM
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: logistics officer's coat hood # DeltaV - Logistics Department replacing Cargo
   components:
   - type: Sprite
@@ -451,7 +452,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterRD
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: mystagogue's coat hood # DeltaV - Epistemics Department replacing Science
   components:
   - type: Sprite
@@ -462,7 +463,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterRobo
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: robotics coat hood
   components:
   - type: Sprite
@@ -473,7 +474,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterSci
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: scientist coat hood
   components:
   - type: Sprite
@@ -484,7 +485,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterSec
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: security coat hood
   components:
   - type: Sprite
@@ -495,7 +496,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterSyndie
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: syndicate coat hood
   components:
   - type: Sprite
@@ -506,7 +507,7 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterWarden
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: warden's coat hood
   components:
   - type: Sprite
@@ -517,10 +518,230 @@
 - type: entity
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterWeb
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: web coat hood
   components:
   - type: Sprite
     sprite: Clothing/Head/Hoods/Coat/hoodweb.rsi
   - type: Clothing
     sprite: Clothing/Head/Hoods/Coat/hoodweb.rsi
+
+- type: entity
+  parent: ClothingHeadHatHoodWinterBase
+  id: ClothingHeadHatHoodWinterColorBlack
+  noSpawn: true
+  name: black winter coat hood
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#3f3f3f"
+    - state: winterbits-icon
+  - type: Clothing
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    clothingVisuals:
+      head:
+      - state: coatybits-equipped-HELMET
+        color: "#3f3f3f"
+      - state: winterbits-equipped-HELMET
+
+- type: entity
+  parent: ClothingHeadHatHoodWinterBase
+  id: ClothingHeadHatHoodWinterColorPurple
+  noSpawn: true
+  name: purple winter coat hood
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#9C0DE1"
+    - state: winterbits-icon
+  - type: Clothing
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    clothingVisuals:
+      head:
+      - state: coatybits-equipped-HELMET
+        color: "#9C0DE1"
+      - state: winterbits-equipped-HELMET
+
+- type: entity
+  parent: ClothingHeadHatHoodWinterBase
+  id: ClothingHeadHatHoodWinterColorRed
+  noSpawn: true
+  name: red winter coat hood
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#940000"
+    - state: winterbits-icon
+  - type: Clothing
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    clothingVisuals:
+      head:
+      - state: coatybits-equipped-HELMET
+        color: "#940000"
+      - state: winterbits-equipped-HELMET
+
+- type: entity
+  parent: ClothingHeadHatHoodWinterBase
+  id: ClothingHeadHatHoodWinterColorBlue
+  noSpawn: true
+  name: blue winter coat hood
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#0089EF"
+    - state: winterbits-icon
+  - type: Clothing
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    clothingVisuals:
+      head:
+      - state: coatybits-equipped-HELMET
+        color: "#0089EF"
+      - state: winterbits-equipped-HELMET
+
+- type: entity
+  parent: ClothingHeadHatHoodWinterBase
+  id: ClothingHeadHatHoodWinterColorBrown
+  noSpawn: true
+  name: brown winter coat hood
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#723A02"
+    - state: winterbits-icon
+  - type: Clothing
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    clothingVisuals:
+      head:
+      - state: coatybits-equipped-HELMET
+        color: "#723A02"
+      - state: winterbits-equipped-HELMET
+
+- type: entity
+  parent: ClothingHeadHatHoodWinterBase
+  id: ClothingHeadHatHoodWinterColorGray
+  noSpawn: true
+  name: gray winter coat hood
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#999999"
+    - state: winterbits-icon
+  - type: Clothing
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    clothingVisuals:
+      head:
+      - state: coatybits-equipped-HELMET
+        color: "#999999"
+      - state: winterbits-equipped-HELMET
+
+- type: entity
+  parent: ClothingHeadHatHoodWinterBase
+  id: ClothingHeadHatHoodWinterColorGreen
+  noSpawn: true
+  name: green winter coat hood
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#5ABF2F"
+    - state: winterbits-icon
+  - type: Clothing
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    clothingVisuals:
+      head:
+      - state: coatybits-equipped-HELMET
+        color: "#5ABF2F"
+      - state: winterbits-equipped-HELMET
+
+- type: entity
+  parent: ClothingHeadHatHoodWinterBase
+  id: ClothingHeadHatHoodWinterColorLightBrown
+  noSpawn: true
+  name: light brown winter coat hood
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#C09F72"
+    - state: winterbits-icon
+  - type: Clothing
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    clothingVisuals:
+      head:
+      - state: coatybits-equipped-HELMET
+        color: "#C09F72"
+      - state: winterbits-equipped-HELMET
+
+- type: entity
+  parent: ClothingHeadHatHoodWinterBase
+  id: ClothingHeadHatHoodWinterColorOrange
+  noSpawn: true
+  name: orange winter coat hood
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#EF8100"
+    - state: winterbits-icon
+  - type: Clothing
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    clothingVisuals:
+      head:
+      - state: coatybits-equipped-HELMET
+        color: "#EF8100"
+      - state: winterbits-equipped-HELMET
+
+- type: entity
+  parent: ClothingHeadHatHoodWinterBase
+  id: ClothingHeadHatHoodWinterColorWhite
+  noSpawn: true
+  name: white winter coat hood
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#EAE8E8"
+    - state: winterbits-icon
+  - type: Clothing
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    clothingVisuals:
+      head:
+      - state: coatybits-equipped-HELMET
+        color: "#EAE8E8"
+      - state: winterbits-equipped-HELMET
+
+- type: entity
+  parent: ClothingHeadHatHoodWinterBase
+  id: ClothingHeadHatHoodWinterColorYellow
+  noSpawn: true
+  name: yellow winter coat hood
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#EBE216"
+    - state: winterbits-icon
+  - type: Clothing
+    sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi
+    clothingVisuals:
+      head:
+      - state: coatybits-equipped-HELMET
+        color: "#EBE216"
+      - state: winterbits-equipped-HELMET
diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
index c6a556b2d32..cdd6ee894ef 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
@@ -148,6 +148,8 @@
     sprite: Clothing/Head/Misc/cone.rsi
   - type: Clothing
     sprite: Clothing/Head/Misc/cone.rsi
+  - type: Item
+    storedRotation: 0
   - type: PhysicalComposition #you can't just pass up some free plastic!
     materialComposition:
       Plastic: 100
@@ -183,6 +185,36 @@
   - type: AddAccentClothing
     accent: OwOAccent
 
+- type: entity
+  parent: [ClothingHeadHatCatEars, BaseToggleClothing]
+  id: ClothingHeadHatCatEarsValid
+  suffix: Valid, DO NOT MAP
+  components:
+  - type: ToggleClothing
+    action: ActionBecomeValid
+    disableOnUnequip: true
+  - type: ComponentToggler
+    parent: true
+    components:
+    - type: KillSign
+  - type: Tag
+    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
+  categories: [ Actions, HideSpawnMenu ]
+  id: ActionBecomeValid
+  name: Become Valid
+  description: "*notices your killsign* owo whats this"
+  components:
+  - type: InstantAction
+    event: !type:ToggleActionEvent
+
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatDogEars
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml b/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml
index f5ad2fb6c83..bb5d6f2d2fd 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml
@@ -11,7 +11,11 @@
     - HEAD
     unfoldedSlots:
     - MASK
+    foldedHideLayers: []
+    unfoldedHideLayers:
+    - Snout
   - type: Mask
+    disableOnFolded: true
   - type: IngestionBlocker
   - type: IdentityBlocker
     coverage: MOUTH
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
index 1f2ed875a60..8e621ebcdb5 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -91,7 +91,7 @@
 - type: entity
   parent: ClothingMaskGasAtmos
   id: ClothingMaskGasCentcom
-  name: CentCom gas mask
+  name: CentComm gas mask
   description: Oooh, gold and green. Fancy! This should help as you sit in your office.
   components:
   - type: Sprite
@@ -230,6 +230,24 @@
     graph: BananaClownMask
     node: mask
 
+- type: entity
+  parent: ClothingMaskClown
+  id: ClothingMaskClownSecurity
+  name: security clown wig and mask
+  description: A debatably oxymoronic but protective mask and wig.
+  components:
+  - type: Sprite
+    sprite: Clothing/Mask/clown_security.rsi
+  - type: Clothing
+    sprite: Clothing/Mask/clown_security.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.95
+        Slash: 0.95
+        Piercing: 0.95
+        Heat: 0.95
+
 - type: entity
   parent: ClothingMaskBase
   id: ClothingMaskJoy
@@ -584,7 +602,7 @@
   parent: ClothingMaskMime
   id: ClothingMaskScaredMime
   name: scared mime mask
-  description: Looks like it would scream if it wasn't a mask
+  description: Looks like it would scream if it wasn't a mask.
   components:
   - type: Sprite
     sprite: Clothing/Mask/scaredmime.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml b/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml
index 1bccb4c92a3..608f061dd89 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml
@@ -29,3 +29,14 @@
     tags:
     - ClothMade
     - WhitelistChameleon
+
+- type: entity
+  abstract: true
+  parent: ClothingNeckBase
+  id: ClothingScarfBase
+  components:
+  - type: Tag
+    tags:
+    - Scarf
+    - ClothMade
+    - WhitelistChameleon
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
index 0054a3645c7..eb948d299c1 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
@@ -3,7 +3,7 @@
   id: ClothingNeckPinBase
   abstract: true
   name: pin
-  description: be nothing do crime
+  description: Be nothing do crime.
   components:
   - type: Item
     size: Tiny
@@ -12,7 +12,7 @@
   parent: ClothingNeckPinBase
   id: ClothingNeckLGBTPin
   name: LGBT pin
-  description: be gay do crime
+  description: Be gay do crime.
   components:
   - type: Sprite
     sprite: Clothing/Neck/Misc/pins.rsi
@@ -28,7 +28,7 @@
   parent: ClothingNeckPinBase
   id: ClothingNeckAromanticPin
   name: aromantic pin
-  description: be aro do crime
+  description: Be aro do crime.
   components:
   - type: Sprite
     sprite: Clothing/Neck/Misc/pins.rsi
@@ -44,7 +44,7 @@
   parent: ClothingNeckPinBase
   id: ClothingNeckAsexualPin
   name: asexual pin
-  description: be ace do crime
+  description: Be ace do crime.
   components:
   - type: Sprite
     sprite: Clothing/Neck/Misc/pins.rsi
@@ -60,7 +60,7 @@
   parent: ClothingNeckPinBase
   id: ClothingNeckBisexualPin
   name: bisexual pin
-  description: be bi do crime
+  description: Be bi do crime.
   components:
   - type: Sprite
     sprite: Clothing/Neck/Misc/pins.rsi
@@ -76,7 +76,7 @@
   parent: ClothingNeckPinBase
   id: ClothingNeckIntersexPin
   name: intersex pin
-  description: be intersex do crime
+  description: Be intersex do crime.
   components:
   - type: Sprite
     sprite: Clothing/Neck/Misc/pins.rsi
@@ -92,7 +92,7 @@
   parent: ClothingNeckPinBase
   id: ClothingNeckLesbianPin
   name: lesbian pin
-  description: be lesbian do crime
+  description: Be lesbian do crime.
   components:
   - type: Sprite
     sprite: Clothing/Neck/Misc/pins.rsi
@@ -124,7 +124,7 @@
   parent: ClothingNeckPinBase
   id: ClothingNeckPansexualPin
   name: pansexual pin
-  description: be pan do crime
+  description: Be pan do crime.
   components:
   - type: Sprite
     sprite: Clothing/Neck/Misc/pins.rsi
@@ -140,7 +140,7 @@
   parent: ClothingNeckPinBase
   id: ClothingNeckTransPin
   name: transgender pin
-  description: be trans do crime
+  description: Be trans do crime.
   components:
   - type: Sprite
     sprite: Clothing/Neck/Misc/pins.rsi
@@ -156,7 +156,7 @@
   parent: ClothingNeckPinBase
   id: ClothingNeckAutismPin
   name: autism pin
-  description: be autism do crime
+  description: Be autism do crime.
   components:
   - type: Sprite
     sprite: Clothing/Neck/Misc/autismpin.rsi
@@ -172,7 +172,7 @@
   parent: ClothingNeckPinBase
   id: ClothingNeckGoldAutismPin
   name: golden autism pin
-  description: be autism do warcrime
+  description: Be autism do warcrime.
   components:
   - type: Sprite
     sprite: Clothing/Neck/Misc/goldautismpin.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml b/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml
index 33f582d30de..f8c9f1fc9d9 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: ClothingNeckBase
+  parent: ClothingScarfBase
   id: ClothingNeckScarfStripedRed
   name: striped red scarf
   description: A stylish striped red scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
@@ -10,7 +10,7 @@
     sprite: Clothing/Neck/Scarfs/red.rsi
 
 - type: entity
-  parent: ClothingNeckBase
+  parent: ClothingScarfBase
   id: ClothingNeckScarfStripedBlue
   name: striped blue scarf
   description: A stylish striped blue scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
@@ -21,7 +21,7 @@
     sprite: Clothing/Neck/Scarfs/blue.rsi
 
 - type: entity
-  parent: ClothingNeckBase
+  parent: ClothingScarfBase
   id: ClothingNeckScarfStripedGreen
   name: striped green scarf
   description: A stylish striped green scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
@@ -32,7 +32,7 @@
     sprite: Clothing/Neck/Scarfs/green.rsi
 
 - type: entity
-  parent: ClothingNeckBase
+  parent: ClothingScarfBase
   id: ClothingNeckScarfStripedBlack
   name: striped black scarf
   description: A stylish striped black scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
@@ -43,7 +43,7 @@
       sprite: Clothing/Neck/Scarfs/black.rsi
 
 - type: entity
-  parent: ClothingNeckBase
+  parent: ClothingScarfBase
   id: ClothingNeckScarfStripedBrown
   name: striped brown scarf
   description: A stylish striped brown scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
@@ -54,7 +54,7 @@
       sprite: Clothing/Neck/Scarfs/brown.rsi
 
 - type: entity
-  parent: ClothingNeckBase
+  parent: ClothingScarfBase
   id: ClothingNeckScarfStripedLightBlue
   name: striped light blue scarf
   description: A stylish striped light blue scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
@@ -65,7 +65,7 @@
       sprite: Clothing/Neck/Scarfs/lightblue.rsi
 
 - type: entity
-  parent: ClothingNeckBase
+  parent: ClothingScarfBase
   id: ClothingNeckScarfStripedOrange
   name: striped orange scarf
   description: A stylish striped orange scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
@@ -76,7 +76,7 @@
       sprite: Clothing/Neck/Scarfs/orange.rsi
 
 - type: entity
-  parent: ClothingNeckBase
+  parent: ClothingScarfBase
   id: ClothingNeckScarfStripedPurple
   name: striped purple scarf
   description: A stylish striped purple scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
@@ -87,7 +87,7 @@
       sprite: Clothing/Neck/Scarfs/purple.rsi
 
 - type: entity
-  parent: ClothingNeckBase
+  parent: ClothingScarfBase
   id: ClothingNeckScarfStripedSyndieGreen
   name: striped syndicate green scarf
   description: A stylish striped syndicate green scarf. The perfect winter accessory for those with a keen fashion sense, and those who are in the mood to steal something.
@@ -98,7 +98,7 @@
       sprite: Clothing/Neck/Scarfs/syndiegreen.rsi
 
 - type: entity
-  parent: ClothingNeckBase
+  parent: ClothingScarfBase
   id: ClothingNeckScarfStripedSyndieRed
   name: striped syndicate red scarf
   description: A stylish striped syndicate red scarf. The perfect winter accessory for those with a keen fashion sense, and those who are in the mood to steal something.
@@ -109,10 +109,10 @@
       sprite: Clothing/Neck/Scarfs/syndiered.rsi
 
 - type: entity
-  parent: ClothingNeckBase
+  parent: ClothingScarfBase
   id: ClothingNeckScarfStripedCentcom
-  name: striped CentCom scarf
-  description: A stylish striped centcom colored scarf. The perfect winter accessory for those with a keen fashion sense, and those who need to do paperwork in the cold.
+  name: striped CentComm scarf
+  description: A stylish striped centcomm colored scarf. The perfect winter accessory for those with a keen fashion sense, and those who need to do paperwork in the cold.
   components:
     - type: Sprite
       sprite: Clothing/Neck/Scarfs/centcom.rsi
@@ -120,7 +120,7 @@
       sprite: Clothing/Neck/Scarfs/centcom.rsi
 
 - type: entity
-  parent: ClothingNeckBase
+  parent: ClothingScarfBase
   id: ClothingNeckScarfStripedZebra
   name: zebra scarf
   description: A striped scarf, a mandatory accessory for artists.
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/specific.yml b/Resources/Prototypes/Entities/Clothing/Neck/specific.yml
index 56fddceaad6..b98cdd02e0c 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/specific.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: ClothingNeckBase
   id: ClothingNeckChameleon
   name: striped red scarf
@@ -12,7 +12,7 @@
     - type: Clothing
       sprite: Clothing/Neck/Scarfs/red.rsi
     - type: ChameleonClothing
-      slot: [neck]
+      slot: [NECK]
       default: ClothingNeckScarfStripedRed
     - type: UserInterface
       interfaces:
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
index 606af0b127a..413a41473bc 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -99,6 +99,78 @@
     reflects:
       - Energy
 
+- type: entity
+  parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing]
+  id: ClothingOuterArmorRaid
+  name: syndicate raid suit
+  description: A somewhat flexible and well-armored suit with a powerful shoulder mounted flashlight manufactured in the Gorlex Marauder's iconic blood-red color scheme, it does not protect its wearer from space.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Armor/syndie-raid.rsi
+    layers:
+    - state: icon
+    - state: light-overlay
+      visible: false
+      shader: unshaded
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Armor/syndie-raid.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.35
+        Slash: 0.35
+        Piercing: 0.35
+        Heat: 0.35
+        Caustic: 0.5
+  - type: ExplosionResistance
+    damageCoefficient: 0.35
+  - type: ClothingSpeedModifier
+    walkModifier: 0.9
+    sprintModifier: 0.9
+  #Shoulder mounted flashlight
+  - type: ToggleableLightVisuals
+    spriteLayer: light
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-OUTERCLOTHING-light
+        shader: unshaded
+  - type: Appearance
+  - type: HandheldLight
+    addPrefix: false
+    blinkingBehaviourId: blinking
+    radiatingBehaviourId: radiating
+  - type: PointLight
+    enabled: false
+    color: "#80ff80"
+    radius: 5
+    energy: 2
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
+    netsync: false
+  - type: LightBehaviour
+    behaviours:
+      - !type:FadeBehaviour
+        id: radiating
+        interpolate: Linear
+        maxDuration: 2.0
+        startValue: 3.0
+        endValue: 2.0
+        isLooped: true
+        reverseWhenFinished: true
+      - !type:PulseBehaviour
+        id: blinking
+        interpolate: Nearest
+        maxDuration: 1.0
+        minValue: 0.1
+        maxValue: 2.0
+        isLooped: true
+  - type: Battery
+    maxCharge: 600
+    startingCharge: 600
+  - type: BatterySelfRecharger
+    autoRecharge: true
+    autoRechargeRate: 2
+
 - type: entity
   parent: ClothingOuterBaseLarge
   id: ClothingOuterArmorCult
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
index 2b0e52bf7b3..6e8c562e4b2 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
@@ -137,6 +137,11 @@
     - HidesHarpyWings #DeltaV: Used by harpies to help render their hardsuit sprites
   - type: ClothingRequiredStepTriggerImmune
     slots: WITHOUT_POCKET
+  - type: DamageOnInteractProtection
+    damageProtection:
+      flatReductions:
+        Heat: 10 # the average lightbulb only does around four damage!
+    slots: OUTERCLOTHING
 
 - type: entity
   abstract: true
@@ -160,6 +165,11 @@
     - HidesHarpyWings #DeltaV: Used by harpies to help render their hardsuit sprites
   - type: ClothingRequiredStepTriggerImmune
     slots: WITHOUT_POCKET
+  - type: DamageOnInteractProtection
+    damageProtection:
+      flatReductions:
+        Heat: 10 # the average lightbulb only does around four damage!
+    slots: OUTERCLOTHING
 
 - type: entity
   parent: ClothingOuterBase
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
index 1164c2f73b1..beae6f8ef13 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
@@ -31,6 +31,15 @@
         Piercing: 0.70
         Heat: 0.80
 
+- type: entity
+  parent: ClothingOuterCoatDetective
+  id: ClothingOuterCoatDetectiveLoadout
+  components:
+  - type: StorageFill
+    contents:
+    - id: SmokingPipeFilledTobacco
+    - id: FlippoLighter #Not the steal objective, only difference from normal detective trenchcoat
+
 - type: entity
   parent: ClothingOuterStorageBase
   id: ClothingOuterCoatGentle
@@ -218,7 +227,7 @@
   parent: ClothingOuterStorageFoldableBase
   id: ClothingOuterCoatLabCmo
   name: chief medical officer's lab coat
-  description: Custom made blue lab coat for the Chief Medical Officer, offers improved protection against chemical spills and minor cuts
+  description: Custom made blue lab coat for the Chief Medical Officer, offers improved protection against chemical spills and minor cuts.
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/Coats/labcoat_cmo.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
index c79ea484d7b..baa933768ac 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -566,7 +566,7 @@
     size: Huge
   - type: ClothingSpeedModifier
     walkModifier: 1.0
-    sprintModifier: 1.0
+    sprintModifier: 0.9
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitSyndieElite
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
index 9db1ea2216c..c61d09ee219 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
@@ -78,7 +78,7 @@
   parent: ClothingOuterEVASuitBase
   id: ClothingOuterHardsuitAncientEVA
   name: NTSRA voidsuit #Nanotrasen Space Research Association
-  description: An ancient space suit, designed by the NTSRA branch of CentCom. It is very finely crafted, allowing for greater mobility than most modern space suits.
+  description: An ancient space suit, designed by the NTSRA branch of CentComm. It is very finely crafted, allowing for greater mobility than most modern space suits.
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/Suits/ancient_voidsuit.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
index 79c116b3cad..1d5fbb01191 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -113,7 +113,7 @@
     modifiers:
       coefficients:
         Heat: 0.90
-        Radiation: 0.001
+        Radiation: 0.01
   - type: Clothing
     sprite: Clothing/OuterClothing/Suits/rad.rsi
   - type: GroupExamine
@@ -127,7 +127,7 @@
     slots: WITHOUT_POCKET
 
 - type: entity
-  parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing]
+  parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseToggleClothing]
   id: ClothingOuterSuitSpaceNinja
   name: space ninja suit
   description: This black technologically advanced, cybernetically-enhanced suit provides many abilities like invisibility or teleportation.
@@ -136,9 +136,7 @@
     sprite: Clothing/OuterClothing/Suits/spaceninja.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Suits/spaceninja.rsi
-  - type: StealthClothing
-    visibility: 1.1
-    toggleAction: ActionTogglePhaseCloak
+  # hardsuit stuff
   - type: PressureProtection
     highPressureMultiplier: 0.6
     lowPressureMultiplier: 1000
@@ -151,7 +149,27 @@
         Slash: 0.8
         Piercing: 0.8
         Heat: 0.8
+  # phase cloak
+  - type: ToggleClothing
+    action: ActionTogglePhaseCloak
+  - type: ComponentToggler
+    parent: true
+    components:
+    - type: Stealth
+      minVisibility: 0.1
+      lastVisibility: 0.1
+  - type: PowerCellDraw
+    drawRate: 1.8 # 200 seconds on the default cell
+  # throwing star ability
+  - type: ItemCreator
+    action: ActionCreateThrowingStar
+    charge: 14.4
+    spawnedPrototype: ThrowingStarNinja
+    noPowerPopup: ninja-no-power
+  # core ninja suit stuff
   - type: NinjaSuit
+  - type: UseDelay
+    delay: 5 # disable time
   - type: PowerCellSlot
     cellSlotId: cell_slot
     # throwing in a recharger would bypass glove charging mechanic
@@ -246,6 +264,7 @@
   name: carp suit
   description: A special suit that makes you look just like a space carp, if your eyesight is bad.
   components:
+  - type: AllowSuitStorage
   - type: Sprite
     sprite: Clothing/OuterClothing/Suits/carpsuit.rsi
   - type: Item
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
index 74b6ec74fb5..1fd46e8e763 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
@@ -78,3 +78,15 @@
     sprite: Clothing/OuterClothing/Vests/vest.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Vests/vest.rsi
+
+#Tank Harness
+- type: entity
+  parent: [ClothingOuterBase, AllowSuitStorageClothingGasTanks]
+  id: ClothingOuterVestTank
+  name: tank harness
+  description: A simple harness that can hold a gas tank.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Vests/tankharness.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Vests/tankharness.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
index cd502a8f781..b0d211aef0e 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -38,7 +38,7 @@
   parent: ClothingOuterWinterCoat
   id: ClothingOuterWinterCoatToggleable
   name: winter coat with hood
-  noSpawn: True
+  categories: [ HideSpawnMenu ]
   components:
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterDefault
@@ -55,9 +55,20 @@
   name: atmospherics winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatatmos.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: ATMOS-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: ATMOS-inhand-left
+      right:
+      - state: ATMOS-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatatmos.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: ATMOS-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterEngineer
 
@@ -67,9 +78,20 @@
   name: bartender winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatbar.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: BAR-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: BAR-inhand-left
+      right:
+      - state: BAR-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatbar.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: BAR-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterBartender
 
@@ -79,9 +101,20 @@
   name: captain's winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatcap.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: CAP-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: CAP-inhand-left
+      right:
+      - state: CAP-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatcap.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: CAP-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterCaptain
   - type: Armor # DeltaV - adds resists to coat, same as HoS coat. Still better than nothing, but nowhere as good as a carapace
@@ -98,9 +131,20 @@
   name: logistics winter coat # DeltaV - Logistics Department replacing Cargo
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatcargo.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: CARGO-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: CARGO-inhand-left
+      right:
+      - state: CARGO-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatcargo.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: CARGO-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterCargo
 
@@ -110,21 +154,43 @@
   name: chief engineer's winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatce.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: CE-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: CE-inhand-left
+      right:
+      - state: CE-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatce.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: CE-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterCE
 
 - type: entity
   parent: ClothingOuterWinterCoatToggleable
   id: ClothingOuterWinterCentcom
-  name: CentCom winter coat
+  name: CentComm winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatcentcom.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: CENTCOM-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: CENTCOM-inhand-left
+      right:
+      - state: CENTCOM-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatcentcom.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: CENTCOM-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterCentcom
 
@@ -135,9 +201,20 @@
   description: A coat specifically designed for work inside cold storage, sorely needed by cold-blooded lizard chefs.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatchef.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: CHEF-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: CHEF-inhand-left
+      right:
+      - state: CHEF-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatchef.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: CHEF-equipped-OUTERCLOTHING
 
 - type: entity
   parent: ClothingOuterWinterCoatToggleable
@@ -145,9 +222,20 @@
   name: chemistry winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatchem.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: CHEM-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: CHEM-inhand-left
+      right:
+      - state: CHEM-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatchem.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: CHEM-equipped-OUTERCLOTHING
   - type: Armor
     modifiers:
       coefficients:
@@ -164,9 +252,20 @@
   name: chief medical officer's winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatcmo.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: CMO-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: CMO-inhand-left
+      right:
+      - state: CMO-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatcmo.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: CMO-equipped-OUTERCLOTHING
   - type: Armor
     modifiers:
       coefficients:
@@ -193,9 +292,20 @@
   name: engineering winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatengi.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: ENGI-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: ENGI-inhand-left
+      right:
+      - state: ENGI-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatengi.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: ENGI-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterEngineer
 
@@ -205,9 +315,20 @@
   name: genetics winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatgen.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: GENE-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: GENE-inhand-left
+      right:
+      - state: GENE-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatgen.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: GENE-equipped-OUTERCLOTHING
   - type: Armor
     modifiers:
       coefficients:
@@ -224,12 +345,25 @@
   name: head of personnel's winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coathop.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: HOP-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: HOP-inhand-left
+      right:
+      - state: HOP-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coathop.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: HOP-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterHOP
 
+
+##########################################################
 - type: entity
   parent: [ClothingOuterArmorHoS, ClothingOuterWinterCoatToggleable]
   id: ClothingOuterWinterHoS
@@ -242,6 +376,7 @@
     sprite: Clothing/OuterClothing/WinterCoats/coathosarmored.rsi
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterHOS
+##########################################################
 
 - type: entity
   parent: ClothingOuterWinterCoatToggleable
@@ -250,9 +385,20 @@
   description: A sturdy coat, a warm coat, but not an armored coat.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coathos.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: HOS-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: HOS-inhand-left
+      right:
+      - state: HOS-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coathos.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: HOS-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterHOS
   - type: Armor # DeltaV - adds resists to coat. As good as Cap's, but I don't know why you'd wear this over a trench coat
@@ -269,9 +415,20 @@
   name: hydroponics winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coathydro.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: HYDRO-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: HYDRO-inhand-left
+      right:
+      - state: HYDRO-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coathydro.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: HYDRO-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterHydro
 
@@ -281,9 +438,20 @@
   name: janitorial winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatjani.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: JANI-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: JANI-inhand-left
+      right:
+      - state: CHEF-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatjani.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: JANI-equipped-OUTERCLOTHING
   - type: Armor
     modifiers:
       coefficients:
@@ -300,9 +468,20 @@
   name: medical winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatmed.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: MED-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: MED-inhand-left
+      right:
+      - state: MED-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatmed.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: MED-equipped-OUTERCLOTHING
   - type: Armor
     modifiers:
       coefficients:
@@ -319,9 +498,20 @@
   name: mime winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatmime.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: MIME-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: MIME-inhand-left
+      right:
+      - state: MIME-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatmime.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: MIME-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterMime
 
@@ -331,9 +521,20 @@
   name: mining winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatminer.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: MINER-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: MINER-inhand-left
+      right:
+      - state: MINER-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatminer.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: MINER-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterMiner
 
@@ -343,9 +544,20 @@
   name: paramedic winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatparamed.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: PARA-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: PARA-inhand-left
+      right:
+      - state: PARA-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatparamed.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: PARA-equipped-OUTERCLOTHING
   - type: Armor
     modifiers:
       coefficients:
@@ -362,9 +574,20 @@
   name: logistics officer's winter coat # DeltaV - Logistics Department replacing Cargo
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatqm.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: QM-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: QM-inhand-left
+      right:
+      - state: QM-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatqm.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: QM-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterQM
 
@@ -375,9 +598,20 @@
   name: mystagogue's winter coat # DeltaV - Epistemics Department replacing Science
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatrd.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: RD-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: RD-inhand-left
+      right:
+      - state: RD-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatrd.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: RD-equipped-OUTERCLOTHING
   - type: Armor
     modifiers:
       coefficients:
@@ -394,9 +628,20 @@
   name: robotics winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatrobo.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: ROBO-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: ROBO-inhand-left
+      right:
+      - state: ROBO-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatrobo.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: ROBO-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterRobo
 
@@ -407,9 +652,20 @@
   name: epistemics winter coat # DeltaV - Epistemics Department replacing Science
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatsci.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: SCI-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: SCI-inhand-left
+      right:
+      - state: SCI-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatsci.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: SCI-equipped-OUTERCLOTHING
   - type: Armor
     modifiers:
       coefficients:
@@ -426,9 +682,20 @@
   name: security winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatsec.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: SEC-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: SEC-inhand-left
+      right:
+      - state: SEC-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatsec.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: SEC-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterSec
   - type: Armor # DeltaV - adds resists to coat
@@ -445,9 +712,20 @@
   name: virology winter coat
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatviro.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: VIRO-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: VIRO-inhand-left
+      right:
+      - state: VIRO-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatviro.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: VIRO-equipped-OUTERCLOTHING
   - type: Armor
     modifiers:
       coefficients:
@@ -458,6 +736,7 @@
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterSci
 
+################################################################
 - type: entity
   parent: [ClothingOuterArmorWarden, ClothingOuterWinterCoatToggleable]
   id: ClothingOuterWinterWarden
@@ -470,6 +749,7 @@
     sprite: Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterWarden
+################################################################
 
 - type: entity
   parent: ClothingOuterWinterCoatToggleable
@@ -478,9 +758,20 @@
   description: A sturdy coat, a warm coat, but not an armored coat.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatwarden.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: WARD-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: WARD-inhand-left
+      right:
+      - state: WARD-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatwarden.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: WARD-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterWarden
 
@@ -491,12 +782,24 @@
   description: "The syndicate's winter coat is made of durable fabric, with gilded patterns, and coarse wool."
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: SYNDIECAP-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: SYNDIECAP-inhand-left
+      right:
+      - state: SYNDIECAP-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: SYNDIECAP-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterSyndie
 
+##############################################################
 - type: entity
   parent: ClothingOuterWinterWarden
   id: ClothingOuterWinterSyndieCapArmored
@@ -509,17 +812,29 @@
     sprite: Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecaparmored.rsi
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterSyndie
+##############################################################
 
 - type: entity
   parent: ClothingOuterWinterCoatToggleable
   id: ClothingOuterWinterSyndie
   name: syndicate's winter coat
-  description: Insulated winter coat, looks like a merch from "Syndieland"
+  description: Insulated winter coat, looks like a merch from "Syndieland".
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: SYNDIE-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: SYNDIE-inhand-left
+      right:
+      - state: SYNDIE-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: SYNDIE-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterSyndie
 
@@ -541,9 +856,20 @@
   description: Feels like the inside of a cocoon, not that this would make you less afraid of being in one.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/WinterCoats/coatweb.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: WEB-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: WEB-inhand-left
+      right:
+      - state: WEB-inhand-right
   - type: Clothing
-    sprite: Clothing/OuterClothing/WinterCoats/coatweb.rsi
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: WEB-equipped-OUTERCLOTHING
   - type: Construction
     graph: WebObjects
     node: coat
@@ -561,3 +887,344 @@
           Quantity: 20
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterWeb
+
+- type: entity
+  parent: ClothingOuterWinterCoatToggleable
+  id: ClothingOuterWinterColorBlack
+  name: black winter coat
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#3f3f3f"
+    - state: winterbits-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: coatybits-inhand-left
+        color: "#3f3f3f"
+      - state: winterbits-inhand-left
+      right:
+      - state: coatybits-inhand-right
+        color: "#3f3f3f"
+      - state: winterbits-inhand-right
+  - type: Clothing
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: coatybits-equipped-OUTERCLOTHING
+        color: "#1d1d1d"
+      - state: winterbits-equipped-OUTERCLOTHING
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodWinterColorBlack
+
+- type: entity
+  parent: ClothingOuterWinterCoatToggleable
+  id: ClothingOuterWinterColorPurple
+  name: purple winter coat
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#9C0DE1"
+    - state: winterbits-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: coatybits-inhand-left
+        color: "#9C0DE1"
+      - state: winterbits-inhand-left
+      right:
+      - state: coatybits-inhand-right
+        color: "#9C0DE1"
+      - state: winterbits-inhand-right
+  - type: Clothing
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: coatybits-equipped-OUTERCLOTHING
+        color: "#9C0DE1"
+      - state: winterbits-equipped-OUTERCLOTHING
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodWinterColorPurple
+
+- type: entity
+  parent: ClothingOuterWinterCoatToggleable
+  id: ClothingOuterWinterColorRed
+  name: red winter coat
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#940000"
+    - state: winterbits-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: coatybits-inhand-left
+        color: "#940000"
+      - state: winterbits-inhand-left
+      right:
+      - state: coatybits-inhand-right
+        color: "#940000"
+      - state: winterbits-inhand-right
+  - type: Clothing
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: coatybits-equipped-OUTERCLOTHING
+        color: "#940000"
+      - state: winterbits-equipped-OUTERCLOTHING
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodWinterColorRed
+
+- type: entity
+  parent: ClothingOuterWinterCoatToggleable
+  id: ClothingOuterWinterColorBlue
+  name: blue winter coat
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#0089EF"
+    - state: winterbits-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: coatybits-inhand-left
+        color: "#0089EF"
+      - state: winterbits-inhand-left
+      right:
+      - state: coatybits-inhand-right
+        color: "#0089EF"
+      - state: winterbits-inhand-right
+  - type: Clothing
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: coatybits-equipped-OUTERCLOTHING
+        color: "#0089EF"
+      - state: winterbits-equipped-OUTERCLOTHING
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodWinterColorBlue
+
+- type: entity
+  parent: ClothingOuterWinterCoatToggleable
+  id: ClothingOuterWinterColorBrown
+  name: brown winter coat
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#723A02"
+    - state: winterbits-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: coatybits-inhand-left
+        color: "#723A02"
+      - state: winterbits-inhand-left
+      right:
+      - state: coatybits-inhand-right
+        color: "#723A02"
+      - state: winterbits-inhand-right
+  - type: Clothing
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: coatybits-equipped-OUTERCLOTHING
+        color: "#723A02"
+      - state: winterbits-equipped-OUTERCLOTHING
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodWinterColorBrown
+
+- type: entity
+  parent: ClothingOuterWinterCoatToggleable
+  id: ClothingOuterWinterColorGray
+  name: gray winter coat
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#999999"
+    - state: winterbits-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: coatybits-inhand-left
+        color: "#999999"
+      - state: winterbits-inhand-left
+      right:
+      - state: coatybits-inhand-right
+        color: "#999999"
+      - state: winterbits-inhand-right
+  - type: Clothing
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: coatybits-equipped-OUTERCLOTHING
+        color: "#999999"
+      - state: winterbits-equipped-OUTERCLOTHING
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodWinterColorGray
+
+- type: entity
+  parent: ClothingOuterWinterCoatToggleable
+  id: ClothingOuterWinterColorGreen
+  name: green winter coat
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#5ABF2F"
+    - state: winterbits-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: coatybits-inhand-left
+        color: "#5ABF2F"
+      - state: winterbits-inhand-left
+      right:
+      - state: coatybits-inhand-right
+        color: "#5ABF2F"
+      - state: winterbits-inhand-right
+  - type: Clothing
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: coatybits-equipped-OUTERCLOTHING
+        color: "#5ABF2F"
+      - state: winterbits-equipped-OUTERCLOTHING
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodWinterColorGreen
+
+- type: entity
+  parent: ClothingOuterWinterCoatToggleable
+  id: ClothingOuterWinterColorLightBrown
+  name: light brown winter coat
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#C09F72"
+    - state: winterbits-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: coatybits-inhand-left
+        color: "#C09F72"
+      - state: winterbits-inhand-left
+      right:
+      - state: coatybits-inhand-right
+        color: "#C09F72"
+      - state: winterbits-inhand-right
+  - type: Clothing
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: coatybits-equipped-OUTERCLOTHING
+        color: "#C09F72"
+      - state: winterbits-equipped-OUTERCLOTHING
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodWinterColorLightBrown
+
+- type: entity
+  parent: ClothingOuterWinterCoatToggleable
+  id: ClothingOuterWinterColorOrange
+  name: orange winter coat
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#EF8100"
+    - state: winterbits-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: coatybits-inhand-left
+        color: "#EF8100"
+      - state: winterbits-inhand-left
+      right:
+      - state: coatybits-inhand-right
+        color: "#EF8100"
+      - state: winterbits-inhand-right
+  - type: Clothing
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: coatybits-equipped-OUTERCLOTHING
+        color: "#EF8100"
+      - state: winterbits-equipped-OUTERCLOTHING
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodWinterColorOrange
+
+- type: entity
+  parent: ClothingOuterWinterCoatToggleable
+  id: ClothingOuterWinterColorWhite
+  name: white winter coat
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#EAE8E8"
+    - state: winterbits-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: coatybits-inhand-left
+        color: "#EAE8E8"
+      - state: winterbits-inhand-left
+      right:
+      - state: coatybits-inhand-right
+        color: "#EAE8E8"
+      - state: winterbits-inhand-right
+  - type: Clothing
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: coatybits-equipped-OUTERCLOTHING
+        color: "#EAE8E8"
+      - state: winterbits-equipped-OUTERCLOTHING
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodWinterColorWhite
+
+- type: entity
+  parent: ClothingOuterWinterCoatToggleable
+  id: ClothingOuterWinterColorYellow
+  name: yellow winter coat
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    layers:
+    - state: coatybits-icon
+      color: "#EBE216"
+    - state: winterbits-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: coatybits-inhand-left
+        color: "#EBE216"
+      - state: winterbits-inhand-left
+      right:
+      - state: coatybits-inhand-right
+        color: "#EBE216"
+      - state: winterbits-inhand-right
+  - type: Clothing
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: coatybits-equipped-OUTERCLOTHING
+        color: "#EBE216"
+      - state: winterbits-equipped-OUTERCLOTHING
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodWinterColorYellow
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
index a0f56966bb5..d096ee3ff17 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
@@ -52,6 +52,16 @@
           - Knife
           - Sidearm
 
+- type: entity
+  abstract: true
+  id: ClothingShoesBootsSecFilled
+  suffix: Filled
+  components:
+  - type: ContainerFill
+    containers:
+      item:
+      - CombatKnife
+
 - type: entity
   abstract: true
   parent: ClothingShoesBaseButcherable
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
index fdc49dc0616..dc7453651ee 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
@@ -143,7 +143,7 @@
     sprite: Clothing/Shoes/Boots/winterbootssci.rsi
 
 - type: entity
-  parent: ClothingShoesBaseWinterBoots
+  parent: [ClothingShoesBaseWinterBoots, ClothingShoesMilitaryBase]
   id: ClothingShoesBootsWinterSec
   name: security winter boots
   components:
@@ -156,7 +156,7 @@
   parent: ClothingShoesBaseWinterBoots
   id: ClothingShoesBootsWinterSyndicate
   name: syndicate's winter boots
-  description: Durable heavy boots, looks like merch from "Syndieland"
+  description: Durable heavy boots, looks like merch from "Syndieland".
   components:
   - type: Sprite
     sprite: Clothing/Shoes/Boots/winterbootssyndicate.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
index 80a9159c722..6b66fac5643 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
@@ -1,37 +1,43 @@
 - type: entity
-  parent: ClothingShoesBase
+  parent: [ClothingShoesBase, BaseToggleClothing]
   id: ClothingShoesBootsMag
   name: magboots
   description: Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle.
   components:
-    - type: Sprite
-      sprite: Clothing/Shoes/Boots/magboots.rsi
-      layers:
-      - state: icon
-        map: [ "enum.ToggleVisuals.Layer" ]
-    - type: Clothing
-      sprite: Clothing/Shoes/Boots/magboots.rsi
-    - type: Magboots
-    - type: ClothingSpeedModifier
-      walkModifier: 0.85
-      sprintModifier: 0.8
-      enabled: false
-    - type: Appearance
-    - type: GenericVisualizer
-      visuals:
-        enum.ToggleVisuals.Toggled:
-          enum.ToggleVisuals.Layer:
-            True: {state: icon-on}
-            False: {state: icon}
-    - type: StaticPrice
-      price: 200
-    - type: Tag
-      tags:
-      - WhitelistChameleon
-    - type: ReverseEngineering # delta
-      difficulty: 2
-      recipes:
-        - ClothingShoesBootsMagSci
+  - type: Sprite
+    sprite: Clothing/Shoes/Boots/magboots.rsi
+    layers:
+    - state: icon
+      map: [ "enum.ToggleVisuals.Layer" ]
+  - type: Clothing
+    sprite: Clothing/Shoes/Boots/magboots.rsi
+  - type: ToggleClothing
+    action: ActionToggleMagboots
+  - type: ToggleVerb
+    text: toggle-magboots-verb-get-data-text
+  - type: ComponentToggler
+    components:
+    - type: NoSlip
+  - type: Magboots
+  - type: ClothingSpeedModifier
+    walkModifier: 0.85
+    sprintModifier: 0.8
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.ToggleVisuals.Toggled:
+        enum.ToggleVisuals.Layer:
+          True: {state: icon-on}
+          False: {state: icon}
+  - type: StaticPrice
+    price: 200
+  - type: Tag
+    tags:
+    - WhitelistChameleon
+  - type: ReverseEngineering # DeltaV
+    difficulty: 2
+    recipes:
+    - ClothingShoesBootsMagSci
 
 - type: entity
   parent: ClothingShoesBootsMag
@@ -44,13 +50,9 @@
     state: icon
   - type: Clothing
     sprite: Clothing/Shoes/Boots/magboots-advanced.rsi
-  - type: Magboots
-    toggleAction: ActionToggleMagbootsAdvanced
   - type: ClothingSpeedModifier
     walkModifier: 1
     sprintModifier: 1
-    enabled: false
-  - type: NoSlip
   - type: Tag
     tags:
     - WhitelistChameleon
@@ -68,8 +70,6 @@
     sprite: Clothing/Shoes/Boots/magboots-science.rsi
   - type: Clothing
     sprite: Clothing/Shoes/Boots/magboots-science.rsi
-  - type: Magboots
-    toggleAction: ActionToggleMagbootsSci
 
 - type: entity
   parent: ClothingShoesBootsMag
@@ -80,7 +80,6 @@
   - type: ClothingSpeedModifier
     walkModifier: 1.10 #PVS isn't too much of an issue when you are blind...
     sprintModifier: 1.10
-    enabled: false
   - type: StaticPrice
     price: 3000
 
@@ -88,19 +87,16 @@
   parent: [ClothingShoesBootsMag, BaseJetpack]
   id: ClothingShoesBootsMagSyndie
   name: blood-red magboots
-  description: Reverse-engineered magnetic boots that have a heavy magnetic pull and integrated thrusters.
+  description: Reverse-engineered magnetic boots that have a heavy magnetic pull and integrated thrusters. It can hold 0.75 L of gas.
   components:
   - type: Sprite
     sprite: Clothing/Shoes/Boots/magboots-syndicate.rsi
     state: icon
   - type: Clothing
     sprite: Clothing/Shoes/Boots/magboots-syndicate.rsi
-  - type: Magboots
-    toggleAction: ActionToggleMagbootsSyndie
   - type: ClothingSpeedModifier
     walkModifier: 0.95
     sprintModifier: 0.9
-    enabled: false
   - type: GasTank
     outputPressure: 42.6
     air:
@@ -108,49 +104,17 @@
       volume: 0.75
       temperature: 293.15
       moles:
-        - 0.153853429 # oxygen
-        - 0.153853429 # nitrogen
+      - 0.153853429 # oxygen
+      - 0.153853429 # nitrogen
   - type: Item
     sprite: null
     size: Normal
 
 - type: entity
-  id: ActionBaseToggleMagboots
+  id: ActionToggleMagboots
   name: Toggle Magboots
   description: Toggles the magboots on and off.
   components:
   - type: InstantAction
-    itemIconStyle: NoItem
-    event: !type:ToggleMagbootsEvent
-
-- type: entity
-  id: ActionToggleMagboots
-  parent: ActionBaseToggleMagboots
-  components:
-  - type: InstantAction
-    icon: { sprite: Clothing/Shoes/Boots/magboots.rsi, state: icon }
-    iconOn: { sprite : Clothing/Shoes/Boots/magboots.rsi, state: icon-on }
-
-- type: entity
-  id: ActionToggleMagbootsAdvanced
-  parent: ActionBaseToggleMagboots
-  components:
-  - type: InstantAction
-    icon: { sprite: Clothing/Shoes/Boots/magboots-advanced.rsi, state: icon }
-    iconOn: Clothing/Shoes/Boots/magboots-advanced.rsi/icon-on.png
-
-- type: entity
-  id: ActionToggleMagbootsSci
-  parent: ActionBaseToggleMagboots
-  components:
-  - type: InstantAction
-    icon: { sprite: Clothing/Shoes/Boots/magboots-science.rsi, state: icon }
-    iconOn: Clothing/Shoes/Boots/magboots-science.rsi/icon-on.png
-
-- type: entity
-  id: ActionToggleMagbootsSyndie
-  parent: ActionBaseToggleMagboots
-  components:
-  - type: InstantAction
-    icon: { sprite: Clothing/Shoes/Boots/magboots-syndicate.rsi, state: icon }
-    iconOn: Clothing/Shoes/Boots/magboots-syndicate.rsi/icon-on.png
+    itemIconStyle: BigItem
+    event: !type:ToggleActionEvent
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
index b7cbf1d053f..25331eb02a5 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
@@ -88,7 +88,7 @@
   - type: NoSlip
 
 - type: entity
-  parent: [ClothingShoesBase, PowerCellSlotSmallItem]
+  parent: [ClothingShoesBase, PowerCellSlotSmallItem, BaseToggleClothing]
   id: ClothingShoesBootsSpeed
   name: speed boots
   description: High-tech boots woven with quantum fibers, able to convert electricity into pure speed!
@@ -100,12 +100,11 @@
       map: [ "enum.ToggleVisuals.Layer" ]
   - type: Clothing
     sprite: Clothing/Shoes/Boots/speedboots.rsi
-  - type: ToggleClothingSpeed
-    toggleAction: ActionToggleSpeedBoots
+  - type: ToggleClothing
+    action: ActionToggleSpeedBoots
   - type: ClothingSpeedModifier
     walkModifier: 1.5
     sprintModifier: 1.5
-    enabled: false
   - type: Appearance
   - type: GenericVisualizer
     visuals:
@@ -134,10 +133,8 @@
   description: Toggles the speed boots on and off.
   components:
   - type: InstantAction
-    itemIconStyle: NoItem
-    event: !type:ToggleClothingSpeedEvent
-    icon: { sprite: Clothing/Shoes/Boots/speedboots.rsi, state: icon }
-    iconOn: { sprite: Clothing/Shoes/Boots/speedboots.rsi, state: icon-on }
+    itemIconStyle: BigItem
+    event: !type:ToggleActionEvent
 
 - type: entity
   parent: ClothingShoesBase
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
index 4ae752345a7..80d5eab249b 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
@@ -121,6 +121,7 @@
   - type: Clothing
     sprite: Clothing/Shoes/Specific/spaceninja.rsi
   - type: NoSlip
+  - type: Magboots # always have gravity because le suction cups
   - type: ClothingSpeedModifier
     # ninja are masters of sneaking around relatively quickly, won't break cloak
     walkModifier: 1.1
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
index f358249f960..83afd2d1bb5 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -439,7 +439,7 @@
   parent: ClothingUniformSkirtBase
   id: ClothingUniformJumpskirtCentcomFormalDress
   name: central command formal dress
-  description: A dress for special occasions
+  description: A dress for special occasions.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
index bd1f73d31f4..d412866a173 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -126,8 +126,8 @@
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitCentcomAgent
-  name: CentCom agent's jumpsuit
-  description: A suit worn by CentCom's legal team. Smells of burnt coffee.
+  name: CentComm agent's jumpsuit
+  description: A suit worn by CentComm's legal team. Smells of burnt coffee.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuit/centcom_agent.rsi
@@ -137,8 +137,8 @@
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitCentcomOfficial
-  name: CentCom official's jumpsuit
-  description: It's a jumpsuit worn by CentCom's officials.
+  name: CentComm official's jumpsuit
+  description: It's a jumpsuit worn by CentComm's officials.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuit/centcom_official.rsi
@@ -148,8 +148,8 @@
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitCentcomOfficer
-  name: CentCom officer's jumpsuit
-  description: It's a jumpsuit worn by CentCom Officers.
+  name: CentComm officer's jumpsuit
+  description: It's a jumpsuit worn by CentComm Officers.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuit/centcom_officer.rsi
@@ -210,10 +210,10 @@
     sprite: Clothing/Uniforms/Jumpsuit/clown.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/clown.rsi
-    femaleMask: UniformTop
   - type: Tag
     tags:
     - ClownSuit
+    - WhitelistChameleon
 
 - type: entity
   parent: ClothingUniformJumpsuitClown
@@ -224,7 +224,6 @@
     sprite: Clothing/Uniforms/Jumpsuit/clown_banana.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/clown_banana.rsi
-    femaleMask: UniformTop
   - type: Construction
     graph: BananaClownJumpsuit
     node: jumpsuit
@@ -411,7 +410,7 @@
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitKimono
   name: kimono
-  description: traditional chinese clothing
+  description: Traditional chinese clothing.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuit/kimono.rsi
@@ -951,7 +950,7 @@
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitERTEngineer
   name: ERT engineering uniform
-  description: A special suit made for the elite engineers under CentCom.
+  description: A special suit made for the elite engineers under CentComm.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuit/ert_engineer.rsi
@@ -962,7 +961,7 @@
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitERTJanitor
   name: ERT janitorial uniform
-  description: A special suit made for the elite janitors under CentCom.
+  description: A special suit made for the elite janitors under CentComm.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuit/ert_janitor.rsi
@@ -973,7 +972,7 @@
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitERTLeader
   name: ERT leader uniform
-  description: A special suit made for the best of the elites under CentCom.
+  description: A special suit made for the best of the elites under CentComm.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuit/ert_leader.rsi
@@ -984,7 +983,7 @@
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitERTMedic
   name: ERT medical uniform
-  description: A special suit made for the elite medics under CentCom.
+  description: A special suit made for the elite medics under CentComm.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuit/ert_medic.rsi
@@ -995,7 +994,7 @@
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitERTSecurity
   name: ERT security uniform
-  description: A special suit made for the elite security under CentCom.
+  description: A special suit made for the elite security under CentComm.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuit/ert_security.rsi
@@ -1043,7 +1042,7 @@
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitCossack
   name: cossack suit
-  description: the good old pants and brigantine.
+  description: The good old pants and brigantine.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuit/cossack.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/random_suit.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/random_suit.yml
index e113f0ffc76..7d4dfc59905 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/random_suit.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/random_suit.yml
@@ -19,8 +19,6 @@
     - state: mask_null
       map: [ "overlay" ]
   - type: Clothing
-    femaleMask: UniformTop
-    maleMask: UniformTop
     sprite: Clothing/Uniforms/procedural.rsi
     clothingVisuals:
       jumpsuit:
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml
index d6999a0a265..f10317e221b 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml
@@ -17,8 +17,8 @@
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitRecruitSyndie
-  name: syndicate recuit jumpsuit
-  description: A dubious,, dark-grey jumpsuit. As if passengers weren't dubious enough already.
+  name: syndicate recruit jumpsuit
+  description: A dubious, dark-grey jumpsuit. As if passengers weren't dubious enough already.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuit/recruit_syndie.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/base_clothing.yml b/Resources/Prototypes/Entities/Clothing/base_clothing.yml
index 55bc2fd3e6a..02a2ddce411 100644
--- a/Resources/Prototypes/Entities/Clothing/base_clothing.yml
+++ b/Resources/Prototypes/Entities/Clothing/base_clothing.yml
@@ -25,6 +25,15 @@
   components:
   - type: AllowSuitStorage
 
+- type: entity
+  abstract: true
+  id: AllowSuitStorageClothingGasTanks
+  components:
+  - type: AllowSuitStorage
+    whitelist:
+      tags:
+      - GasTank
+
 # for clothing that has a single item slot to insert and alt click out.
 # inheritors add a whitelisted slot named item
 - type: entity
@@ -48,3 +57,12 @@
   - type: GroupExamine
   - type: Armor
     modifiers: {}
+
+# for clothing that can be toggled, like magboots
+- type: entity
+  abstract: true
+  id: BaseToggleClothing
+  components:
+  - type: ItemToggle
+    onUse: false # can't really wear it like that
+  - type: ToggleClothing
diff --git a/Resources/Prototypes/Entities/Debugging/clicktest.yml b/Resources/Prototypes/Entities/Debugging/clicktest.yml
index 4e9caaa14d8..7eb0a063309 100644
--- a/Resources/Prototypes/Entities/Debugging/clicktest.yml
+++ b/Resources/Prototypes/Entities/Debugging/clicktest.yml
@@ -1,11 +1,11 @@
-# Entities specifically for testing click detection with ClickableComponent.
+# Entities specifically for testing click detection with ClickableComponent.
 #
 # Each entity has a bounding box AND texture equivalent.
 # Note that bounding box versions still have dots on the outside or center to make it possible to... see them.
 # These dots' texture detection should not interfere with the actual bounding box being tested.
 
 - type: entity
-  noSpawn: true
+  categories: [ Debug, HideSpawnMenu ]
   id: ClickTestBase
   suffix: DEBUG
   components:
diff --git a/Resources/Prototypes/Entities/Debugging/debug_sweps.yml b/Resources/Prototypes/Entities/Debugging/debug_sweps.yml
index e3289569a29..9ba7c85e1e1 100644
--- a/Resources/Prototypes/Entities/Debugging/debug_sweps.yml
+++ b/Resources/Prototypes/Entities/Debugging/debug_sweps.yml
@@ -60,7 +60,7 @@
   id: BulletDebug
   name: bang, ded bullet
   parent: BaseBullet
-  noSpawn: true
+  categories: [ Debug, HideSpawnMenu ]
   suffix: DEBUG
   components:
   - type: Tag
diff --git a/Resources/Prototypes/Entities/Debugging/tippy.yml b/Resources/Prototypes/Entities/Debugging/tippy.yml
index 292cbed0f1b..7f149c3b5dc 100644
--- a/Resources/Prototypes/Entities/Debugging/tippy.yml
+++ b/Resources/Prototypes/Entities/Debugging/tippy.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: Tippy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     netsync: false
diff --git a/Resources/Prototypes/Entities/Effects/ambient_sounds.yml b/Resources/Prototypes/Entities/Effects/ambient_sounds.yml
index f686779b3ee..81f7bbfc8a3 100644
--- a/Resources/Prototypes/Entities/Effects/ambient_sounds.yml
+++ b/Resources/Prototypes/Entities/Effects/ambient_sounds.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: AmbientSoundSourceFlies
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: AmbientSound
     volume: -5
diff --git a/Resources/Prototypes/Entities/Effects/bluespace_flash.yml b/Resources/Prototypes/Entities/Effects/bluespace_flash.yml
index 3421f0d9a61..42cdfbd297e 100644
--- a/Resources/Prototypes/Entities/Effects/bluespace_flash.yml
+++ b/Resources/Prototypes/Entities/Effects/bluespace_flash.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: EffectFlashBluespace
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: PointLight
     radius: 10.5
diff --git a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
index 096e88bcb6f..28e5a239ef3 100644
--- a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
+++ b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
@@ -36,7 +36,7 @@
   parent: BaseFoam
   id: Smoke
   name: smoke
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Occluder
   - type: Sprite
@@ -52,7 +52,7 @@
   parent: BaseFoam
   id: Foam
   name: foam
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     color: "#ffffffcc"
@@ -70,7 +70,6 @@
       state: foam-west
   - type: SmoothEdge
   - type: IconSmooth
-    key: walls
     mode: NoSprite
   - type: FoamVisuals
     animationTime: 0.6
@@ -84,7 +83,7 @@
 - type: entity
   id: MetalFoam
   name: metal foam
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: Foam
   components:
   - type: Sprite
@@ -101,6 +100,8 @@
       state: m_foam-north
     - map: [ "enum.EdgeLayer.West" ]
       state: m_foam-west
+  - type: EdgeSpreader
+    id: MetalFoam
   - type: FoamVisuals
     animationTime: 0.6
     animationState: m_foam-dissolve
@@ -108,7 +109,7 @@
 - type: entity
   id: IronMetalFoam
   name: iron metal foam
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: MetalFoam
   components:
   - type: SpawnOnDespawn
@@ -117,7 +118,7 @@
 - type: entity
   id: AluminiumMetalFoam
   name: aluminium metal foam
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: MetalFoam
   components:
   - type: SpawnOnDespawn
@@ -135,7 +136,7 @@
   - type: RCDDeconstructable
     cost: 2
     delay: 2
-    fx: EffectRCDDeconstruct2  
+    fx: EffectRCDDeconstruct2
   - type: Clickable
   - type: InteractionOutline
   - type: Sprite
@@ -159,6 +160,13 @@
   - type: Transform
     anchored: true
   - type: Airtight
+  - type: ReplaceFloorOnSpawn
+    replaceableTiles:
+    - Plating
+    - Lattice
+    - TrainLattice
+    replacementTiles:
+    - FloorMetalFoam
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic
diff --git a/Resources/Prototypes/Entities/Effects/emp_effects.yml b/Resources/Prototypes/Entities/Effects/emp_effects.yml
index 890dd24d430..d1096b85f5e 100644
--- a/Resources/Prototypes/Entities/Effects/emp_effects.yml
+++ b/Resources/Prototypes/Entities/Effects/emp_effects.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: EffectEmpPulse
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: TimedDespawn
     lifetime: 0.8
@@ -23,7 +23,7 @@
 
 - type: entity
   id: EffectEmpDisabled
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: TimedDespawn
     lifetime: 0.4
diff --git a/Resources/Prototypes/Entities/Effects/exclamation.yml b/Resources/Prototypes/Entities/Effects/exclamation.yml
index cfe1cbc7f22..d1f3e3ad063 100644
--- a/Resources/Prototypes/Entities/Effects/exclamation.yml
+++ b/Resources/Prototypes/Entities/Effects/exclamation.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: Exclamation
   name: exclamation
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   save: false
   components:
     - type: Transform
@@ -22,7 +22,7 @@
 - type: entity
   id: WhistleExclamation
   name: exclamation
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Sprite
       sprite: Structures/Storage/closet.rsi
diff --git a/Resources/Prototypes/Entities/Effects/explosion_light.yml b/Resources/Prototypes/Entities/Effects/explosion_light.yml
index b4b980dd1a5..d5e7452a795 100644
--- a/Resources/Prototypes/Entities/Effects/explosion_light.yml
+++ b/Resources/Prototypes/Entities/Effects/explosion_light.yml
@@ -1,5 +1,5 @@
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   id: ExplosionLight
   name: explosion light
   components:
diff --git a/Resources/Prototypes/Entities/Effects/hearts.yml b/Resources/Prototypes/Entities/Effects/hearts.yml
index 042fdb5e8ab..18f72c95d4a 100644
--- a/Resources/Prototypes/Entities/Effects/hearts.yml
+++ b/Resources/Prototypes/Entities/Effects/hearts.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: EffectHearts
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: TimedDespawn
     lifetime: 0.85
diff --git a/Resources/Prototypes/Entities/Effects/lightning.yml b/Resources/Prototypes/Entities/Effects/lightning.yml
index 7afd1c07a0c..f85f28d3b80 100644
--- a/Resources/Prototypes/Entities/Effects/lightning.yml
+++ b/Resources/Prototypes/Entities/Effects/lightning.yml
@@ -33,7 +33,7 @@
   name: lightning
   id: Lightning
   parent: BaseLightning
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Lightning
       canArc: true
@@ -42,7 +42,7 @@
   name: spooky lightning
   id: LightningRevenant
   parent: BaseLightning
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Sprite
       sprite: /Textures/Effects/lightning.rsi
@@ -66,7 +66,7 @@
   name: charged lightning
   id: ChargedLightning
   parent: BaseLightning
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Sprite
       sprite: /Textures/Effects/lightning.rsi
@@ -85,7 +85,7 @@
   name: lightning
   id: Spark
   parent: BaseLightning
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: /Textures/Effects/lightning.rsi
@@ -112,7 +112,7 @@
   name: supercharged lightning
   id: SuperchargedLightning
   parent: ChargedLightning
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Sprite
       sprite: /Textures/Effects/lightning.rsi
@@ -138,7 +138,7 @@
   name: hypercharged lightning
   id: HyperchargedLightning
   parent: ChargedLightning
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Sprite
       sprite: /Textures/Effects/lightning.rsi
diff --git a/Resources/Prototypes/Entities/Effects/mobspawn.yml b/Resources/Prototypes/Entities/Effects/mobspawn.yml
index fb59aa3fc46..c4396a775da 100644
--- a/Resources/Prototypes/Entities/Effects/mobspawn.yml
+++ b/Resources/Prototypes/Entities/Effects/mobspawn.yml
@@ -1,6 +1,7 @@
-- type: entity
+- type: entity
   id: MobSpawnCrabQuartz
   name: mobspawner quartzcrab
+  categories: [ HideSpawnMenu, Spawner ]
   components:
   - type: Transform
     anchored: True
@@ -30,6 +31,7 @@
   id: MobSpawnCrabIron
   parent: MobSpawnCrabQuartz
   name: mobspawner ironcrab
+  categories: [ HideSpawnMenu, Spawner ]
   components:
   - type: Sprite
     sprite: /Textures/Effects/mobspawn.rsi
@@ -41,6 +43,7 @@
   id: MobSpawnCrabSilver
   parent: MobSpawnCrabQuartz
   name: mobspawner silvercrab
+  categories: [ HideSpawnMenu, Spawner ]
   components:
   - type: Sprite
     sprite: /Textures/Effects/mobspawn.rsi
@@ -52,6 +55,7 @@
   id: MobSpawnCrabUranium
   parent: MobSpawnCrabQuartz
   name: mobspawner uraniumcrab
+  categories: [ HideSpawnMenu, Spawner ]
   components:
   - type: Sprite
     sprite: /Textures/Effects/mobspawn.rsi
@@ -61,7 +65,7 @@
 
 - type: entity
   id: EffectAnomalyFloraBulb
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: TimedDespawn
     lifetime: 0.4
diff --git a/Resources/Prototypes/Entities/Effects/puddle.yml b/Resources/Prototypes/Entities/Effects/puddle.yml
index fecf9f19a47..36f0faa1df1 100644
--- a/Resources/Prototypes/Entities/Effects/puddle.yml
+++ b/Resources/Prototypes/Entities/Effects/puddle.yml
@@ -113,7 +113,6 @@
   components:
   - type: Clickable
   - type: Slippery
-    launchForwardsMultiplier: 2.0
   - type: Transform
     noRot: true
     anchored: true
@@ -163,3 +162,6 @@
     solution: puddle
   - type: BadDrink
   - type: IgnoresFingerprints
+  - type: Tag
+    tags:
+    - DNASolutionScannable
diff --git a/Resources/Prototypes/Entities/Effects/radiation.yml b/Resources/Prototypes/Entities/Effects/radiation.yml
index 143ffa8559a..82828582cff 100644
--- a/Resources/Prototypes/Entities/Effects/radiation.yml
+++ b/Resources/Prototypes/Entities/Effects/radiation.yml
@@ -1,7 +1,7 @@
 - type: entity
   name: shimmering anomaly
   id: RadiationPulse
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   description: Looking at this anomaly makes you feel strange, like something is pushing at your eyes.
   components:
   - type: RadiationSource
diff --git a/Resources/Prototypes/Entities/Effects/rcd.yml b/Resources/Prototypes/Entities/Effects/rcd.yml
index 902429818e5..a663add9ca9 100644
--- a/Resources/Prototypes/Entities/Effects/rcd.yml
+++ b/Resources/Prototypes/Entities/Effects/rcd.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: EffectRCDBase
   abstract: true
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Transform
     anchored: True
@@ -19,7 +19,7 @@
 - type: entity
   parent: EffectRCDBase
   id: EffectRCDDeconstructPreview
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: deconstructPreview
@@ -27,7 +27,7 @@
 - type: entity
   parent: EffectRCDBase
   id: EffectRCDConstruct0
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: construct0
@@ -37,7 +37,7 @@
 - type: entity
   parent: EffectRCDBase
   id: EffectRCDConstruct1
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: construct1
@@ -47,7 +47,7 @@
 - type: entity
   parent: EffectRCDBase
   id: EffectRCDConstruct2
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: construct2
@@ -57,7 +57,7 @@
 - type: entity
   parent: EffectRCDBase
   id: EffectRCDConstruct3
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: construct3
@@ -67,7 +67,7 @@
 - type: entity
   parent: EffectRCDBase
   id: EffectRCDConstruct4
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: construct4
@@ -77,7 +77,7 @@
 - type: entity
   parent: EffectRCDBase
   id: EffectRCDDeconstruct2
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: deconstruct2
@@ -87,7 +87,7 @@
 - type: entity
   parent: EffectRCDBase
   id: EffectRCDDeconstruct4
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: deconstruct4
@@ -97,7 +97,7 @@
 - type: entity
   parent: EffectRCDBase
   id: EffectRCDDeconstruct6
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: deconstruct6
@@ -107,7 +107,7 @@
 - type: entity
   parent: EffectRCDBase
   id: EffectRCDDeconstruct8
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: deconstruct8
diff --git a/Resources/Prototypes/Entities/Effects/shuttle.yml b/Resources/Prototypes/Entities/Effects/shuttle.yml
new file mode 100644
index 00000000000..72cc04cba11
--- /dev/null
+++ b/Resources/Prototypes/Entities/Effects/shuttle.yml
@@ -0,0 +1,12 @@
+- type: entity
+  id: FtlVisualizerEntity
+  categories: [ HideSpawnMenu ]
+  description: Visualizer for shuttles arriving. You shouldn't see this!
+  components:
+  - type: FtlVisualizer
+    sprite:
+      sprite: /Textures/Effects/medi_holo.rsi
+      state: medi_holo
+  - type: Tag
+    tags:
+    - HideContextMenu
diff --git a/Resources/Prototypes/Entities/Effects/sparks.yml b/Resources/Prototypes/Entities/Effects/sparks.yml
index d86522a9711..c12e3b0eca3 100644
--- a/Resources/Prototypes/Entities/Effects/sparks.yml
+++ b/Resources/Prototypes/Entities/Effects/sparks.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: EffectSparks
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: TimedDespawn
     lifetime: 0.5
@@ -20,7 +20,7 @@
 
 - type: entity
   id: EffectTeslaSparks
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: TimedDespawn
     lifetime: 0.5
diff --git a/Resources/Prototypes/Entities/Effects/wallspawn.yml b/Resources/Prototypes/Entities/Effects/wallspawn.yml
index f1bd236a8ab..0de485ae340 100644
--- a/Resources/Prototypes/Entities/Effects/wallspawn.yml
+++ b/Resources/Prototypes/Entities/Effects/wallspawn.yml
@@ -1,5 +1,6 @@
 - type: entity
   id: WallSpawnAsteroid
+  categories: [ HideSpawnMenu ]
   components:
   - type: Transform
     anchored: True
@@ -28,6 +29,7 @@
 - type: entity
   id: WallSpawnAsteroidUraniumCrab
   parent: WallSpawnAsteroid
+  categories: [ HideSpawnMenu ]
   components:
   - type: SpawnOnDespawn
     prototype: AsteroidRockUraniumCrab
@@ -35,6 +37,7 @@
 - type: entity
   id: WallSpawnAsteroidUranium
   parent: WallSpawnAsteroid
+  categories: [ HideSpawnMenu ]
   components:
   - type: SpawnOnDespawn
     prototype: AsteroidRockUranium
@@ -42,6 +45,7 @@
 - type: entity
   id: WallSpawnAsteroidQuartzCrab
   parent: WallSpawnAsteroid
+  categories: [ HideSpawnMenu ]
   components:
   - type: SpawnOnDespawn
     prototype: AsteroidRockQuartzCrab
@@ -49,6 +53,7 @@
 - type: entity
   id: WallSpawnAsteroidQuartz
   parent: WallSpawnAsteroid
+  categories: [ HideSpawnMenu ]
   components:
   - type: SpawnOnDespawn
     prototype: AsteroidRockQuartz
@@ -56,6 +61,7 @@
 - type: entity
   id: WallSpawnAsteroidSilverCrab
   parent: WallSpawnAsteroid
+  categories: [ HideSpawnMenu ]
   components:
   - type: SpawnOnDespawn
     prototype: AsteroidRockSilverCrab
@@ -63,6 +69,7 @@
 - type: entity
   id: WallSpawnAsteroidSilver
   parent: WallSpawnAsteroid
+  categories: [ HideSpawnMenu ]
   components:
   - type: SpawnOnDespawn
     prototype: AsteroidRockSilver
@@ -70,6 +77,7 @@
 - type: entity
   id: WallSpawnAsteroidIronCrab
   parent: WallSpawnAsteroid
+  categories: [ HideSpawnMenu ]
   components:
   - type: SpawnOnDespawn
     prototype: AsteroidRockTinCrab
@@ -77,6 +85,7 @@
 - type: entity
   id: WallSpawnAsteroidIron
   parent: WallSpawnAsteroid
+  categories: [ HideSpawnMenu ]
   components:
   - type: SpawnOnDespawn
-    prototype: AsteroidRockTin
\ No newline at end of file
+    prototype: AsteroidRockTin
diff --git a/Resources/Prototypes/Entities/Effects/weapon_arc.yml b/Resources/Prototypes/Entities/Effects/weapon_arc.yml
index 25cd6e84ff2..0f3fab0e878 100644
--- a/Resources/Prototypes/Entities/Effects/weapon_arc.yml
+++ b/Resources/Prototypes/Entities/Effects/weapon_arc.yml
@@ -1,7 +1,7 @@
 - type: entity
   # Just fades out with no movement animation
   id: WeaponArcStatic
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: TimedDespawn
       lifetime: 2.0
@@ -18,7 +18,7 @@
 - type: entity
   # Plays the state animation then disappears with no fade or swing
   id: WeaponArcAnimated
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Sprite
       sprite: Effects/arcs.rsi
@@ -34,7 +34,7 @@
 - type: entity
   id: WeaponArcThrust
   parent: WeaponArcStatic
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: WeaponArcVisuals
       animation: Thrust
@@ -42,7 +42,7 @@
 - type: entity
   id: WeaponArcSlash
   parent: WeaponArcStatic
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: WeaponArcVisuals
       animation: Slash
@@ -51,7 +51,7 @@
 - type: entity
   id: WeaponArcBite
   parent: WeaponArcStatic
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: WeaponArcVisuals
       fadeOut: false
@@ -63,7 +63,7 @@
 - type: entity
   id: WeaponArcClaw
   parent: WeaponArcStatic
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: WeaponArcVisuals
       fadeOut: false
@@ -75,7 +75,7 @@
 - type: entity
   id: WeaponArcDisarm
   parent: WeaponArcAnimated
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: WeaponArcVisuals
       fadeOut: false
@@ -87,7 +87,7 @@
 - type: entity
   id: WeaponArcFist
   parent: WeaponArcStatic
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Sprite
       state: fist
@@ -95,7 +95,7 @@
 - type: entity
   id: WeaponArcPunch
   parent: WeaponArcStatic
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: WeaponArcVisuals
       fadeOut: false
@@ -107,7 +107,7 @@
 - type: entity
   id: WeaponArcKick
   parent: WeaponArcStatic
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: WeaponArcVisuals
       fadeOut: false
@@ -119,7 +119,7 @@
 - type: entity
   id: WeaponArcSmash
   parent: WeaponArcStatic
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: WeaponArcVisuals
       fadeOut: false
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml
index e985bda164e..31968ede00f 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml
@@ -86,5 +86,6 @@
       - FoodMeatSnakeKebab
       - FoodPizzaArnoldSlice
       - FoodPizzaCorncobSlice # Nyanotrasen - Corncob Pizza
+      - FoodPizzaUraniumSlice
       - FoodTacoRat
     rareChance: 0.05
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
index 4c820998ea2..014b525fc1a 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -68,6 +68,7 @@
         - ClothingHeadHatCowboyBountyHunter
         - ClothingNeckAutismPin
         - ClothingNeckGoldAutismPin
+        - WristwatchGold
       rareChance: 0.01
       prototypes:
         - Lighter
@@ -129,6 +130,7 @@
         - ClothingShoesTourist
         - ClothingUniformJumpsuitLoungewear
         - ClothingHeadHatCowboyRed
+        - Wristwatch
       chance: 0.6
       offset: 0.0
 
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
index 8c8ea607608..b3e0975764e 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
@@ -73,7 +73,7 @@
         state: narsian
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu, Spawner ]
   id: SpawnPointGhostNukeOperative
   name: ghost role spawn point
   suffix: nukeops
@@ -93,7 +93,7 @@
         state: radiation
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu, Spawner ]
   parent: BaseAntagSpawner
   id: SpawnPointLoneNukeOperative
   components:
@@ -116,7 +116,7 @@
         state: radiation
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu, Spawner ]
   parent: SpawnPointLoneNukeOperative
   id: SpawnPointNukeopsCommander
   components:
@@ -125,7 +125,7 @@
     description: roles-antag-nuclear-operative-commander-objective
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu, Spawner ]
   parent: SpawnPointLoneNukeOperative
   id: SpawnPointNukeopsMedic
   components:
@@ -134,7 +134,7 @@
     description: roles-antag-nuclear-operative-agent-objective
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu, Spawner ]
   parent: SpawnPointLoneNukeOperative
   id: SpawnPointNukeopsOperative
   components:
@@ -143,7 +143,7 @@
     description: roles-antag-nuclear-operative-objective
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu, Spawner ]
   parent: BaseAntagSpawner
   id: SpawnPointGhostDragon
   components:
@@ -158,10 +158,9 @@
       state: alive
 
 - type: entity
+  categories: [ HideSpawnMenu, Spawner ]
+  parent: BaseAntagSpawner
   id: SpawnPointGhostSpaceNinja
-  name: ghost role spawn point
-  suffix: space ninja
-  parent: MarkerBase
   components:
   - type: GhostRole
     name: ghost-role-information-space-ninja-name
@@ -172,8 +171,6 @@
     requirements:
     - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement
       time: 259200 # DeltaV - 72 hours
-  - type: GhostRoleMobSpawner
-    prototype: MobHumanSpaceNinja
   - type: Sprite
     sprite: Markers/jobs.rsi
     layers:
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
index a69c974a39d..5cd162e8684 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
@@ -862,4 +862,18 @@
       sprite: Mobs/Animals/clownspider.rsi
   - type: ConditionalSpawner
     prototypes:
-    - MobClownSpider
\ No newline at end of file
+    - MobClownSpider
+
+- type: entity
+  name: honk bot spawner
+  id: SpawnHonkBot
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: honkbot
+      sprite: Mobs/Silicon/Bots/honkbot.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobHonkBot
diff --git a/Resources/Prototypes/Entities/Markers/clientsideclone.yml b/Resources/Prototypes/Entities/Markers/clientsideclone.yml
index 56875c44142..39b9ee48fdb 100644
--- a/Resources/Prototypes/Entities/Markers/clientsideclone.yml
+++ b/Resources/Prototypes/Entities/Markers/clientsideclone.yml
@@ -1,7 +1,7 @@
 - type: entity
   name: clientsideclone
   id: clientsideclone
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
   - type: AnimationPlayer
diff --git a/Resources/Prototypes/Entities/Markers/construction_ghost.yml b/Resources/Prototypes/Entities/Markers/construction_ghost.yml
index be9cc915d91..04a8a095023 100644
--- a/Resources/Prototypes/Entities/Markers/construction_ghost.yml
+++ b/Resources/Prototypes/Entities/Markers/construction_ghost.yml
@@ -1,7 +1,7 @@
 - type: entity
   name: construction ghost
   id: constructionghost
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     color: '#3F38'
diff --git a/Resources/Prototypes/Entities/Markers/drag_shadow.yml b/Resources/Prototypes/Entities/Markers/drag_shadow.yml
index a1badb60bc5..19ffb6c36a6 100644
--- a/Resources/Prototypes/Entities/Markers/drag_shadow.yml
+++ b/Resources/Prototypes/Entities/Markers/drag_shadow.yml
@@ -1,7 +1,7 @@
 - type: entity
   name: drag shadow
   id: dragshadow
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Tag
     tags:
diff --git a/Resources/Prototypes/Entities/Markers/hover_entity.yml b/Resources/Prototypes/Entities/Markers/hover_entity.yml
index 8421a9d8c9e..2e8e1edb296 100644
--- a/Resources/Prototypes/Entities/Markers/hover_entity.yml
+++ b/Resources/Prototypes/Entities/Markers/hover_entity.yml
@@ -1,7 +1,7 @@
 - type: entity
   name: hover entity
   id: hoverentity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Sprite
       layers:
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 0f30c162b81..3bcdf270a7d 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -99,6 +99,11 @@
     doAfterDelay: 10
     allowSelfRepair: false
   - type: BorgChassis
+  - type: LockingWhitelist
+    blacklist:
+      components:
+      - BorgChassis
+      - RoboticsConsole
   - type: WiresPanel
   - type: ActivatableUIRequiresPanel
   - type: NameIdentifier
@@ -112,6 +117,13 @@
   - type: PowerCellSlot
     cellSlotId: cell_slot
     fitsInCharger: true
+  - type: ItemToggle
+    activated: false # gets activated when a mind is added
+    onUse: false # no item-borg toggling sorry
+    toggleLight: false
+  - type: AccessToggle
+  # TODO: refactor movement to just be based on toggle like speedboots but for the boots themselves
+  # TODO: or just have sentient speedboots be fast idk
   - type: PowerCellDraw
     drawRate: 0.6
   - type: ItemSlots
@@ -145,6 +157,7 @@
   - type: Lock
     locked: true
     breakOnEmag: false
+    unlockOnClick: false
   - type: ActivatableUIRequiresLock
   - type: LockedWiresPanel
   - type: Damageable
@@ -214,12 +227,17 @@
   - type: Emoting
   - type: GuideHelp
     guides:
-      - Cyborgs
+    - Cyborgs
+    - Robotics
   - type: StepTriggerImmune
-  - type: Eye
+  - type: DamageOnInteractProtection
+    damageProtection:
+      flatReductions:
+        Heat: 10 # capable of touching light bulbs and stoves without feeling pain!
+  - type: Eye # DeltaV - borgs can see psionically invisible creatures
     visMask:
-      - PsionicInvisibility
-      - Normal
+    - PsionicInvisibility
+    - Normal
 
 - type: entity
   abstract: true
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
index 04d94469c1a..a1f0be8f369 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
@@ -29,6 +29,11 @@
     node: cyborg
   - type: Speech
     speechVerb: Robotic
+  - type: InteractionPopup
+    interactSuccessString: petting-success-generic-cyborg
+    interactFailureString: petting-failure-generic-cyborg
+    interactSuccessSound:
+      path: /Audio/Ambience/Objects/periodic_beep.ogg
 
 - type: entity
   id: BorgChassisMining
@@ -85,6 +90,11 @@
     access: [["Cargo"], ["Salvage"], ["Command"], ["Research"]]
   - type: Inventory
     templateId: borgTall
+  - type: InteractionPopup
+    interactSuccessString: petting-success-salvage-cyborg
+    interactFailureString: petting-failure-salvage-cyborg
+    interactSuccessSound:
+      path: /Audio/Ambience/Objects/periodic_beep.ogg
 
 - type: entity
   id: BorgChassisEngineer
@@ -133,6 +143,11 @@
     access: [["Engineering"], ["Command"], ["Research"]]
   - type: Inventory
     templateId: borgShort
+  - type: InteractionPopup
+    interactSuccessString: petting-success-engineer-cyborg
+    interactFailureString: petting-failure-engineer-cyborg
+    interactSuccessSound:
+      path: /Audio/Ambience/Objects/periodic_beep.ogg
   - type: SiliconLawProvider # Delta-V - Adds custom lawset for Engineering Cyborg
     laws: Engineer
 
@@ -191,6 +206,11 @@
     access: [["Service"], ["Command"], ["Research"]]
   - type: Inventory
     templateId: borgShort
+  - type: InteractionPopup
+    interactSuccessString: petting-success-janitor-cyborg
+    interactFailureString: petting-failure-janitor-cyborg
+    interactSuccessSound:
+      path: /Audio/Ambience/Objects/periodic_beep.ogg
   - type: SiliconLawProvider # Delta-V Adds custom lawset for Janitor Cyborg
     laws: Janitor
 
@@ -249,12 +269,18 @@
     access: [["Medical"], ["Command"], ["Research"]]
   - type: Inventory
     templateId: borgDutch
+  - type: SolutionScanner
   - 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: FootstepModifier
     footstepSoundCollection:
       collection: FootstepHoverBorg
+  - type: InteractionPopup
+    interactSuccessString: petting-success-medical-cyborg
+    interactFailureString: petting-failure-medical-cyborg
+    interactSuccessSound:
+      path: /Audio/Ambience/Objects/periodic_beep.ogg
 
 - type: entity
   id: BorgChassisService
@@ -303,6 +329,11 @@
     access: [["Service"], ["Command"], ["Research"]]
   - type: Inventory
     templateId: borgTall
+  - type: InteractionPopup
+    interactSuccessString: petting-success-service-cyborg
+    interactFailureString: petting-failure-service-cyborg
+    interactSuccessSound:
+      path: /Audio/Ambience/Objects/periodic_beep.ogg
 
 - type: entity
   id: BorgChassisSyndicateAssault
@@ -332,10 +363,15 @@
       noMindState: synd_sec
     - type: Construction
       node: syndicateassault
+    - type: InteractionPopup
+      interactSuccessString: petting-success-syndicate-cyborg
+      interactFailureString: petting-failure-syndicate-cyborg
+      interactSuccessSound:
+        path: /Audio/Ambience/Objects/periodic_beep.ogg
 
 - type: entity
   id: BorgChassisSyndicateMedical
-  parent: BaseBorgChassisSyndicate
+  parent: [BaseBorgChassisSyndicate, ShowMedicalIcons]
   name: syndicate medical cyborg
   description: A combat medical cyborg. Has limited offensive potential, but makes more than up for it with its support capabilities.
   components:
@@ -364,6 +400,17 @@
     - type: ShowHealthBars
       damageContainers:
       - Biological
+    - type: InteractionPopup
+      interactSuccessString: petting-success-syndicate-cyborg
+      interactFailureString: petting-failure-syndicate-cyborg
+      interactSuccessSound:
+        path: /Audio/Ambience/Objects/periodic_beep.ogg
+    - type: SolutionScanner
+    - type: FootstepModifier
+      footstepSoundCollection:
+        collection: FootstepHoverBorg
+        params:
+          volume: -6
 
 - type: entity
   id: BorgChassisSyndicateSaboteur
@@ -397,3 +444,8 @@
       damageContainers:
       - Inorganic
       - Silicon
+    - type: InteractionPopup
+      interactSuccessString: petting-success-syndicate-cyborg
+      interactFailureString: petting-failure-syndicate-cyborg
+      interactSuccessSound:
+        path: /Audio/Ambience/Objects/periodic_beep.ogg
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index dbc3a93ccfe..8a54559d4a3 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -804,6 +804,7 @@
   - type: GuideHelp
     guides:
     - Chef
+    - FoodRecipes
 
 - type: entity
   name: crab
@@ -1270,6 +1271,17 @@
     tags:
     - VimPilot
     - DoorBumpOpener
+  - type: Reactive
+    groups:
+      Flammable: [ Touch ]
+      Extinguish: [ Touch ]
+    reactions:
+    - reagents: [ Water, SpaceCleaner ]
+      methods: [ Touch ]
+      effects:
+      - !type:WashCreamPieReaction
+
+
 
 - type: entity
   name: monkey
@@ -1302,6 +1314,7 @@
     clumsySound:
       path: /Audio/Animals/monkey_scream.ogg
 
+
 - type: entity
   name: monkey
   id: MobBaseSyndicateMonkey
@@ -1452,7 +1465,7 @@
   - type: SentienceTarget
     flavorKind: station-event-random-sentience-flavor-kobold
   - type: GhostRole
-    prob: 0.1
+    prob: 0.05
     makeSentient: true
     name: ghost-role-information-kobold-name
     description: ghost-role-information-kobold-description
@@ -1509,7 +1522,7 @@
 - type: entity
   name: guidebook monkey
   parent: MobMonkey
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   id: MobGuidebookMonkey
   description: A hopefully helpful monkey whose only purpose in life is for you to click on. Does this count as having a monkey give you a tutorial?
   components:
@@ -1659,7 +1672,14 @@
     wilhelmProbability: 0.001
   # TODO: Remove CombatMode when Prototype Composition is added
   - type: CombatMode
-    combatToggleAction: ActionCombatModeToggleOff
+  - type: MeleeWeapon
+    soundHit:
+      path: /Audio/Effects/bite.ogg
+    angle: 0
+    animation: WeaponArcBite
+    damage:
+      types:
+        Piercing: 0
   - type: Bloodstream
     bloodMaxVolume: 50
   - type: CanEscapeInventory
@@ -2133,11 +2153,13 @@
     states:
       Alive:
         Base: snake
+      Critical:
+        Base: dead
       Dead:
         Base: dead
   - type: Butcherable
     spawned:
-    - id: FoodMeat
+    - id: FoodMeatSnake
       amount: 1
   - type: InteractionPopup
     successChance: 0.6
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
index 07ee6b1536a..68ed1741a57 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
@@ -109,9 +109,6 @@
         collection: BananiumHorn
         params:
           volume: 5
-      anomalyContactDamage:
-        types:
-          Radiation: 10
     - type: Input
       context: "human"
     - type: Bloodstream
@@ -157,9 +154,6 @@
   suffix: "Ice"
   components:
   - type: Anomaly
-    anomalyContactDamage:
-      types:
-        Cold: 10
   - type: ExplosionAnomaly
     supercriticalExplosion: Cryo
     explosionTotalIntensity: 1000
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
index a6641efe8cc..67d97a91131 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
@@ -223,7 +223,7 @@
         acts: [ "Destruction" ]
 
 - type: entity
-  name: Reagent slime
+  name: reagent slime
   id: ReagentSlime
   suffix: Water
   parent: [ MobAdultSlimes, MobCombat ]
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/human.yml b/Resources/Prototypes/Entities/Mobs/NPCs/human.yml
index 7c1f2fde4b4..78d747069cc 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/human.yml
@@ -7,7 +7,7 @@
   - type: InputMover
   - type: MobMover
   - type: Loadout
-    prototypes: [PassengerGear]
+    prototypes: [LimitedPassengerGear]
   - type: NpcFactionMember
     factions:
     - NanoTrasen
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml b/Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml
index edbfb5bf12d..7571d8c8f45 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml
@@ -3,7 +3,7 @@
   id: MobWatcherBase
   parent: [ SimpleSpaceMobBase, FlyingMobBase ]
   abstract: true
-  description: It's like its staring right through you.
+  description: It's like it's staring right through you.
   components:
   - type: NpcFactionMember
     factions:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
index 285e75bca0a..6ef65cc1ae2 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
@@ -1,5 +1,5 @@
 - type: entity
-  name: Mimic
+  name: mimic
   id: MobMimic
   parent: [ SimpleMobBase, MobCombat ]
   description: Surprise. # When this gets a proper write this should use the object's actual description >:)
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
index e09d3917c75..7c4850fafcf 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
@@ -76,7 +76,7 @@
   - MobFlammable
   - MobCombat
   name: tomato killer
-  description: it seems today it's not you eating tomatoes, it's the tomatoes eating you.
+  description: Looks like it's not you eating tomatoes today, it's the tomatoes eating you.
   components:
   - type: Item
   - type: NpcFactionMember
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index 6fbf96200de..6ca9b987a73 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -100,6 +100,8 @@
     - id: FoodMeatCorgi
       amount: 2
     - id: MaterialHideCorgi
+  - type: StealTarget
+    stealGroup: AnimalIan
 
 - type: entity
   name: Runtime
@@ -121,6 +123,8 @@
     tags:
     - CannotSuicide
     - VimPilot
+  - type: StealTarget
+    stealGroup: AnimalNamedCat
 
 - type: entity
   name: Exception
@@ -139,6 +143,8 @@
     tags:
     - CannotSuicide
     - VimPilot
+  - type: StealTarget
+    stealGroup: AnimalNamedCat
 
 - type: entity
   name: Floppa
@@ -164,6 +170,8 @@
     tags:
     - CannotSuicide
     - VimPilot
+  - type: StealTarget
+    stealGroup: AnimalNamedCat
 
 - type: entity
   name: Bandito
@@ -235,7 +243,7 @@
     - CannotSuicide
     - VimPilot
   - type: StealTarget
-    stealGroup: AnimalBingus
+    stealGroup: AnimalNamedCat
 
 - type: entity
   name: McGriff
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
index c05840f9112..66ffed142ee 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -1,5 +1,5 @@
 - type: entity
-  name: Rat King
+  name: rat king
   id: MobRatKing
   parent: [ SimpleMobBase, MobCombat ]
   description: He's da rat. He make da roolz.
@@ -159,11 +159,11 @@
     - MinorAntagonists
 
 - type: entity
-  name: Rat Servant
+  name: rat servant
   id: MobRatServant
   parent: [ SimpleMobBase, MobCombat ]
   description: He's da mini rat. He don't make da roolz.
-  noSpawn: true #Must be configured to a King or the AI breaks.
+  categories: [ HideSpawnMenu ] #Must be configured to a King or the AI breaks.
   components:
   - type: Carriable #DeltaV
     freeHandsRequired: 1
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index 8530401a1df..308b88b8b9f 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -301,7 +301,7 @@
   - StripableInventoryBase
   id: MobMimeBot
   name: mimebot
-  description: Why not give mimebot a friendly wave.
+  description: Why not give the mimebot a friendly wave?
   components:
   - type: Sprite
     layers:
@@ -334,7 +334,15 @@
   - type: Sprite
     sprite: Mobs/Silicon/Bots/supplybot.rsi
     layers:
-    - state: supplybot
+    - map: ["enum.DamageStateVisualLayers.Base", "movement"]
+      state: supplybot
+  - type: SpriteMovement
+    movementLayers:
+      movement:
+        state: supplybot-moving
+    noMovementLayers:
+      movement:
+        state: supplybot
   - type: GhostRole
     makeSentient: true
     name: ghost-role-information-supplybot-name
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
index 4936d883e57..41545aef894 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -26,6 +26,8 @@
     - TemporaryBlindness
     - Pacified
     - Flashed
+    - RadiationProtection
+    - Drowsiness
   - type: Buckle
   - type: StandingState
   - type: Tag
@@ -91,16 +93,18 @@
     baseDecayRate: 0.04
   - type: StatusEffects
     allowed:
-      - Stun
-      - KnockedDown
-      - SlowedDown
-      - Stutter
-      - Electrocution
-      - ForcedSleep
-      - TemporaryBlindness
-      - Pacified
-      - StaminaModifier
-      - Flashed
+    - Stun
+    - KnockedDown
+    - SlowedDown
+    - Stutter
+    - Electrocution
+    - ForcedSleep
+    - TemporaryBlindness
+    - Pacified
+    - StaminaModifier
+    - Flashed
+    - RadiationProtection
+    - Drowsiness
   - type: Bloodstream
     bloodMaxVolume: 150
   - type: MobPrice
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
index fda1c565428..71bcec581d3 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -149,7 +149,7 @@
   description: A geras of a slime - the name is ironic, isn't it?
   id: MobSlimesGeras
   parent: BaseMobAdultSlimes
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   # they portable...
   - type: MovementSpeedModifier
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
index dfc679cd914..cc98bc40335 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
@@ -2,7 +2,7 @@
   name: space tick
   id: MobTick
   parent: SimpleSpaceMobBase
-  description: It's a space tick, watch out for its nasty bite. CentCom reports that 90 percent of logistics leg amputations are due to space tick bites. # DeltaV - Logistics Department replacing Cargo
+  description: It's a space tick, watch out for its nasty bite. CentComm reports that 90 percent of logistics leg amputations are due to space tick bites. # DeltaV - Logistics Department replacing Cargo
   components:
   - type: InputMover
   - type: MobMover
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
index 2550f96648e..64cf5885fea 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -1,6 +1,6 @@
 # Hacky for the stress test so don't even consider adding to this
 - type: entity
-  name: Burrower
+  name: burrower
   id: MobXeno
   parent: SimpleSpaceMobBase
   description: They mostly come at night. Mostly.
@@ -125,7 +125,7 @@
     removable: false
 
 - type: entity
-  name: Praetorian
+  name: praetorian
   parent: MobXeno
   id: MobXenoPraetorianNPC # Delta V - These no longer inherit the ghost takeover comp
   components:
@@ -158,7 +158,7 @@
         - MobLayer
 
 - type: entity
-  name: Drone
+  name: drone
   parent: MobXeno
   id: MobXenoDroneNPC # Delta V - These no longer inherit the ghost takeover comp
   components:
@@ -195,7 +195,7 @@
         - MobLayer
 
 - type: entity
-  name: Queen
+  name: queen
   parent: MobXeno
   id: MobXenoQueenNPC # Delta V - These no longer inherit the ghost takeover comp
   components:
@@ -234,7 +234,7 @@
     - CannotSuicide
 
 - type: entity
-  name: Ravager
+  name: ravager
   parent: MobXeno
   id: MobXenoRavagerNPC # Delta V - These no longer inherit the ghost takeover comp
   components:
@@ -271,7 +271,7 @@
         - MobLayer
 
 - type: entity
-  name: Runner
+  name: runner
   parent: MobXeno
   id: MobXenoRunnerNPC # Delta V - These no longer inherit the ghost takeover comp
   components:
@@ -301,7 +301,7 @@
         - MobLayer
 
 - type: entity
-  name: Rouny
+  name: rouny
   parent: MobXenoRunnerNPC # Delta V - These no longer inherit the ghost takeover comp
   id: MobXenoRounyNPC # Delta V - These no longer inherit the ghost takeover comp
   components:
@@ -316,7 +316,7 @@
       amount: 3
 
 - type: entity
-  name: Spitter
+  name: spitter
   parent: MobXeno
   id: MobXenoSpitterNPC # Delta V - These no longer inherit the ghost takeover comp
   components:
@@ -382,6 +382,10 @@
         Base: dead_purple_snake
       Dead:
         Base: dead_purple_snake
+  - type: Butcherable
+    spawned:
+    - id: FoodMeatSnake
+      amount: 4
   - type: Grammar
     attributes:
       proper: true
@@ -448,5 +452,9 @@
         Base: dead_small_purple_snake
       Dead:
         Base: dead_small_purple_snake
+  - type: Butcherable
+    spawned:
+    - id: FoodMeatSnake
+      amount: 2
   - type: SolutionTransfer
     maxTransferAmount: 1
diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
index fd62544b610..cd87509698e 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -2,7 +2,7 @@
   parent: [MobObserver, InventoryBase]
   id: AdminObserver
   name: admin observer
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Eye
     visMask:
@@ -75,6 +75,7 @@
   - type: RadarConsole
     followEntity: true
   - type: CargoOrderConsole
+  - type: BankClient
   - type: CrewMonitoringConsole
   - type: GeneralStationRecordConsole
     canDeleteEntries: true
@@ -160,7 +161,7 @@
 - type: entity
   id: ActionAGhostShowStationRecords
   name: Station Records Interface
-  description: View a station records Interface
+  description: View a station records Interface.
   components:
   - type: InstantAction
     icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
diff --git a/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml
index 5ebd43ddf48..d9dea3c18d9 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml
@@ -11,4 +11,3 @@
     damageRecovery:
       types:
         Asphyxiation: -0.5
-  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
diff --git a/Resources/Prototypes/Entities/Mobs/Player/diona.yml b/Resources/Prototypes/Entities/Mobs/Player/diona.yml
index 28687c68bfc..85c5631de7a 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/diona.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/diona.yml
@@ -11,12 +11,11 @@
       damageRecovery:
         types:
           Asphyxiation: -1.0
-    - type: PotentialPsionic #Nyano - Summary: makes potentially psionic.
 
 # Reformed Diona
 - type: entity
   parent: MobDiona
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   id: MobDionaReformed
   name: Reformed Diona
   components:
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index 869fb880841..702449fd978 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -95,6 +95,16 @@
   - type: Flammable
     damage:
       types: {}
+  - type: StatusEffects # Overwriting basesimplemob to remove flash, getting flashed as dragon just feelsbad
+    allowed:
+    - SlowedDown
+    - Stutter
+    - Electrocution
+    - ForcedSleep
+    - TemporaryBlindness
+    - Pacified
+    - RadiationProtection
+    - Drowsiness
   - type: Temperature
     heatDamageThreshold: 800
   - type: Metabolizer
@@ -154,10 +164,10 @@
     - MinorAntagonists
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   id: DragonsBreathGun
   name: dragon's lung
-  description: For dragon's breathing
+  description: For dragon's breathing.
   components:
   - type: RechargeBasicEntityAmmo
     rechargeCooldown: 5
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml
index fb84ad3650f..d1de65df012 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml
@@ -3,5 +3,3 @@
   name: Urist McHands The Dwarf
   parent: BaseMobDwarf
   id: MobDwarf
-  components:
-    - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
index e225890e1ec..32410279bac 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -146,7 +146,7 @@
   name: Ifrit
   parent: MobGuardianBase
   id: MobIfritGuardian
-  description: A corrupted jinn, ripped from fitra to serve the wizard's petty needs. It stands wicked, tuning into it's owner's life to sustain itself.
+  description: A corrupted jinn, ripped from fitra to serve the wizard's petty needs. It stands wicked, tuning into its owner's life to sustain itself.
   components:
     - type: GhostRole
       allowMovement: true
diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml
index c6b9ada1b8e..35cb54b0b1b 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml
@@ -3,8 +3,6 @@
   name: Urist McHands
   parent: BaseMobHuman
   id: MobHuman
-  components:
-  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
 
 #Syndie
 - type: entity
@@ -13,16 +11,17 @@
   name: syndicate agent
   suffix: Human, Base
   components:
-    - type: RandomHumanoidAppearance
-      randomizeName: false
-      hair: HairBald
-    - type: Loadout
-      prototypes: [SyndicateOperativeGearExtremelyBasic]
-    - type: RandomMetadata
-      nameSegments: [names_death_commando]
-    - type: NpcFactionMember
-      factions:
-      - Syndicate
+  - type: RandomHumanoidAppearance
+    randomizeName: false
+    hair: HairBald
+  - type: Loadout
+    prototypes: [SyndicateOperativeGearExtremelyBasic]
+    roleLoadout: [ RoleSurvivalSyndicate ]
+  - type: RandomMetadata
+    nameSegments: [names_death_commando]
+  - type: NpcFactionMember
+    factions:
+    - Syndicate
 
 - type: entity
   parent: MobHumanSyndicateAgentBase
@@ -30,74 +29,83 @@
   name: syndicate agent
   suffix: Human, Traitor
   components:
-    # make the player a traitor once its taken
-    - type: AutoTraitor
-      giveUplink: false
-      giveObjectives: false
+  # make the player a traitor once its taken
+  - type: AutoTraitor
+    giveUplink: false
+    giveObjectives: false
+
+- type: entity
+  parent: MobHumanSyndicateAgent
+  id: MobHumanSyndicateAgentMedic
+  name: syndicate medic
+  components:
+  - type: Loadout
+    prototypes: [SyndicateReinforcementMedic]
+    roleLoadout: [ RoleSurvivalSyndicate ]
+
+- type: entity
+  parent: MobHumanSyndicateAgent
+  id: MobHumanSyndicateAgentSpy
+  name: syndicate spy
+  components:
+  - type: Loadout
+    prototypes: [SyndicateReinforcementSpy]
+    roleLoadout: [ RoleSurvivalSyndicate ]
+
+- type: entity
+  parent: MobHumanSyndicateAgent
+  id: MobHumanSyndicateAgentThief
+  name: syndicate thief
+  components:
+  - type: Loadout
+    prototypes: [SyndicateReinforcementThief]
+    roleLoadout: [ RoleSurvivalSyndicate ]
 
 - type: entity
   parent: MobHumanSyndicateAgentBase
   id: MobHumanSyndicateAgentNukeops # Reinforcement exclusive to nukeops uplink
   suffix: Human, NukeOps
   components:
-    - type: NukeOperative
+  - type: NukeOperative
+  - type: RandomMetadata
+    nameSegments:
+    - nukeops-role-operator
+    - SyndicateNamesNormal
+  - type: Loadout
+    prototypes: [SyndicateOperativeGearFullNoUplink]
 
 # Nuclear Operative
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: Nuclear Operative
   parent: MobHuman
   id: MobHumanNukeOp
   components:
-    - type: NukeOperative
-    - type: RandomHumanoidAppearance
-    - type: PsionicBonusChance #Nyano - Summary: makes more likely to be psionic.
-      multiplier: 7
-      warn: false
+  - type: NukeOperative
+  - type: RandomHumanoidAppearance
+  - type: PsionicBonusChance #Nyano - Summary: makes more likely to be psionic.
+    multiplier: 7
+    warn: false
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: MobHuman
   id: MobHumanLoneNuclearOperative
   name: Lone Operative
-  components:
-    - type: RandomHumanoidAppearance
-      randomizeName: false
-    - type: NukeOperative
-    - type: Loadout
-      prototypes: [SyndicateLoneOperativeGearFull]
-    - type: RandomMetadata
-      nameSegments:
-      - SyndicateNamesPrefix
-      - SyndicateNamesNormal
-    - type: NpcFactionMember
-      factions:
-      - Syndicate
-    - type: PsionicBonusChance #Nyano - Summary: makes more likely to be psionic.
-      multiplier: 7
-      warn: false
-
-# Space Ninja
-- type: entity
-  noSpawn: true
-  name: Space Ninja
-  parent: MobHuman
-  id: MobHumanSpaceNinja
   components:
   - type: RandomHumanoidAppearance
     randomizeName: false
+  - type: NukeOperative
   - type: Loadout
-    prototypes: [SpaceNinjaGear]
+    prototypes: [SyndicateLoneOperativeGearFull]
+    roleLoadout: [ RoleSurvivalSyndicate ]
+  - type: RandomMetadata
+    nameSegments:
+    - SyndicateNamesPrefix
+    - SyndicateNamesNormal
   - type: NpcFactionMember
     factions:
     - Syndicate
-  - type: SpaceNinja
-  - type: GenericAntag
-    rule: Ninja
-  - type: AutoImplant
-    implants:
-    - DeathAcidifierImplant
-  - type: RandomMetadata
-    nameSegments:
-    - names_ninja_title
-    - names_ninja
+  - type: PsionicBonusChance #Nyano - Summary: makes more likely to be psionic.
+    multiplier: 7
+    warn: false
diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
index bd43d5d1879..2c4271fee3b 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
@@ -43,6 +43,7 @@
         settings: short
     - type: Loadout
       prototypes: [ DeathSquadGear ]
+      roleLoadout: [ RoleSurvivalEVA ]
     - type: RandomMetadata
       nameSegments:
         - NamesFirstMilitaryLeader
@@ -78,6 +79,7 @@
         settings: short
     - type: Loadout
       prototypes: [ ERTLeaderGear ]
+      roleLoadout: [ RoleSurvivalExtended ]
     - type: RandomMetadata
       nameSegments:
       - NamesFirstMilitaryLeader
@@ -106,6 +108,7 @@
         settings: short
     - type: Loadout
       prototypes: [ ERTLeaderGearEVA ]
+      roleLoadout: [ RoleSurvivalEVA ]
 
 - type: entity
   id: RandomHumanoidSpawnerERTLeaderEVALecter
@@ -126,6 +129,7 @@
         settings: short
     - type: Loadout
       prototypes: [ ERTLeaderGearEVALecter ]
+      roleLoadout: [ RoleSurvivalEVA ]
 
 ## ERT Chaplain
 
@@ -160,6 +164,7 @@
       - NamesLastMilitary
     - type: Loadout
       prototypes: [ ERTChaplainGear ]
+      roleLoadout: [ RoleSurvivalExtended ]
 
 - type: entity
   id: RandomHumanoidSpawnerERTChaplainEVA
@@ -184,6 +189,7 @@
         settings: short
     - type: Loadout
       prototypes: [ ERTChaplainGearEVA ]
+      roleLoadout: [ RoleSurvivalEVA ]
 
 ## ERT Janitor
 
@@ -218,6 +224,7 @@
       - NamesLastMilitary
     - type: Loadout
       prototypes: [ ERTJanitorGear ]
+      roleLoadout: [ RoleSurvivalExtended ]
 
 - type: entity
   id: RandomHumanoidSpawnerERTJanitorEVA
@@ -242,6 +249,7 @@
         settings: short
     - type: Loadout
       prototypes: [ ERTJanitorGearEVA ]
+      roleLoadout: [ RoleSurvivalEVA ]
 
 ## ERT Engineer
 
@@ -276,6 +284,7 @@
       - NamesLastMilitary
     - type: Loadout
       prototypes: [ ERTEngineerGear ]
+      roleLoadout: [ RoleSurvivalExtended ]
 
 - type: entity
   id: RandomHumanoidSpawnerERTEngineerEVA
@@ -300,6 +309,7 @@
         settings: short
     - type: Loadout
       prototypes: [ ERTEngineerGearEVA ]
+      roleLoadout: [ RoleSurvivalEVA ]
 
 ## ERT Security
 
@@ -334,6 +344,7 @@
       - NamesLastMilitary
     - type: Loadout
       prototypes: [ ERTSecurityGear ]
+      roleLoadout: [ RoleSurvivalExtended ]
 
 - type: entity
   id: RandomHumanoidSpawnerERTSecurityEVA
@@ -358,6 +369,7 @@
         settings: short
     - type: Loadout
       prototypes: [ ERTSecurityGearEVA ]
+      roleLoadout: [ RoleSurvivalEVA ]
 
 - type: entity
   id: RandomHumanoidSpawnerERTSecurityEVALecter
@@ -378,6 +390,7 @@
         settings: short
     - type: Loadout
       prototypes: [ ERTSecurityGearEVALecter ]
+      roleLoadout: [ RoleSurvivalEVA ]
 
 ## ERT Medic
 
@@ -412,6 +425,7 @@
       - NamesLastMilitary
     - type: Loadout
       prototypes: [ ERTMedicalGear ]
+      roleLoadout: [ RoleSurvivalExtended ]
 
 - type: entity
   id: RandomHumanoidSpawnerERTMedicalEVA
@@ -436,6 +450,7 @@
         settings: short
     - type: Loadout
       prototypes: [ ERTMedicalGearEVA ]
+      roleLoadout: [ RoleSurvivalEVA ]
 
 ## CBURN
 
@@ -456,6 +471,7 @@
   components:
     - type: Loadout
       prototypes: [CBURNGear]
+      roleLoadout: [ RoleSurvivalEVA ]
     - type: GhostRole
       name: ghost-role-information-cburn-agent-name
       description: ghost-role-information-cburn-agent-description
@@ -469,7 +485,7 @@
 ## Central Command
 
 - type: entity
-  name: CentCom official
+  name: CentComm official
   id: RandomHumanoidSpawnerCentcomOfficial
   components:
     - type: Sprite
@@ -489,6 +505,7 @@
         settings: default
     - type: Loadout
       prototypes: [ CentcomGear ]
+      roleLoadout: [ RoleSurvivalStandard ]
 
 ## Syndicate
 
@@ -511,6 +528,7 @@
       randomizeName: false
     - type: Loadout
       prototypes: [SyndicateOperativeGearExtremelyBasic]
+      roleLoadout: [ RoleSurvivalSyndicate ]
 
 - type: entity
   id: RandomHumanoidSpawnerNukeOp
@@ -601,6 +619,8 @@
         settings: short
     - type: Loadout
       prototypes: [ LostCargoTechGearSuit, LostCargoTechGearCoat ]
+      roleLoadout: [ RoleSurvivalStandard ]
+
 
 # Clown troupe
 
@@ -652,6 +672,7 @@
         settings: short
     - type: Loadout
       prototypes: [ ClownTroupe ]
+      roleLoadout: [ RoleSurvivalStandard ]
     - type: RandomMetadata
       nameSegments:
       - names_clown
@@ -663,6 +684,7 @@
   components:
     - type: Loadout
       prototypes: [ BananaClown ]
+      roleLoadout: [ RoleSurvivalStandard ]
 
 # Traveling exotic chef
 
@@ -702,6 +724,7 @@
         settings: short
     - type: Loadout
       prototypes: [ TravelingChef ]
+      roleLoadout: [ RoleSurvivalStandard ]
 
 # Disaster victim
 
@@ -767,6 +790,7 @@
   components:
     - type: Loadout
       prototypes: [ DisasterVictimRD, DisasterVictimRDAlt ]
+      roleLoadout: [ RoleSurvivalStandard ]
 
 - type: randomHumanoidSettings
   id: DisasterVictimCMO
@@ -774,6 +798,7 @@
   components:
     - type: Loadout
       prototypes: [ DisasterVictimCMO, DisasterVictimCMOAlt ]
+      roleLoadout: [ RoleSurvivalMedical ]
 
 - type: randomHumanoidSettings
   id: DisasterVictimCaptain
@@ -781,6 +806,7 @@
   components:
     - type: Loadout
       prototypes: [ DisasterVictimCaptain, DisasterVictimCaptainAlt ]
+      roleLoadout: [ RoleSurvivalStandard ]
 
 # Syndie Disaster Victim
 
@@ -823,3 +849,4 @@
         settings: short
     - type: Loadout
       prototypes: [ SyndicateOperativeGearCivilian ]
+      roleLoadout: [ RoleSurvivalStandard ]
diff --git a/Resources/Prototypes/Entities/Mobs/Player/moth.yml b/Resources/Prototypes/Entities/Mobs/Player/moth.yml
index ffdb36d86bd..72feba958ab 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/moth.yml
@@ -3,5 +3,3 @@
   name: Urist McFluff
   parent: BaseMobMoth  
   id: MobMoth
-  components:
-  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/Player/observer.yml b/Resources/Prototypes/Entities/Mobs/Player/observer.yml
index bae3f263000..403a7fd4b5f 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/observer.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/observer.yml
@@ -3,7 +3,7 @@
   id: MobObserver
   name: observer
   description: Boo!
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: CargoSellBlacklist
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml b/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml
index 5a45bff2950..958c98f483e 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml
@@ -91,4 +91,4 @@
     maxRange: 8
   - type: WarpPoint
     follow: true
-    location: Ratvar
\ No newline at end of file
+    location: Ratvar
diff --git a/Resources/Prototypes/Entities/Mobs/Player/replay_observer.yml b/Resources/Prototypes/Entities/Mobs/Player/replay_observer.yml
index ad9b37f63e1..ffbc46e94c3 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/replay_observer.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/replay_observer.yml
@@ -1,7 +1,7 @@
 - type: entity
   parent: MobObserver
   id: ReplayObserver
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   save: false
   components:
   - type: MovementSpeedModifier
diff --git a/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml
index 871512fe7e9..b332f573fb5 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml
@@ -4,7 +4,5 @@
   suffix: Urisst' Mzhand
   parent: BaseMobReptilian
   id: MobReptilian
-  components:
-    - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
 
 #Weh
diff --git a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml
index 5e71e6b7282..84f8d078099 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml
@@ -8,7 +8,6 @@
     interactSuccessString: hugging-success-generic
     interactSuccessSound: /Audio/Effects/thudswoosh.ogg
     messagePerceivedByOthers: hugging-success-generic-others
-  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
 
 - type: entity
   name: skeleton pirate
diff --git a/Resources/Prototypes/Entities/Mobs/Player/slime.yml b/Resources/Prototypes/Entities/Mobs/Player/slime.yml
index 79669a8fe2a..4e5974b3084 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/slime.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/slime.yml
@@ -2,5 +2,3 @@
   save: false
   parent: BaseMobSlimePerson
   id: MobSlimePerson
-  components:
-    - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/Player/vox.yml b/Resources/Prototypes/Entities/Mobs/Player/vox.yml
index 0a3e566b37c..28906584cb9 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/vox.yml
@@ -1,7 +1,5 @@
 - type: entity
   save: false
-  name: Urist McVox
+  name: Uristititi McVox
   parent: BaseMobVox
   id: MobVox
-  components:
-  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic.
diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
index bfb7796f44a..a6c9e21f6f8 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
@@ -30,8 +30,6 @@
     spawned:
       - id: FoodMeatSpider
         amount: 5
-  - type: Inventory
-    templateId: arachnid
   - type: Reactive
     reactions:
     - reagents: [Water]
@@ -82,16 +80,6 @@
       - 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"]
@@ -124,13 +112,17 @@
         sprite: "Effects/creampie.rsi"
         state: "creampie_arachnid"
         visible: false
+  - type: Inventory
+    templateId: arachnid
+
 
 - type: entity
   parent: BaseSpeciesDummy
   id: MobArachnidDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: HumanoidAppearance
     species: Arachnid
 
-#88w88
+
+#>88w88<
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index 9604d7135e2..bfdd3001995 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -18,16 +18,6 @@
     - 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"]
@@ -142,11 +132,10 @@
     - Pacified
     - StaminaModifier
     - Flashed
+    - RadiationProtection
+    - Drowsiness
     - PsionicsDisabled #Nyano - Summary: PCs can have psionics disabled.
     - PsionicallyInsulated #Nyano - Summary: PCs can be made insulated from psionic powers.
-  - type: Reflect
-    enabled: false
-    reflectProb: 0
   - type: Body
     prototype: Human
     requiredLegs: 2
@@ -177,10 +166,10 @@
   - type: SleepEmitSound
   - type: SSDIndicator
   - type: StandingState
-  - type: Fingerprint
   - type: Dna
   - type: MindContainer
     showExamineInfo: true
+  - type: CanEnterCryostorage
   - type: InteractionPopup
     successChance: 1
     interactSuccessString: hugging-success-generic
@@ -224,6 +213,7 @@
     - CanPilot
     - FootstepSound
     - DoorBumpOpener
+  - type: PotentialPsionic # DeltaV - organic species can all be psionic
 
 - type: entity
   save: false
@@ -250,7 +240,7 @@
         Heat: -0.07
       groups:
         Brute: -0.07
-
+  - type: Fingerprint
   - type: Blindable
   # Other
   - type: Temperature
@@ -264,6 +254,11 @@
     heatDamage:
       types:
         Heat: 1.5 #per second, scales with temperature & other constants
+  - type: TemperatureSpeed
+    thresholds:
+      293: 0.8
+      280: 0.6
+      260: 0.4
   - type: ThermalRegulator
     metabolismHeat: 800
     radiatedHeat: 100
@@ -313,14 +308,6 @@
     - map: [ "enum.HumanoidVisualLayers.LArm" ]
     - map: [ "enum.HumanoidVisualLayers.RLeg" ]
     - map: [ "enum.HumanoidVisualLayers.LLeg" ]
-    - shader: StencilClear
-      sprite: Mobs/Species/Human/parts.rsi
-      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"]
diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
index 499075012cf..3f89913f1f2 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
@@ -83,8 +83,6 @@
           - MobMask
         layer:
           - MobLayer
-  - type: Inventory
-    templateId: diona
   - type: Speech
     speechVerb: Plant
   - type: Vocal
@@ -102,13 +100,27 @@
     actionPrototype: DionaGibAction
     allowedStates:
     - Dead
+  - type: Inventory
+    templateId: diona
+    femaleDisplacements:
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Human/displacement.rsi
+            state: jumpsuit-female
 
 - type: entity
   parent: BaseSpeciesDummy
   id: MobDionaDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
-  - type: Inventory
-    templateId: diona
   - type: HumanoidAppearance
     species: Diona
+  - type: Inventory
+    templateId: diona
+    femaleDisplacements:
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Human/displacement.rsi
+            state: jumpsuit-female
diff --git a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
index 9901504abc1..0ae94e4d809 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
@@ -57,11 +57,25 @@
     hideLayersOnEquip:
     - Hair
     - Snout
+  - type: Inventory
+    femaleDisplacements:
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Human/displacement.rsi
+            state: jumpsuit-female
 
 - type: entity
   parent: BaseSpeciesDummy
   id: MobDwarfDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     scale: 1, 0.8
+  - type: Inventory
+    femaleDisplacements:
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Human/displacement.rsi
+            state: jumpsuit-female
diff --git a/Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml b/Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml
index c514a6f1a05..406aa920c1c 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml
@@ -40,11 +40,26 @@
           - MobMask
         layer:
           - MobLayer
+  - type: Inventory
+    femaleDisplacements:
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Human/displacement.rsi
+            state: jumpsuit-female
+
 
 - type: entity
   parent: BaseSpeciesDummy
   id: MobGingerbreadDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: HumanoidAppearance
     species: Gingerbread
+  - type: Inventory
+    femaleDisplacements:
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Human/displacement.rsi
+            state: jumpsuit-female
diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml
index f1464c977ae..4359192e039 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -21,9 +21,23 @@
     hideLayersOnEquip:
     - Hair
     - Snout
-  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic.
+  - type: Inventory
+    femaleDisplacements:
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Human/displacement.rsi
+            state: jumpsuit-female
 
 - type: entity
   parent: BaseSpeciesDummy
   id: MobHumanDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Inventory
+    femaleDisplacements:
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Human/displacement.rsi
+            state: jumpsuit-female
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
index 235c94c1e59..72364c0652d 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
@@ -65,6 +65,11 @@
     heatDamage:
       types:
         Heat : 3 #per second, scales with temperature & other constants
+  - type: TemperatureSpeed
+    thresholds:
+      289: 0.8
+      275: 0.6
+      250: 0.4
   - type: Sprite # sprite again because we want different layer ordering
     noRot: true
     drawdepth: Mobs
@@ -77,16 +82,6 @@
       - 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.LHand" ]
       - map: [ "enum.HumanoidVisualLayers.RHand" ]
@@ -119,11 +114,27 @@
         sprite: "Effects/creampie.rsi"
         state: "creampie_moth"
         visible: false
+  - type: Inventory
+    femaleDisplacements:
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Human/displacement.rsi
+            state: jumpsuit-female
+
 
 - type: entity
   parent: BaseSpeciesDummy
   id: MobMothDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: HumanoidAppearance
     species: Moth
+  - type: Inventory
+    femaleDisplacements:
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Human/displacement.rsi
+            state: jumpsuit-female
+
diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
index c9d3ed34804..d406f0bf2e2 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
@@ -27,8 +27,6 @@
     spawned:
     - id: FoodMeatLizard
       amount: 5
-  - type: Inventory
-    speciesId: reptilian
   - type: LizardAccent
   - type: Speech
     speechSounds: Lizard
@@ -62,15 +60,41 @@
     heatDamage:
       types:
         Heat : 1.5 #per second, scales with temperature & other constants
+  - type: TemperatureSpeed
+    thresholds:
+      301: 0.8
+      295: 0.6
+      285: 0.4
   - type: Wagging
+  - type: Inventory
+    speciesId: reptilian
+    femaleDisplacements:
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Human/displacement.rsi
+            state: jumpsuit-female
+
 
 - type: entity
   parent: BaseSpeciesDummy
   id: MobReptilianDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   description: A dummy reptilian meant to be used in character setup.
   components:
   - type: HumanoidAppearance
     species: Reptilian
+    hideLayersOnEquip:
+    - Snout
+    - HeadTop
+    - HeadSide
+  - type: Inventory
+    speciesId: reptilian
+    femaleDisplacements:
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Human/displacement.rsi
+            state: jumpsuit-female
 
 #Weh
diff --git a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
index bbabec5a20b..c400b5ddcb1 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
@@ -103,11 +103,25 @@
   - type: FireVisuals
     alternateState: Standing
   - type: FlashImmunity
+  - type: Inventory
+    femaleDisplacements:
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Human/displacement.rsi
+            state: jumpsuit-female
 
 - type: entity
   parent: BaseSpeciesDummy
   id: MobSkeletonPersonDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
-    - type: HumanoidAppearance
-      species: Skeleton
+  - type: HumanoidAppearance
+    species: Skeleton
+  - type: Inventory
+    femaleDisplacements:
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Human/displacement.rsi
+            state: jumpsuit-female
diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
index 31db778a00d..bd162c96d20 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
@@ -54,7 +54,6 @@
   - type: Damageable
     damageContainer: Biological
     damageModifierSet: Slime
-  - type: Geras
   - type: PassiveDamage # Around 8 damage a minute healed
     allowedStates:
     - Alive
@@ -111,11 +110,25 @@
       types:
         Asphyxiation: -1.0
     maxSaturation: 15
+  - type: Inventory
+    femaleDisplacements:
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Human/displacement.rsi
+            state: jumpsuit-female
 
 - type: entity
   parent: MobHumanDummy
   id: MobSlimePersonDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
-    - type: HumanoidAppearance
-      species: SlimePerson
+  - type: HumanoidAppearance
+    species: SlimePerson
+  - type: Inventory
+    femaleDisplacements:
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Human/displacement.rsi
+            state: jumpsuit-female
diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
index ec8035563b7..3c09baa25f4 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
@@ -14,18 +14,6 @@
   - type:  HumanoidAppearance
     species: Vox
     #- type: VoxAccent # Not yet coded
-  - type: Inventory
-    speciesId: vox
-    displacements:
-      jumpsuit:
-        layer:
-          sprite: Mobs/Species/Vox/displacement.rsi
-          state: jumpsuit
-          copyToShaderParameters:
-            # Value required, provide a dummy. Gets overridden when applied.
-            layerKey: dummy
-            parameterTexture: displacementMap
-            parameterUV: displacementUV
   - type: Speech
     speechVerb: Vox
     speechSounds: Vox
@@ -102,14 +90,89 @@
       sprite: "Effects/creampie.rsi"
       state: "creampie_vox" # Not default
       visible: false
+  - type: Inventory
+    speciesId: vox
+    displacements:
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vox/displacement.rsi
+            state: jumpsuit
+      eyes:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vox/displacement.rsi
+            state: eyes
+      gloves:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vox/displacement.rsi
+            state: hand
+      head:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vox/displacement.rsi
+            state: head
+      back:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vox/displacement.rsi
+            state: back
+      ears:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vox/displacement.rsi
+            state: ears
+      shoes:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vox/displacement.rsi
+            state: shoes
 
 - type: entity
   parent: BaseSpeciesDummy
   id: MobVoxDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: HumanoidAppearance
     species: Vox
   - type: Body
     prototype: Vox
-
+  - type: Inventory
+    speciesId: vox
+    displacements:
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vox/displacement.rsi
+            state: jumpsuit
+      eyes:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vox/displacement.rsi
+            state: eyes
+      gloves:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vox/displacement.rsi
+            state: hand
+      head:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vox/displacement.rsi
+            state: head
+      back:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vox/displacement.rsi
+            state: back
+      ears:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vox/displacement.rsi
+            state: ears
+      shoes:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vox/displacement.rsi
+            state: shoes
diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml
index f3c9daeee76..a715886252b 100644
--- a/Resources/Prototypes/Entities/Mobs/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/base.yml
@@ -99,6 +99,8 @@
     - Piercing
     - Heat
     - Shock
+    - Cold
+    - Caustic
   - type: DamageOnHighSpeedImpact
     damage:
       types:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
index 0c069f615ee..9dd3cffbe69 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
@@ -42,6 +42,7 @@
         #In future maybe add generic plastic scrap trash/debris
   - type: TrashOnSolutionEmpty
     solution: drink
+  - type: DnaSubstanceTrace
 
 - type: entity
   parent: DrinkCartonBaseFull
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
index 029cc5b1637..7503fd693d9 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -35,6 +35,7 @@
     interfaces:
       enum.TransferAmountUiKey.Key:
         type: TransferAmountBoundUserInterface
+  - type: DnaSubstanceTrace
 
 - type: entity
   parent: DrinkBase
@@ -78,6 +79,9 @@
     solution: drink
   - type: FitsInDispenser
     solution: drink
+  - type: Tag
+    tags:
+      - DrinkGlass
 
 # Transformable container - normal glass
 - type: entity
@@ -2139,7 +2143,7 @@
   parent: DrinkGlassBase
   id: DrinkWaterJug
   name: water jug
-  description: Stay hydrated
+  description: Stay hydrated.
   components:
   - type: SolutionContainerManager
     solutions:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
index c9e28954be8..86309124516 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -39,6 +39,7 @@
   - type: PhysicalComposition
     materialComposition:
       Plastic: 100
+  - type: DnaSubstanceTrace
   - type: PressurizedSolution
     solution: drink
   - type: Shakeable
@@ -729,7 +730,7 @@
 - type: entity
   parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
   id: DrinkCreamCartonXL
-  name: Milk Cream XL
+  name: milk cream XL
   description: It's cream. Made from milk. What else did you think you'd find in there?
   components:
   - type: SolutionContainerManager
@@ -752,7 +753,7 @@
   id: DrinkSugarJug
   name: sugar jug
   suffix: For Drinks, Full
-  description: some people put this in their coffee...
+  description: Some people put this in their coffee...
   components:
   - type: SolutionContainerManager
     solutions:
@@ -767,7 +768,7 @@
   parent: DrinkBottlePlasticBaseFull
   id: DrinkLemonLimeJug
   name: lemon lime jug
-  description: a dual citrus sensation.
+  description: A dual citrus sensation.
   components:
   - type: SolutionContainerManager
     solutions:
@@ -784,7 +785,7 @@
   parent: DrinkBottlePlasticBaseFull
   id: DrinkMeadJug
   name: mead jug
-  description: storing mead in a plastic jug should be a crime.
+  description: Storing mead in a plastic jug should be a crime.
   components:
   - type: SolutionContainerManager
     solutions:
@@ -801,7 +802,7 @@
   parent: DrinkBottlePlasticBaseFull
   id: DrinkIceJug
   name: ice jug
-  description: stubborn water. pretty cool.
+  description: Stubborn water. Pretty cool.
   components:
   - type: SolutionContainerManager
     solutions:
@@ -835,7 +836,7 @@
   parent: DrinkBottlePlasticBaseFull
   id: DrinkCoffeeJug
   name: coffee jug
-  description: wake up juice, of the heated kind.
+  description: Wake up juice, of the heated kind.
   components:
   - type: SolutionContainerManager
     solutions:
@@ -852,7 +853,7 @@
   parent: DrinkBottlePlasticBaseFull
   id: DrinkTeaJug
   name: tea jug
-  description: the drink of choice for the Bri'ish and hipsters.
+  description: The drink of choice for the Bri'ish and hipsters.
   components:
   - type: SolutionContainerManager
     solutions:
@@ -869,7 +870,7 @@
   parent: DrinkBottlePlasticBaseFull
   id: DrinkGreenTeaJug
   name: green tea jug
-  description: its like tea... but green! great for settling the stomach.
+  description: It's like tea... but green! great for settling the stomach.
   components:
   - type: SolutionContainerManager
     solutions:
@@ -886,7 +887,7 @@
   parent: DrinkBottlePlasticBaseFull
   id: DrinkIcedTeaJug
   name: iced tea jug
-  description: for when the regular tea is too hot for you boohoo
+  description: For when the regular tea is too hot for you boohoo.
   components:
   - type: SolutionContainerManager
     solutions:
@@ -903,7 +904,7 @@
   parent: DrinkBottlePlasticBaseFull
   id: DrinkDrGibbJug
   name: dr gibb. jug
-  description: yeah I don't know either...
+  description: Yeah I don't know either...
   components:
   - type: SolutionContainerManager
     solutions:
@@ -920,7 +921,7 @@
   parent: DrinkBottlePlasticBaseFull
   id: DrinkRootBeerJug
   name: root beer jug
-  description: this drink makes Australians giggle
+  description: This drink makes Australians giggle.
   components:
   - type: SolutionContainerManager
     solutions:
@@ -937,7 +938,7 @@
   parent: DrinkBottlePlasticBaseFull
   id: DrinkWaterMelonJuiceJug
   name: watermelon juice jug
-  description: May include leftover seeds
+  description: May include leftover seeds.
   components:
   - type: SolutionContainerManager
     solutions:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
index f5cb260e03b..f5b733d37b1 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -66,6 +66,7 @@
   - type: Tag
     tags:
     - DrinkCan
+  - type: DnaSubstanceTrace
 
 - type: entity
   parent: DrinkCanBaseFull
@@ -432,6 +433,7 @@
     whitelist:
       tags:
         - Cola
+    hideStackVisualsWhenClosed: false
   - type: StorageFill
     contents:
       - id: DrinkColaCan
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
index 4661f5a8a9b..cc5b071522b 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
@@ -38,6 +38,7 @@
     damage:
       types:
         Blunt: 0
+  - type: DnaSubstanceTrace
 
 - type: entity
   parent: DrinkBaseCup
@@ -314,7 +315,7 @@
 - type: entity
   parent: DrinkBaseCup
   id: DrinkLean
-  name: Lean # Delta V : Re-adds Lean
+  name: lean # Delta V : Re-adds Lean
   description: Often paired with doja sweet, drinking this concoction is the staple of a trill O.G. # Delta V : Re-Re-adds Lean
   components:
   - type: SolutionContainerManager
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
index 0b2af4c97f4..1c90e719792 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
@@ -23,7 +23,7 @@
   parent: FlaskBase
   id: DrinkMREFlask
   name: MRE flask
-  description: An old military flask, filled with the finest contents for soldiers
+  description: An old military flask, filled with the finest contents for soldiers.
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/mreflask.rsi
@@ -58,7 +58,7 @@
   parent: FlaskBase
   id: DrinkFlask
   name: captain's flask
-  description: A metal flask belonging to the captain
+  description: A metal flask belonging to the captain.
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/flask.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
index d2c1249740e..930cf817576 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
@@ -11,7 +11,7 @@
   - type: MixableSolution
     solution: drink
   - type: Drink
-  - type: Shakeable # Doesn't do anything, but I mean...
+  - type: Shakeable
   - type: FitsInDispenser
     solution: drink
   - type: DrawableSolution
@@ -34,6 +34,11 @@
   - type: PhysicalComposition
     materialComposition:
       Steel: 50
+  - type: DnaSubstanceTrace
+  - type: ReactionMixer
+    mixOnInteract: false
+    reactionTypes:
+    - Shake
 
 - type: entity
   parent: DrinkGlassBase
@@ -68,7 +73,7 @@
   parent: DrinkGlassBase
   id: DrinkJar
   name: jar
-  description: The hipster's cup
+  description: The hipster's cup.
   components:
   - type: Drink
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
index 9f94be9576b..eadeeabd747 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
@@ -76,6 +76,7 @@
     materialComposition:
       Glass: 100
   - type: SpaceGarbage
+  - type: DnaSubstanceTrace
 
 - type: entity
   name: base empty bottle
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
index 922d4938885..cbc810cc395 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
@@ -292,7 +292,7 @@
   name: lemoon cake
   parent: FoodCakeBase
   id: FoodCakeLemoon
-  description: A cake that represents the moon of earth
+  description: A cake that represents the moon of earth.
   components:
   - type: Sprite
     state: lemoon
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
index e8efb194356..c7e46d9a94a 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
@@ -296,7 +296,7 @@
   name: stonk-pocket
   parent: FoodDonkpocketBase
   id: FoodDonkpocketStonk
-  description: Tasty, but a sad reminder of the great crash of '24
+  description: Tasty, but a sad reminder of the great crash of '24.
   components:
   - type: FlavorProfile
     flavors:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
index fde181d8b9b..784bfe2cd5d 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
@@ -257,14 +257,12 @@
 
 - type: entity
   name: blueberry pancake
-  parent: FoodBakedBase
+  parent: FoodBakedPancake
   id: FoodBakedPancakeBb
   description: A fluffy and delicious blueberry pancake.
   components:
   - type: Stack
-    stackType: Pancake
-    count: 1
-    composite: true
+    stackType: PancakeBb
     layerStates:
     - pancakesbb1
     - pancakesbb2
@@ -281,7 +279,6 @@
     - state: pancakesbb3
       map: ["pancakesbb3"]
       visible: false
-  - type: Appearance
   - type: Tag
     tags:
     - Pancake
@@ -289,14 +286,12 @@
 
 - type: entity
   name: chocolate chip pancake
-  parent: FoodBakedBase
+  parent: FoodBakedPancake
   id: FoodBakedPancakeCc
   description: A fluffy and delicious chocolate chip pancake.
   components:
   - type: Stack
-    stackType: Pancake
-    count: 1
-    composite: true
+    stackType: PancakeCc
     layerStates:
     - pancakescc1
     - pancakescc2
@@ -313,7 +308,6 @@
     - state: pancakescc3
       map: ["pancakescc3"]
       visible: false
-  - type: Appearance
   - type: SolutionContainerManager
     solutions:
       food:
@@ -323,9 +317,6 @@
           Quantity: 5
         - ReagentId: Theobromine
           Quantity: 1
-  - type: Tag
-    tags:
-    - Pancake
 
 - type: entity
   name: waffles
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
index f97d87a9c50..09ec706e1fe 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
@@ -148,6 +148,9 @@
     - state: tin
     - state: plain
   - type: CreamPie
+  - type: ThrowingAngle
+    angle: 180
+  - type: LandAtCursor
   - type: ContainerContainer
     containers:
       payloadSlot: !type:ContainerSlot
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
index 3004dc4cb2b..20b03fcb67a 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
@@ -319,11 +319,9 @@
         maxVol: 50
         reagents:
         - ReagentId: Nutriment
-          Quantity: 25
-        - ReagentId: Vitamin
-          Quantity: 5
-        - ReagentId: DoctorsDelight
-          Quantity: 6
+          Quantity: 20
+        - ReagentId: THC
+          Quantity: 30
 
 - type: entity
   name: slice of dank pizza
@@ -346,11 +344,9 @@
         maxVol: 10
         reagents:
         - ReagentId: Nutriment
-          Quantity: 4.2
-        - ReagentId: Vitamin
-          Quantity: 0.8
-        - ReagentId: DoctorsDelight
-          Quantity: 1
+          Quantity: 3.5
+        - ReagentId: THC
+          Quantity: 5
 # Tastes like crust, tomato, cheese, meat, satisfaction.
 
 - type: entity
@@ -401,7 +397,7 @@
   name: Hawaiian pizza
   parent: FoodPizzaBase
   id: FoodPizzaPineapple
-  description: Makes people burst into tears. Tears of joy or sadness depends on the persons fondness for pineapple.
+  description: Makes people burst into tears. Tears of joy or sadness depends on the person's fondness for pineapple.
   components:
   - type: FlavorProfile
     flavors:
@@ -547,3 +543,76 @@
         - ReagentId: Vitamin
           Quantity: 1
 # Tastes like stale crust, rancid cheese, mushroom.
+
+- type: entity
+  name: spicy rock pizza
+  parent: FoodPizzaBase
+  id: FoodPizzaUranium
+  description: Spicy pizza covered in peppers and uranium.
+  components:
+  - type: FlavorProfile
+    flavors:
+    - spicy
+    - cheesy
+    - oily
+    - bread
+  - type: Sprite
+    layers:
+    - state: uranium-pizza
+  - type: SliceableFood
+    slice: FoodPizzaUraniumSlice
+  - type: Tag
+    tags:
+    - Meat
+    - Pizza
+  - type: PointLight
+    enabled: true
+    radius: 2
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 40
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 20
+        - ReagentId: Radium
+          Quantity: 4
+        - ReagentId: Uranium
+          Quantity: 16
+
+- type: entity
+  name: slice of spicy rock pizza
+  parent: FoodPizzaSliceBase
+  id: FoodPizzaUraniumSlice
+  description: A glowing slice of spicy rock pizza.
+  components:
+  - type: FlavorProfile
+    flavors:
+    - spicy
+    - cheesy
+    - oily
+    - bread
+  - type: Sprite
+    layers:
+    - state: uranium-slice
+  - type: Tag
+    tags:
+    - Meat
+    - Pizza
+    - Slice
+  - type: PointLight
+    enabled: true
+    radius: 2
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 2.5
+        - ReagentId: Radium
+          Quantity: 0.5
+        - ReagentId: Uranium
+          Quantity: 2
+
+# Tastes like crust, tomato, cheese, radiation.
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
index aa9e70f3fa4..1854d6f71fa 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -681,7 +681,7 @@
   id: FoodMealHappyHonkClown
   parent: HappyHonk
   suffix: random food spawner meal
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: StorageFill
     contents:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
index be23c2e43f6..a81ed55545a 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -1,4 +1,5 @@
 # Lots of misc stuff in here, hard to parent it.
+# ^ Yeah, this stuff should probably get split into different files but not my fight today.
 
 # Powder (For when you throw stuff like flour and it explodes)
 
@@ -34,6 +35,9 @@
     solution: food
   - type: TrashOnSolutionEmpty
     solution: food
+  - type: Tag
+    tags:
+      - Ingredient
 
 - type: entity
   abstract: true
@@ -272,6 +276,9 @@
         reagents:
         - ReagentId: Nutriment
           Quantity: 15
+  - type: Tag
+    tags:
+      - Ingredient
 
 - type: entity
   name: dough
@@ -475,10 +482,62 @@
   components:
   - type: Sprite
     state: butter
+  - type: Slippery
+  - type: StepTrigger
+    intersectRatio: 0.2
+  - type: CollisionWake
+    enabled: false
+  - type: Physics
+    bodyType: Dynamic
+  - type: Fixtures
+    fixtures:
+      slips:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.3,-0.2,0.3,0.2"
+        layer:
+        - SlipLayer
+        hard: false
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.3,-0.2,0.3,0.2"
+        density: 10
+        mask:
+        - ItemMask
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 18
+        reagents:
+        - ReagentId: Butter
+          Quantity: 15
+  - type: SliceableFood
+    count: 3
+    slice: FoodButterSlice
 
 - type: entity
-  name: stick of cannabis butter
+  name: butter slice
   parent: FoodBakingBase
+  id: FoodButterSlice
+  description: A pat of delicious, golden, fatty goodness.
+  components:
+  - type: Sprite
+    state: butter-slice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 6
+        reagents:
+        - ReagentId: Butter
+          Quantity: 5
+  - type: Tag
+    tags:
+    - Slice
+
+- type: entity
+  name: stick of cannabis butter
+  parent: FoodButter
   id: FoodCannabisButter
   description: Add this to your favorite baked goods for an irie time.
   components:
@@ -684,3 +743,6 @@
       reagents:
       - ReagentId: CocoaPowder
         Quantity: 2
+  - type: Tag
+    tags:
+      - Ingredient
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
index ac3cd1318fb..6269888f639 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -361,7 +361,7 @@
   name: dragon flesh
   parent: FoodMeatBase
   id: FoodMeatDragon
-  description: The dense meat of the space-era apex predator is oozing with it's mythical ichor. Ironically, best eaten raw.
+  description: The dense meat of the space-era apex predator is oozing with its mythical ichor. Ironically, best eaten raw.
   components:
   - type: Tag
     tags:
@@ -447,6 +447,8 @@
     tags:
     - Raw
     - Meat
+    - Trash
+    - Recyclable
   - type: Sprite
     state: rotten
   - type: SolutionContainerManager
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index a74e3450e94..88a30150d8d 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -95,6 +95,21 @@
   - type: Produce
     seedId: sugarcane
 
+- type: entity
+  name: papercane roll
+  description: Why do we even need to grow paper?
+  id: Papercane
+  parent: ProduceBase
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/papercane.rsi
+  - type: SolutionContainerManager
+  - type: Produce
+    seedId: papercane
+  - type: Log
+    spawnedPrototype: SheetPaper1
+    spawnCount: 2
+
 - type: entity
   parent: FoodProduceBase
   id: FoodLaughinPeaPod
@@ -311,7 +326,6 @@
     sprite: Objects/Specific/Hydroponics/banana.rsi
     heldPrefix: peel
   - type: Slippery
-    launchForwardsMultiplier: 1.5
   - type: StepTrigger
     intersectRatio: 0.2
   - type: CollisionWake
@@ -388,7 +402,6 @@
       path: /Audio/Effects/slip.ogg
       params:
         volume: -100
-    launchForwardsMultiplier: 1.6
 
 - type: entity
   name: bananium peel
@@ -402,8 +415,6 @@
     sprite: Objects/Materials/materials.rsi
     heldPrefix: peel
   - type: Slippery
-    paralyzeTime: 4
-    launchForwardsMultiplier: 2
 
 - type: entity
   name: carrot
@@ -873,6 +884,42 @@
     tags:
     - Fruit
 
+- type: entity
+  name: golden apple
+  parent: FoodProduceBase
+  id: FoodGoldenApple
+  description: It should be shaped like a cube, shouldn't it?
+  components:
+  - type: FlavorProfile
+    flavors:
+      - apple
+      - metallic
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 30
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+        - ReagentId: Vitamin
+          Quantity: 4
+        - ReagentId: DoctorsDelight
+          Quantity: 13
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/golden_apple.rsi
+  - type: Produce
+    seedId: goldenApple
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: JuiceApple
+        Quantity: 10
+      - ReagentId: Gold
+        Quantity: 10
+  - type: Tag
+    tags:
+    - Fruit
+
 - type: entity
   name: cocoa pod
   parent: FoodProduceBase
@@ -1230,7 +1277,7 @@
   name: poppy
   parent: FoodProduceBase
   id: FoodPoppy
-  description: A flower with extracts often used in the production of medicine
+  description: A flower with extracts often used in the production of medicine.
   components:
   - type: Clothing
     slots:
@@ -1415,6 +1462,71 @@
     - Galaxythistle
     - Fruit # Probably?
 
+- type: entity
+  name: glasstle
+  parent: FoodProduceBase
+  id: FoodGlasstle
+  description: A fragile crystal plant with lot of spiky thorns. 
+  components:
+  - type: Item
+    size: Small
+    sprite: Objects/Specific/Hydroponics/glasstle.rsi
+    heldPrefix: produce  
+  - type: FlavorProfile
+    flavors:
+      - sharp
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 15
+        reagents:
+        - ReagentId: Razorium
+          Quantity: 15
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/glasstle.rsi
+  - type: Produce
+    seedId: glasstle
+  - type: Extractable
+    grindableSolutionName: food
+  - type: Damageable 
+    damageContainer: Inorganic
+  - type: ToolRefinable
+    refineResult:
+    - id: SheetGlass1
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 10
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
+          params:
+            volume: -4
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlass:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: DamageOnHit 
+    damage:
+      types:
+        Blunt: 10
+  - type: MeleeWeapon
+    wideAnimationRotation: 60
+    damage:
+      types:
+        Slash: 15
+    soundHit:
+        path: /Audio/Weapons/bladeslice.ogg
+  - type: Tag
+    tags:
+    - Galaxythistle
+
+
 - type: entity
   name: fly amanita
   parent: FoodProduceBase
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
index d620dbda6f4..e8a646e8c96 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
@@ -483,7 +483,7 @@
 # Trash
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: BaseItem
   id: FoodPacketTrash
   description: This is rubbish.
@@ -506,7 +506,7 @@
     price: 0
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketBoritosTrash
   name: boritos bag
@@ -515,7 +515,7 @@
     state: boritos-trash
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketCnDsTrash
   name: C&Ds bag
@@ -524,7 +524,7 @@
     state: cnds-trash
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketCheesieTrash
   name: cheesie honkers
@@ -533,7 +533,7 @@
     state: cheesiehonkers-trash
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketChipsTrash
   name: chips
@@ -542,7 +542,7 @@
     state: chips-trash
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketChocolateTrash
   name: chocolate wrapper
@@ -551,7 +551,7 @@
     state: chocolatebar-trash
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketEnergyTrash
   name: energybar wrapper
@@ -560,7 +560,7 @@
     state: energybar-trash
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketPistachioTrash
   name: pistachios packet
@@ -569,7 +569,7 @@
     state: pistachio-trash
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketPopcornTrash
   name: popcorn box
@@ -578,7 +578,7 @@
     state: popcorn-trash
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketRaisinsTrash
   name: 4no raisins
@@ -587,7 +587,7 @@
     state: raisins-trash
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketSemkiTrash
   name: semki packet
@@ -596,7 +596,7 @@
     state: semki-trash
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketSusTrash
   name: sus jerky
@@ -605,7 +605,7 @@
     state: susjerky-trash
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketSyndiTrash
   name: syndi-cakes box
@@ -614,7 +614,7 @@
     state: syndicakes-trash
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketCupRamenTrash
   name: empty cup ramen
@@ -623,7 +623,7 @@
     state: ramen
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketChowMeinTrash
   name: empty chow mein box
@@ -632,7 +632,7 @@
     state: chinese1
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketDanDanTrash
   name: empty dan dan box
@@ -641,7 +641,7 @@
     state: chinese2
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodCookieFortune
   name: cookie fortune
@@ -654,7 +654,7 @@
     descriptionSegments: [CookieFortuneDescriptions]
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
   id: FoodPacketMRETrash
   name: MRE wrapper
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
index f35d222d39c..6f4baf2785d 100644
--- a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
@@ -548,7 +548,7 @@
   parent: BaseTree
   id: LightTree01
   name: glowing tree
-  description: a marvelous tree filled with strange energy.
+  description: A marvelous tree filled with strange energy.
   components:
   - type: PointLight
     radius: 2.0
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
index 06836df342c..8dfc79c6279 100644
--- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
@@ -435,9 +435,9 @@
 
 - type: entity
   id: PresentTrash
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: BaseItem
-  name: Wrapping Paper
+  name: wrapping paper
   description: Carefully folded, taped, and tied with a bow. Then ceremoniously ripped apart and tossed on the floor.
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml
deleted file mode 100644
index c6c634bae12..00000000000
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml
+++ /dev/null
@@ -1,89 +0,0 @@
-# Pending merge of 7309704ace2017e701e1b566359d012067c4107a, use this instead as its the latest
-
-## Most of these have DO NOT MAP, since stations are completely unequipped to deal with ship combat + these are basically placeholder.
-#
-#- type: entity
-#  id: ShuttleGunSvalinnMachineGunCircuitboard
-#  parent: BaseMachineCircuitboard
-#  name: LSE-400c "Svalinn machine gun" machine board
-#  description: A machine printed circuit board for an LSE-400c "Svalinn machine gun"
-#  suffix: DO NOT MAP, Machine Board
-#  components:
-#  - type: Sprite
-#    state: security
-#  - type: MachineBoard
-#    prototype: ShuttleGunSvalinnMachineGun
-#    stackRequirements:
-#      MatterBin: 2
-#      Manipulator: 4
-#      Steel: 5
-#      CableHV: 5
-#
-#- type: entity
-#  id: ShuttleGunPerforatorCircuitboard
-#  parent: BaseMachineCircuitboard
-#  name: LSE-1200c "Perforator" machine board
-#  description: A machine printed circuit board for an LSE-1200c "Perforator"
-#  suffix: DO NOT MAP, Machine Board
-#  components:
-#  - type: Sprite
-#    state: security
-#  - type: MachineBoard
-#    prototype: ShuttleGunPerforator
-#    stackRequirements:
-#      MatterBin: 4
-#      Manipulator: 6
-#      Steel: 10
-#      CableHV: 5
-#
-#- type: entity
-#  id: ShuttleGunFriendshipCircuitboard
-#  parent: BaseMachineCircuitboard
-#  name: EXP-320g "Friendship" machine board
-#  description: A machine printed circuit board for an EXP-320g "Friendship"
-#  suffix: DO NOT MAP, Machine Board
-#  components:
-#  - type: Sprite
-#    state: security
-#  - type: MachineBoard
-#    prototype: ShuttleGunFriendship
-#    stackRequirements:
-#      MatterBin: 3
-#      Manipulator: 2
-#      Steel: 7
-#      CableHV: 5
-#
-#- type: entity
-#  id: ShuttleGunDusterCircuitboard
-#  parent: BaseMachineCircuitboard
-#  name: EXP-2100g "Duster" machine board
-#  description: A machine printed circuit board for an EXP-2100g "Duster"
-#  suffix: DO NOT MAP, Machine Board
-#  components:
-#  - type: Sprite
-#    state: security
-#  - type: MachineBoard
-#    prototype: ShuttleGunDuster
-#    stackRequirements:
-#      MatterBin: 6
-#      Manipulator: 4
-#      Steel: 10
-#      CableHV: 5
-#      Uranium: 2
-#
-#- type: entity
-#  id: ShuttleGunKineticCircuitboard
-#  parent: BaseMachineCircuitboard
-#  name: PTK-800 "Matter Dematerializer" machine board
-#  description: A machine printed circuit board for an PTK-800 "Matter Dematerializer"
-#  suffix: DO NOT MAP, Machine Board
-#  components:
-#  - type: Sprite
-#    state: security
-#  - type: MachineBoard
-#    prototype: ShuttleGunKinetic
-#    stackRequirements:
-#      MatterBin: 2
-#      Manipulator: 3
-#      Steel: 5
-#      CableHV: 2
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/particle_accelerator.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/particle_accelerator.yml
index a1260f07c0c..f1b03f97c23 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/particle_accelerator.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/particle_accelerator.yml
@@ -2,7 +2,7 @@
   id: MachineParticleAcceleratorEndCapCircuitboard
   parent: BaseMachineCircuitboard
   name: PA end cap board
-  description: A machine board for a particle accelerator end cap
+  description: A machine board for a particle accelerator end cap.
   components:
     - type: Sprite
       state: engineering
@@ -16,7 +16,7 @@
   id: MachineParticleAcceleratorFuelChamberCircuitboard
   parent: BaseMachineCircuitboard
   name: PA fuel chamber board
-  description: A machine board for a particle accelerator fuel chamber
+  description: A machine board for a particle accelerator fuel chamber.
   components:
     - type: Sprite
       state: engineering
@@ -34,7 +34,7 @@
   id: MachineParticleAcceleratorPowerBoxCircuitboard
   parent: BaseMachineCircuitboard
   name: PA power box board
-  description: A machine board for a particle accelerator power box
+  description: A machine board for a particle accelerator power box.
   components:
     - type: Sprite
       state: engineering
@@ -50,7 +50,7 @@
   id: MachineParticleAcceleratorEmitterStarboardCircuitboard
   parent: BaseMachineCircuitboard
   name: PA starboard emitter board
-  description: A machine board for a particle accelerator left emitter
+  description: A machine board for a particle accelerator left emitter.
   components:
     - type: Sprite
       state: engineering
@@ -64,7 +64,7 @@
   id: MachineParticleAcceleratorEmitterForeCircuitboard
   parent: BaseMachineCircuitboard
   name: PA fore emitter board
-  description: A machine board for a particle accelerator center emitter
+  description: A machine board for a particle accelerator center emitter.
   components:
     - type: Sprite
       state: engineering
@@ -78,7 +78,7 @@
   id: MachineParticleAcceleratorEmitterPortCircuitboard
   parent: BaseMachineCircuitboard
   name: PA port emitter board
-  description: A machine board for a particle accelerator right emitter
+  description: A machine board for a particle accelerator right emitter.
   components:
     - type: Sprite
       state: engineering
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index 9a56acd9f77..e74ffa7be0b 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -2,7 +2,7 @@
   id: AutolatheMachineCircuitboard
   parent: BaseMachineCircuitboard
   name: autolathe machine board
-  description: A machine printed circuit board for an autolathe
+  description: A machine printed circuit board for an autolathe.
   components:
     - type: MachineBoard
       prototype: Autolathe
@@ -15,7 +15,7 @@
   parent: BaseMachineCircuitboard
   id: AutolatheHyperConvectionMachineCircuitboard
   name: hyper convection autolathe machine board
-  description: A machine printed circuit board for a hyper convection autolathe
+  description: A machine printed circuit board for a hyper convection autolathe.
   components:
   - type: MachineBoard
     prototype: AutolatheHyperConvection
@@ -72,8 +72,8 @@
 - type: entity
   id: BiofabricatorMachineCircuitboard
   parent: BaseMachineCircuitboard
-  name: biofabricator machine board
-  description: A machine printed circuit board for a biofabricator.
+  name: biocube fabricator machine board
+  description: A machine printed circuit board for a biocube fabricator.
   components:
     - type: MachineBoard
       prototype: Biofabricator
@@ -107,7 +107,7 @@
   id: AmmoTechFabCircuitboard
   parent: BaseMachineCircuitboard
   name: ammo techfab circuit board
-  description: A machine printed circuit board for an ammo techfab
+  description: A machine printed circuit board for an ammo techfab.
   components:
     - type: Sprite
       state: security
@@ -1529,3 +1529,16 @@
       Steel: 2
       Glass: 5
       Cable: 2
+
+- type: entity
+  parent: BaseMachineCircuitboard
+  id: CutterMachineCircuitboard
+  name: cutter machine board
+  components:
+  - type: MachineBoard
+    prototype: CutterMachine
+    stackRequirements:
+      Steel: 2
+      Capacitor: 1
+      Manipulator: 1
+      Cable: 1
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/atmos_alarms.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/atmos_alarms.yml
index 838ec637d33..0fea9b72279 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/atmos_alarms.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/atmos_alarms.yml
@@ -2,7 +2,7 @@
   id: AirAlarmElectronics
   parent: BaseElectronics
   name: air alarm electronics
-  description: An electronics board used in air alarms
+  description: An electronics board used in air alarms.
   components:
   - type: Sprite
     sprite: Objects/Misc/module.rsi
@@ -17,7 +17,7 @@
   id: FireAlarmElectronics
   parent: BaseElectronics
   name: fire alarm electronics
-  description: An electronics board used in fire alarms
+  description: An electronics board used in fire alarms.
   components:
   - type: Item
     storedRotation: 0
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/disposal.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/disposal.yml
index 7c2f2a6fda0..4e57705417c 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/disposal.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/disposal.yml
@@ -2,7 +2,7 @@
   id: MailingUnitElectronics
   parent: BaseElectronics
   name: mailing unit electronics
-  description: An electronics board used in mailing units
+  description: An electronics board used in mailing units.
   components:
     - type: Sprite
       sprite: Objects/Misc/module.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml
index a832bea7414..5ca355ec71b 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml
@@ -2,7 +2,7 @@
   id: DoorElectronics
   parent: BaseElectronics
   name: door electronics
-  description: An electronics board used in doors and airlocks
+  description: An electronics board used in doors and airlocks.
   components:
     - type: Sprite
       sprite: Objects/Misc/module.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/intercom.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/intercom.yml
index 3446a3ba4f9..c1a8a9d70bf 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/intercom.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/intercom.yml
@@ -2,7 +2,7 @@
   id: IntercomElectronics
   parent: BaseElectronics
   name: intercom electronics
-  description: An electronics board used in intercoms
+  description: An electronics board used in intercoms.
   components:
   - type: Sprite
     sprite: Objects/Misc/module.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml
index 2cb9b5233d0..acc82abebe4 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml
@@ -59,7 +59,7 @@
   parent: BaseItem
   id: VoiceTrigger
   name: voice trigger
-  description: Adds a machine link that is triggered by vocal keywords
+  description: Adds a machine link that is triggered by vocal keywords.
   components:
   - type: Sprite
     sprite: Objects/Devices/voice.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml
index 0b1769a3dad..823ee828625 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml
@@ -36,7 +36,7 @@
   name: holoparasite box
   parent: BoxCardboard
   id: BoxHoloparasite
-  description: A box containing a holoparasite injector
+  description: A box containing a holoparasite injector.
   components:
   - type: StorageFill
     contents:
@@ -52,7 +52,7 @@
   name: holoclown box
   parent: BoxCardboard
   id: BoxHoloclown
-  description: A box containing a holoclown injector
+  description: A box containing a holoclown injector.
   components:
   - type: StorageFill
     contents:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
index 2085422c9b5..e1a98792835 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
@@ -1,6 +1,7 @@
 - type: entity
   parent: BaseItem
-  id: ReinforcementRadioSyndicate
+  abstract: true
+  id: ReinforcementRadio
   name: syndicate reinforcement radio
   description: Call in a syndicate agent of questionable quality, instantly! Only basic equipment provided.
   components:
@@ -8,29 +9,47 @@
     sprite: Objects/Devices/communication.rsi
     layers:
     - state: old-radio
+  - type: UserInterface
+    interfaces:
+      enum.GhostRoleRadioUiKey.Key:
+        type: GhostRoleRadioBoundUserInterface
+  - type: ActivatableUI
+    key: enum.GhostRoleRadioUiKey.Key
+
+- type: entity
+  parent: ReinforcementRadio
+  id: ReinforcementRadioSyndicate
+  name: syndicate reinforcement radio
+  description: Call in a syndicate agent of questionable quality, instantly!
+  components:
   - type: GhostRole
-    name: ghost-role-information-syndicate-reinforcement-name
+    name: ghost-role-information-syndicate-reinforcement-spy-name
     description: ghost-role-information-syndicate-reinforcement-description
     rules: ghost-role-information-syndicate-reinforcement-rules
     raffle:
       settings: default
   - type: GhostRoleMobSpawner
-    prototype: MobHumanSyndicateAgent
-  - type: EmitSoundOnUse
-    sound: /Audio/Effects/Emotes/parp1.ogg
-  - type: UseDelay
-    delay: 300
+    prototype: MobHumanSyndicateAgentSpy
+    selectablePrototypes: ["SyndicateAgentMedic", "SyndicateAgentSpy", "SyndicateAgentThief"]
 
 - type: entity
-  parent: ReinforcementRadioSyndicate
+  parent: ReinforcementRadio
   id: ReinforcementRadioSyndicateNukeops # Reinforcement radio exclusive to nukeops uplink
+  name: nuclear operative radio
+  description: Call in a nuclear operative of questionable quality, instantly! Basic nukeop equipment provided.
   suffix: NukeOps
   components:
+  - type: GhostRole
+    name: ghost-role-information-nukeop-reinforcement-name
+    description: ghost-role-information-nukeop-reinforcement-description
+    rules: ghost-role-information-nukeop-reinforcement-rules
+    raffle:
+      settings: default
   - type: GhostRoleMobSpawner
     prototype: MobHumanSyndicateAgentNukeops
 
 - type: entity
-  parent: ReinforcementRadioSyndicate
+  parent: ReinforcementRadio
   id: ReinforcementRadioSyndicateAncestor
   name: syndicate genetic ancestor reinforcement radio
   description: Calls in a specially trained ancestor of your choosing to assist you.
@@ -55,7 +74,7 @@
     selectablePrototypes: ["SyndicateMonkeyNukeops", "SyndicateKoboldNukeops"]
 
 - type: entity
-  parent: ReinforcementRadioSyndicate
+  parent: ReinforcementRadio
   id: ReinforcementRadioSyndicateSyndiCat
   name: syndicat reinforcement radio
   description: Calls in a faithfully trained cat with a microbomb to assist you.
@@ -72,7 +91,7 @@
     sound: /Audio/Animals/cat_meow.ogg
 
 - type: entity
-  parent: ReinforcementRadioSyndicate
+  parent: ReinforcementRadio
   id: ReinforcementRadioSyndicateCyborgAssault # Reinforcement radio exclusive to nukeops uplink
   name: syndicate assault cyborg reinforcement radio
   description: Call in a well armed assault cyborg, instantly!
diff --git a/Resources/Prototypes/Entities/Objects/Devices/base_handheld.yml b/Resources/Prototypes/Entities/Objects/Devices/base_handheld.yml
new file mode 100644
index 00000000000..259323fede3
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Devices/base_handheld.yml
@@ -0,0 +1,11 @@
+- type: entity
+  abstract: true
+  parent: [BaseItem, PowerCellSlotSmallItem]
+  id: BaseHandheldComputer
+  components:
+  - type: ActivatableUIRequiresPowerCell
+  - type: ItemToggle
+    onUse: false # above component does the toggling
+  - type: PowerCellDraw
+    drawRate: 0
+    useRate: 20
diff --git a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
index 0563826a570..f9581149e21 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
@@ -2,7 +2,7 @@
   parent: BaseItem
   id: NotekeeperCartridge
   name: notekeeper cartridge
-  description: A program for keeping notes
+  description: A program for keeping notes.
   components:
   - type: Sprite
     sprite: Objects/Devices/cartridge.rsi
@@ -20,7 +20,7 @@
   parent: BaseItem
   id: NewsReaderCartridge
   name: news cartridge
-  description: A program for reading news
+  description: A program for reading news.
   components:
   - type: Sprite
     sprite: Objects/Devices/cartridge.rsi
@@ -38,7 +38,7 @@
   parent: BaseItem
   id: CrewManifestCartridge
   name: crew manifest cartridge
-  description: A program for listing your fellow crewmembers
+  description: A program for listing your fellow crewmembers.
   components:
     - type: Sprite
       sprite: Objects/Devices/cartridge.rsi
@@ -56,7 +56,7 @@
   parent: BaseItem
   id: NetProbeCartridge
   name: NetProbe cartridge
-  description: A program for getting the address and frequency of network devices
+  description: A program for getting the address and frequency of network devices.
   components:
     - type: Sprite
       sprite: Objects/Devices/cartridge.rsi
@@ -74,7 +74,7 @@
   parent: BaseItem
   id: LogProbeCartridge
   name: LogProbe cartridge
-  description: A program for getting access logs from devices
+  description: A program for getting access logs from devices.
   components:
     - type: Sprite
       sprite: Objects/Devices/cartridge.rsi
@@ -92,4 +92,4 @@
     - type: LogProbeCartridge
     - type: GuideHelp
       guides:
-        - Forensics
+      - Forensics
diff --git a/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml b/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml
index 78a513b0a9f..4c6b22cbfbc 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml
@@ -20,7 +20,7 @@
     disguiseProto: ChameleonDisguise
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   id: ChameleonDisguise
   name: Urist McKleiner
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml b/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
index 76904ea2685..1e075a66996 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
@@ -160,3 +160,5 @@
     - AllAccess
     tags:
     - CentralCommand
+    - NuclearOperative
+    - SyndicateAgent
diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
index 49ef98d7690..a5c3183ffbd 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
@@ -240,7 +240,7 @@
   parent: EncryptionKey
   id: EncryptionKeyFreelance
   name: freelancer encryption key
-  description: An encryption key used by freelancers, who may or may not have an affiliation. It looks like its worn out.
+  description: An encryption key used by freelancers, who may or may not have an affiliation. It looks like it's worn out.
   components:
     - type: EncryptionKey
       channels:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml b/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml
index a0ada5ebe34..fbb477de64b 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml
@@ -26,7 +26,7 @@
   - type: ForensicScanner
   - type: GuideHelp
     guides:
-      - Forensics
+    - Forensics
   - type: StealTarget
     stealGroup: ForensicScanner
 
@@ -34,7 +34,7 @@
   name: forensic scanner report
   parent: Paper
   id: ForensicReportPaper
-  description: 'Circumstantial evidence, at best'
+  description: Circumstantial evidence, at best.
   components:
   - type: Sprite
     sprite: Objects/Misc/bureaucracy.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml b/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
index d97cae2e6d6..1de50379189 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
@@ -12,7 +12,7 @@
           map: ["base"]
     - type: StepTrigger
       intersectRatio: 0.2
-      requiredTriggeredSpeed: 0
+      requiredTriggeredSpeed: 2
     - type: Mousetrap
     - type: TriggerOnStepTrigger
     - type: ClothingRequiredStepTrigger
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index cbaf8ab40cb..a05d3e2c3e1 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -113,6 +113,9 @@
   id: BaseMedicalPDA
   abstract: true
   components:
+  - type: ItemToggle
+    toggleLight: false
+    onUse: false
   - type: HealthAnalyzer
     scanDelay: 1
     scanningEndSound:
@@ -266,9 +269,7 @@
     borderColor: "#C18199"
   - type: Icon
     state: pda-clown
-  - type: Slippery
-    paralyzeTime: 4
-    launchForwardsMultiplier: 1.5
+  - type: Slippery # secretly made of bananium
   - type: StepTrigger
   - type: CollisionWake
     enabled: false
@@ -708,7 +709,7 @@
 - type: entity
   parent: BasePDA
   id: CentcomPDA
-  name: CentCom PDA
+  name: CentComm PDA
   description: Light green sign of walking bureaucracy.
   components:
   - type: Pda
@@ -737,6 +738,7 @@
     scanDelay: 0
   - type: CartridgeLoader
     uiKey: enum.PdaUiKey.Key
+    notificationsEnabled: false
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
diff --git a/Resources/Prototypes/Entities/Objects/Devices/radio.yml b/Resources/Prototypes/Entities/Objects/Devices/radio.yml
index 43f84fe404e..77b6cac2d37 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/radio.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/radio.yml
@@ -4,6 +4,7 @@
   parent: BaseItem
   id: RadioHandheld
   components:
+  - type: TelecomExempt
   - type: RadioMicrophone
     broadcastChannel: Handheld
   - type: RadioSpeaker
@@ -39,4 +40,4 @@
     sprite: Objects/Devices/securityhandy.rsi
   - type: Item
     sprite: Objects/Devices/securityhandy.rsi
-    heldPrefix: walkietalkie
\ No newline at end of file
+    heldPrefix: walkietalkie
diff --git a/Resources/Prototypes/Entities/Objects/Devices/station_map.yml b/Resources/Prototypes/Entities/Objects/Devices/station_map.yml
index 0d2f890a1d3..54fc4a70c5a 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/station_map.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/station_map.yml
@@ -1,9 +1,9 @@
 - type: entity
+  parent: BaseItem
   id: BaseHandheldStationMap
   name: station map
   description: Displays a readout of the current station.
   abstract: true
-  parent: BaseItem
   components:
     - type: StationMap
     - type: Sprite
@@ -34,14 +34,9 @@
 - type: entity
   id: HandheldStationMap
   parent:
-    - BaseHandheldStationMap
-    - PowerCellSlotSmallItem
+  - BaseHandheldStationMap
+  - BaseHandheldComputer
   suffix: Handheld, Powered
-  components:
-    - type: PowerCellDraw
-      drawRate: 0
-      useRate: 20
-    - type: ActivatableUIRequiresPowerCell
 
 - type: entity
   id: HandheldStationMapEmpty
diff --git a/Resources/Prototypes/Entities/Objects/Devices/wristwatch.yml b/Resources/Prototypes/Entities/Objects/Devices/wristwatch.yml
new file mode 100644
index 00000000000..7fbb4aecf61
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Devices/wristwatch.yml
@@ -0,0 +1,59 @@
+- type: entity
+  id: Wristwatch
+  parent: BaseItem
+  name: wristwatch
+  description: A cheap watch for telling time. How much did you waste playing Space Station 14?
+  components:
+  - type: Sprite
+    sprite: Objects/Devices/wristwatch.rsi
+    layers:
+    - state: wristwatch
+    - map: [ "enum.ClockVisualLayers.MinuteHand"]
+    - map: [ "enum.ClockVisualLayers.HourHand"]
+  - type: Clock
+  - type: Item
+    sprite: Objects/Devices/wristwatch.rsi
+    size: Small
+  - type: Clothing
+    sprite: Objects/Devices/wristwatch.rsi
+    slots:
+    - gloves
+  - type: Appearance
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: StaticPrice
+    price: 50
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageGroupTrigger
+        damageGroup: Brute
+        damage: 25
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Breakage" ]
+
+- type: entity
+  id: WristwatchGold
+  parent: Wristwatch
+  name: gold watch
+  description: A fancy watch worth more than your kidney. It was owned by the notorious Syndicate mobster Vunibaldo "200 Pound Horse Meat Grinder" Frediani.
+  components:
+  - type: Sprite
+    sprite: Objects/Devices/goldwatch.rsi
+    layers:
+    - state: goldwatch
+    - map: [ "enum.ClockVisualLayers.MinuteHand"]
+    - map: [ "enum.ClockVisualLayers.HourHand"]
+  - type: Item
+    sprite: Objects/Devices/goldwatch.rsi
+  - type: Clothing
+    sprite: Objects/Devices/goldwatch.rsi
+  - type: StaticPrice
+    price: 500 #if you ever increase the price of kidneys, increase this too.
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
index 8cb3d88ede2..243a816a478 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
@@ -162,8 +162,6 @@
     sound:
        path: /Audio/Items/bikehorn.ogg
   - type: Slippery
-    paralyzeTime: 4
-    launchForwardsMultiplier: 1.5
   - type: StepTrigger
   - type: CollisionWake
     enabled: false
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml
index 7224efa9e02..3e2f02f8283 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml
@@ -21,6 +21,7 @@
     quickEquip: false
     slots:
     - back
+    - suitStorage
     sprite: Objects/Fun/Instruments/eguitar.rsi
   - type: Tag
     tags:
@@ -50,6 +51,7 @@
     quickEquip: false
     slots:
     - back
+    - suitStorage
     sprite: Objects/Fun/Instruments/bassguitar.rsi
   - type: Tag
     tags:
@@ -78,6 +80,7 @@
     quickEquip: false
     slots:
     - back
+    - suitStorage
     sprite: Objects/Fun/Instruments/rockguitar.rsi
   - type: Tag
     tags:
@@ -120,6 +123,7 @@
     quickEquip: false
     slots:
     - back
+    - suitStorage
     sprite: Objects/Fun/Instruments/guitar.rsi
   - type: Wieldable
   - type: Damageable # Smash it! Does 20 damage a hit, but breaks after 1 hit.
@@ -158,7 +162,7 @@
   parent: BaseHandheldInstrument
   id: GuitarlessFretsInstrument
   name: guitarless frets
-  description: who even needs a body?
+  description: Who even needs a body?
   suffix: Admeme #the sound is awful
   components:
   - type: Instrument
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml
index 191bb75e50e..43fd0e265f6 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml
@@ -148,7 +148,7 @@
     state: toms
 
 - type: entity
-  parent: [ BasePlaceableInstrument, ConstructibleMachine]
+  parent: [ BasePlaceableInstrumentRotatable, ConstructibleMachine]
   id: DawInstrument
   name: digital audio workstation
   description: Cutting edge music technology, straight from the 90s.
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/backgammon.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/backgammon.yml
index ab404b88a3e..965b25dbc00 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/backgammon.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/backgammon.yml
@@ -18,7 +18,7 @@
   id: BackgammonBoardTabletop
   name: backgammon
   parent: BaseBoardTabletop
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Fun/Tabletop/backgammon_tabletop.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml
index 351396b5b91..f7d9e0973a3 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml
@@ -10,6 +10,9 @@
       setup:
         !type:TabletopEmptySetup
         boardPrototype: Crowbar
+    - type: Tag
+      tags:
+        - TabletopBoard
 
 - type: entity
   id: BaseTabletopPiece # Board piece
@@ -28,7 +31,7 @@
   id: BaseBoardTabletop
   name: baseboard
   abstract: true
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Tag
     tags:
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/checkers.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/checkers.yml
index 69302548d18..6c206ca26f7 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/checkers.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/checkers.yml
@@ -24,7 +24,7 @@
   id: *checkerboard
   name: checkerboard
   parent: BaseBoardTabletop
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Fun/Tabletop/chessboard_tabletop.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/chess.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/chess.yml
index b31b7803bae..aeba3918c49 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/chess.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/chess.yml
@@ -20,7 +20,7 @@
   id: ChessBoardTabletop
   name: chessboard
   parent: BaseBoardTabletop
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Fun/Tabletop/chessboard_tabletop.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/dnd.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/dnd.yml
index 51f17d55b99..9b00ef5e018 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/dnd.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/dnd.yml
@@ -86,7 +86,7 @@
   parent: BaseBoardTabletop
   id: GrassBoardTabletop
   name: grass battlemap
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Fun/Tabletop/Battlemaps/grassbm_tabletop.rsi
@@ -98,7 +98,7 @@
   parent: BaseBoardTabletop
   id: MoonBoardTabletop
   name: grass battlemap
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Fun/Tabletop/Battlemaps/moonbm_tabletop.rsi
@@ -108,7 +108,7 @@
   parent: BaseBoardTabletop
   id: SandBoardTabletop
   name: sand battlemap
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Fun/Tabletop/Battlemaps/sandbm_tabletop.rsi
@@ -118,7 +118,7 @@
   parent: BaseBoardTabletop
   id: SnowBoardTabletop
   name: snow battlemap
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Fun/Tabletop/Battlemaps/snowbm_tabletop.rsi
@@ -128,7 +128,7 @@
   parent: BaseBoardTabletop
   id: ShipBoardTabletop
   name: ship battlemap
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Fun/Tabletop/Battlemaps/shipbm_tabletop.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/parchis.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/parchis.yml
index bb5fdf1f0bf..b608f4e7876 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/parchis.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/parchis.yml
@@ -20,7 +20,7 @@
   id: ParchisBoardTabletop
   name: parchís
   parent: BaseBoardTabletop
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Fun/Tabletop/parchis_tabletop.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Fun/darts.yml b/Resources/Prototypes/Entities/Objects/Fun/darts.yml
index c0b5eb33999..dfcb0c68f1e 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/darts.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/darts.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: dart
-  description: light throwing dart for playing darts. Don't get in the eye!
+  description: Light throwing dart for playing darts. Don't get in the eye!
   parent: BaseItem
   id: Dart
   components:
@@ -10,6 +10,7 @@
     offset: 0.0,0.0
   - type: ThrowingAngle
     angle: 315
+  - type: LandAtCursor
   - type: Fixtures
     fixtures:
       fix1:
@@ -83,6 +84,7 @@
             max: 1
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+  - type: BalloonPopper
 
 - type: entity
   parent: Dart
diff --git a/Resources/Prototypes/Entities/Objects/Fun/error.yml b/Resources/Prototypes/Entities/Objects/Fun/error.yml
index 8f3fc211378..e4b9af61e0a 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/error.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/error.yml
@@ -16,7 +16,8 @@
         - ReagentId: Nutriment
           Quantity: 5
   - type: Slippery
-    launchForwardsMultiplier: 5
+    paralyzeTime: 3
+    launchForwardsMultiplier: 3
   - type: StepTrigger
     intersectRatio: 0.2
   - type: CollisionWake
@@ -28,14 +29,14 @@
       slips:
         shape:
           !type:PhysShapeAabb
-          bounds: "-0.2,-0.2,0.2,0.2"
+          bounds: "-0.4,-0.3,0.4,0.3"
         hard: false
         layer:
         - SlipLayer
       fix1:
         shape:
           !type:PhysShapeAabb
-          bounds: "-0.2,-0.2,0.2,0.2"
+          bounds: "-0.4,-0.3,0.4,0.3"
         density: 30
         mask:
         - ItemMask
diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
index d8932bc0e5d..a5b589181c1 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
@@ -19,6 +19,10 @@
     - Figurine
   - type: StealTarget
     stealGroup: Figurines
+  - type: UseDelay
+    delay: 10
+  - type: Speech
+    speechSounds: Pai # it just sounds better
 
 - type: entity
   parent: BaseFigurine
@@ -28,6 +32,8 @@
   components:
   - type: Sprite
     state: hop
+  - type: SpeakOnUse
+    pack: FigurinesHoP
 
 - type: entity
   parent: BaseFigurine
@@ -37,6 +43,8 @@
   components:
   - type: Sprite
     state: passenger
+  - type: SpeakOnUse
+    pack: FigurinesPassenger
 
 - type: entity
   parent: BaseFigurine
@@ -46,6 +54,8 @@
   components:
   - type: Sprite
     state: passenger_greytide
+  - type: SpeakOnUse
+    pack: FigurinesGreytider
 
 - type: entity
   parent: BaseFigurine
@@ -55,6 +65,8 @@
   components:
   - type: Sprite
     state: clown
+  - type: SpeakOnUse
+    pack: FigurinesClown
 
 - type: entity
   parent: BaseFigurine
@@ -64,7 +76,8 @@
   components:
   - type: Sprite
     state: holoclown
-
+  - type: SpeakOnUse
+    pack: FigurinesHoloClown
 
 - type: entity
   parent: BaseFigurine
@@ -74,6 +87,8 @@
   components:
   - type: Sprite
     state: mime
+  - type: SpeakOnUse
+    pack: FigurinesMime
 
 - type: entity
   parent: BaseFigurine
@@ -83,6 +98,8 @@
   components:
   - type: Sprite
     state: musician
+  - type: SpeakOnUse
+    pack: FigurinesMusician
 
 - type: entity
   parent: BaseFigurine
@@ -92,6 +109,8 @@
   components:
   - type: Sprite
     state: boxer
+  # - type: SpeakOnUse # TODO add something
+  #   pack: FigurinesBoxer
 
 - type: entity
   parent: BaseFigurine
@@ -101,6 +120,8 @@
   components:
   - type: Sprite
     state: captain
+  - type: SpeakOnUse
+    pack: FigurinesCaptain
 
 - type: entity
   parent: BaseFigurine
@@ -110,6 +131,8 @@
   components:
   - type: Sprite
     state: hos
+  - type: SpeakOnUse
+    pack: FigurinesHoS
 
 - type: entity
   parent: BaseFigurine
@@ -119,6 +142,8 @@
   components:
   - type: Sprite
     state: warden
+  - type: SpeakOnUse
+    pack: FigurinesWarden
 
 - type: entity
   parent: BaseFigurine
@@ -128,6 +153,8 @@
   components:
   - type: Sprite
     state: detective
+  - type: SpeakOnUse
+    pack: FigurinesDetective
 
 - type: entity
   parent: BaseFigurine
@@ -137,6 +164,8 @@
   components:
   - type: Sprite
     state: security
+  - type: SpeakOnUse
+    pack: FigurinesSecurity
 
 - type: entity
   parent: BaseFigurine
@@ -146,6 +175,8 @@
   components:
   - type: Sprite
     state: lawyer
+  - type: SpeakOnUse
+    pack: FigurinesLawyer
 
 - type: entity
   parent: BaseFigurine
@@ -155,6 +186,8 @@
   components:
   - type: Sprite
     state: cargotech
+  - type: SpeakOnUse
+    pack: FigurinesCargoTech
 
 - type: entity
   parent: BaseFigurine
@@ -164,6 +197,8 @@
   components:
   - type: Sprite
     state: salvage
+  - type: SpeakOnUse
+    pack: FigurinesSalvage
 
 - type: entity
   parent: BaseFigurine
@@ -173,6 +208,8 @@
   components:
   - type: Sprite
     state: qm
+  - type: SpeakOnUse
+    pack: FigurinesQM
 
 - type: entity
   parent: BaseFigurine
@@ -182,6 +219,8 @@
   components:
   - type: Sprite
     state: ce
+  - type: SpeakOnUse
+    pack: FigurinesCE
 
 - type: entity
   parent: BaseFigurine
@@ -191,6 +230,8 @@
   components:
   - type: Sprite
     state: engineer
+  - type: SpeakOnUse
+    pack: FigurinesEngineer
 
 - type: entity
   parent: BaseFigurine
@@ -200,6 +241,8 @@
   components:
   - type: Sprite
     state: atmos
+  - type: SpeakOnUse
+    pack: FigurinesAtmosTech
 
 - type: entity
   parent: BaseFigurine
@@ -209,6 +252,8 @@
   components:
   - type: Sprite
     state: rd
+  - type: SpeakOnUse
+    pack: FigurinesRD
 
 - type: entity
   parent: BaseFigurine
@@ -218,6 +263,8 @@
   components:
   - type: Sprite
     state: scientist
+  - type: SpeakOnUse
+    pack: FigurinesScientist
 
 - type: entity
   parent: BaseFigurine
@@ -227,6 +274,8 @@
   components:
   - type: Sprite
     state: cmo
+  - type: SpeakOnUse
+    pack: FigurinesCMO
 
 - type: entity
   parent: BaseFigurine
@@ -236,6 +285,8 @@
   components:
   - type: Sprite
     state: chemist
+  - type: SpeakOnUse
+    pack: FigurinesChemist
 
 - type: entity
   parent: BaseFigurine
@@ -245,6 +296,8 @@
   components:
   - type: Sprite
     state: paramedic
+  - type: SpeakOnUse
+    pack: FigurinesParamedic
 
 - type: entity
   parent: BaseFigurine
@@ -254,6 +307,8 @@
   components:
   - type: Sprite
     state: medical
+  - type: SpeakOnUse
+    pack: FigurinesDoctor
 
 - type: entity
   parent: BaseFigurine
@@ -263,6 +318,8 @@
   components:
   - type: Sprite
     state: librarian
+  - type: SpeakOnUse
+    pack: FigurinesLibrarian
 
 - type: entity
   parent: BaseFigurine
@@ -272,6 +329,8 @@
   components:
   - type: Sprite
     state: chaplain
+  - type: SpeakOnUse
+    pack: FigurinesChaplain
 
 - type: entity
   parent: BaseFigurine
@@ -281,6 +340,8 @@
   components:
   - type: Sprite
     state: chef
+  - type: SpeakOnUse
+    pack: FigurinesChef
 
 - type: entity
   parent: BaseFigurine
@@ -290,6 +351,8 @@
   components:
   - type: Sprite
     state: bartender
+  - type: SpeakOnUse
+    pack: FigurinesBartender
 
 - type: entity
   parent: BaseFigurine
@@ -299,6 +362,8 @@
   components:
   - type: Sprite
     state: botanist
+  - type: SpeakOnUse
+    pack: FigurinesBotanist
 
 - type: entity
   parent: BaseFigurine
@@ -308,6 +373,8 @@
   components:
   - type: Sprite
     state: janitor
+  - type: SpeakOnUse
+    pack: FigurinesJanitor
 
 - type: entity
   parent: BaseFigurine
@@ -317,6 +384,8 @@
   components:
   - type: Sprite
     state: nukie
+  - type: SpeakOnUse
+    pack: FigurinesNukie
 
 - type: entity
   parent: BaseFigurine
@@ -326,6 +395,8 @@
   components:
   - type: Sprite
     state: nukie_elite
+  - type: SpeakOnUse
+    pack: FigurinesNukieElite
 
 - type: entity
   parent: BaseFigurine
@@ -335,6 +406,8 @@
   components:
   - type: Sprite
     state: nukie_commander
+  - type: SpeakOnUse
+    pack: FigurinesNukieCommander
 
 - type: entity
   parent: BaseFigurine
@@ -344,6 +417,8 @@
   components:
   - type: Sprite
     state: footsoldier
+  - type: SpeakOnUse
+    pack: FigurinesFootsoldier
 
 - type: entity
   parent: BaseFigurine
@@ -353,6 +428,8 @@
   components:
   - type: Sprite
     state: wizard
+  - type: SpeakOnUse
+    pack: FigurinesWizard
 
 - type: entity
   parent: BaseFigurine
@@ -362,6 +439,8 @@
   components:
   - type: Sprite
     state: wizard_fake
+  - type: SpeakOnUse
+    pack: FigurinesWizard
 
 #Nonhuman Figurines
 
@@ -373,6 +452,8 @@
   components:
   - type: Sprite
     state: spacedragon
+  - type: SpeakOnUse
+    pack: FigurinesSpaceDragon
 
 - type: entity
   parent: BaseFigurine
@@ -382,6 +463,8 @@
   components:
   - type: Sprite
     state: queen
+  # - type: SpeakOnUse # TODO add something
+  #   pack: FigurinesQueen
 
 - type: entity
   parent: BaseFigurine
@@ -391,6 +474,8 @@
   components:
   - type: Sprite
     state: ratking
+  - type: SpeakOnUse
+    pack: FigurinesRatKing
 
 - type: entity
   parent: BaseFigurine
@@ -400,6 +485,8 @@
   components:
   - type: Sprite
     state: ratservant
+  - type: SpeakOnUse
+    pack: FigurinesRatServant
 
 - type: entity
   parent: BaseFigurine
@@ -409,6 +496,8 @@
   components:
   - type: Sprite
     state: mouse
+  - type: SpeakOnUse
+    pack: FigurinesMouse
 
 - type: entity
   parent: BaseFigurine
@@ -418,6 +507,8 @@
   components:
   - type: Sprite
     state: slime
+  - type: SpeakOnUse
+    pack: FigurinesSlime
 
 - type: entity
   parent: BaseFigurine
@@ -427,6 +518,8 @@
   components:
   - type: Sprite
     state: hamlet
+  - type: SpeakOnUse
+    pack: FigurinesHamlet
 
 #TODO: Convert these to the new figurine sprite template and rename their sprite name.
 #Yes, these are humanoids, but they need to be updated first.
diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
index 02bbce2843b..8e1dd74186e 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
@@ -17,7 +17,7 @@
         type: InstrumentBoundUserInterface
         requireInputValidation: false
       enum.StationMapUiKey.Key:
-        type: UntrackedStationMapBoundUserInterface
+        type: StationMapBoundUserInterface
         requireInputValidation: false
   - type: Sprite
     sprite: Objects/Fun/pai.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index d12154ea29d..282ff2ef072 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -184,6 +184,19 @@
     energy: 2
   - type: RgbLightController
     layers: [ 0 ]
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: bee-inhand-left
+        shader: unshaded
+      right:
+      - state: bee-inhand-right
+        shader: unshaded
+  - type: Clothing
+    clothingVisuals:
+      head:
+      - state: bee-equipped-HELMET
+        shader: unshaded
 
 - type: entity
   parent: BasePlushie
@@ -198,7 +211,7 @@
   parent: BasePlushie
   id: PlushieRouny
   name: rouny plushie
-  description: Rouny
+  description: Rouny.
   components:
   - type: Sprite
     state: plushie_rouny
@@ -250,7 +263,7 @@
   parent: BasePlushie
   id: PlushieLizard #Weh!
   name: lizard plushie
-  description: An adorable stuffed toy that resembles a lizardperson. Made by CentCom as a token initiative to combat speciesism in work environments. "Welcome your new colleagues as you do this plush, with open arms!"
+  description: An adorable stuffed toy that resembles a lizardperson. Made by CentComm as a token initiative to combat speciesism in work environments. "Welcome your new colleagues as you do this plush, with open arms!"
   components:
   - type: Sprite
     state: plushie_lizard
@@ -288,6 +301,12 @@
           Quantity: 10
         - ReagentId: JuiceThatMakesYouWeh
           Quantity: 10
+  - type: Clothing
+    quickEquip: false
+    sprite: Objects/Fun/toys.rsi
+    equippedPrefix: lizard
+    slots:
+    - HEAD
 
 - type: entity
   parent: PlushieLizard
@@ -302,7 +321,7 @@
   parent: BasePlushie
   id: PlushieSpaceLizard #ᵂᵉʰ!
   name: space lizard plushie
-  description: An adorable stuffed toy that resembles a lizardperson in an EVA suit. Made by CentCom as a token initiative to combat speciesism in space environments. "Welcome your new colleges as you do this plush, with open arms!"
+  description: An adorable stuffed toy that resembles a lizardperson in an EVA suit. Made by CentComm as a token initiative to combat speciesism in space environments. "Welcome your new colleges as you do this plush, with open arms!"
   components:
   - type: Sprite
     state: plushie_spacelizard
@@ -546,6 +565,15 @@
     energy: 2
   - type: RgbLightController
     layers: [ 0 ]
+  - type: Item
+    heldPrefix: rainbowcarpplush
+    inhandVisuals:
+      left:
+      - state: rainbowcarpplush-inhand-left
+        shader: unshaded
+      right:
+      - state: rainbowcarpplush-inhand-right
+        shader: unshaded
 
 - type: entity
   parent: PlushieCarp
@@ -876,6 +904,7 @@
   - type: Sprite
   - type: Item
     size: Normal
+  - type: PacifismAllowedGun
 
 - type: entity
   parent: FoamWeaponBase
@@ -1251,7 +1280,7 @@
   parent: BasePlushie
   id: ToyAmongPequeno
   name: among pequeño
-  description: sus!
+  description: Sus!
   components:
   - type: Sprite
     sprite: Objects/Fun/pequeno.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index 596adb9885f..3a5861055bc 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -350,8 +350,21 @@
   components:
   - type: Stack
     stackType: Diamond
+    baseLayer: base
+    layerStates:
+    - diamond
+    - diamond_2
+    - diamond_3
   - type: Sprite
     state: diamond
+    layers:
+    - state: diamond
+      map: ["base"]
+  - type: StaticPrice
+    price: 0
+  - type: StackPrice
+    price: 500
+  - type: Appearance
   - type: Item
     heldPrefix: diamond
   - type: Extractable
diff --git a/Resources/Prototypes/Entities/Objects/Materials/ore.yml b/Resources/Prototypes/Entities/Objects/Materials/ore.yml
index bf7dbfad5a3..136d20cc81b 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/ore.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/ore.yml
@@ -66,6 +66,37 @@
   - type: Stack
     count: 1
 
+- type: entity
+  parent: OreBase
+  id: DiamondOre
+  name: diamond ore
+  suffix: Full
+  components:
+  - type: Stack
+    stackType: DiamondOre
+  - type: Sprite
+    state: diamond
+  - type: Material
+  - type: PhysicalComposition
+    materialComposition:
+      RawDiamond: 500
+  - type: Extractable
+    grindableSolutionName: diamondore
+  - type: SolutionContainerManager
+    solutions:
+      diamondore:
+        reagents:
+        - ReagentId: Carbon
+          Quantity: 20
+
+- type: entity
+  parent: DiamondOre
+  id: DiamondOre1
+  suffix: Single
+  components:
+  - type: Stack
+    count: 1
+
 - type: entity
   parent: OreBase
   id: SteelOre
diff --git a/Resources/Prototypes/Entities/Objects/Materials/scrap.yml b/Resources/Prototypes/Entities/Objects/Materials/scrap.yml
new file mode 100644
index 00000000000..6530e3b1701
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Materials/scrap.yml
@@ -0,0 +1,408 @@
+- type: entity
+  parent: BaseItem
+  id: BaseScrap
+  abstract: true
+  name: scrap
+  description: Worthless junk. You could probably get some materials out of it though.
+  suffix: Scrap
+  components:
+  - type: Sprite
+    sprite: Objects/Materials/Scrap/generic.rsi
+  - type: Item
+    sprite: Objects/Materials/Scrap/generic.rsi
+    size: Normal
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: FlimsyMetallic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 150
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Tag
+    tags:
+    - Recyclable
+
+- type: entity
+  parent: BaseScrap
+  id: ScrapSteel
+  name: blasted steel pile
+  description: An pile of steel welded together in extreme heat. It's of a decent size overall; you could probably get a fair amount of sheets out of it.
+  components:
+  - type: Sprite
+    layers:
+      - state: metal-1
+        map: [ "base" ]
+  - type: Item
+    size: Ginormous
+    heldPrefix: metal
+  - type: MultiHandedItem
+  - type: RandomSprite
+    available:
+    - base:
+        metal-1: ""
+        metal-2: ""
+        metal-3: ""
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 3000 # 30 sheets
+
+- type: entity
+  parent: BaseScrap
+  id: ScrapGlass
+  name: scrap circuitry
+  description: A huge lump of various circuits, strangely fused together. You could likely extract some materials out of this.
+  components:
+  - type: Sprite
+    layers:
+    - state: glass-1
+      map: [ "base" ]
+  - type: Item
+    heldPrefix: "glass"
+    size: Large
+    shape:
+    - 0,0,2,2 # 3x3
+  - type: RandomSprite
+    available:
+    - base:
+        glass-1: ""
+        glass-2: ""
+        glass-3: ""
+        glass-4: ""
+        glass-5: ""
+        glass-6: ""
+  - type: PhysicalComposition
+    materialComposition:
+      Glass: 1500 # 15 sheets
+      Steel: 500 # 5 sheets
+
+- type: entity
+  parent: BaseScrap
+  id: ScrapAirlock1
+  name: airlock door
+  description: This used to keep air in. Now it doesn't seem to be doing anything at all.
+  components:
+  - type: Sprite
+    layers:
+    - state: junk-airlock-1
+      map: [ "base" ]
+  - type: RandomSprite
+    available:
+    - base:
+        junk-airlock-1: ""
+        junk-airlock-2: ""
+  - type: Item
+    size: Ginormous
+    heldPrefix: "airlock"
+  - type: MultiHandedItem
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 1500 # 15 sheets
+
+- type: entity
+  parent: BaseScrap
+  id: ScrapAirlock2
+  name: airlock light
+  description: Serves it right for flashing red all those times.
+  components:
+  - type: Sprite
+    layers:
+    - state: junk-airlock-3
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,3,0
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 200 # 2 sheets
+      Glass: 500 # 5 sheets
+
+- type: entity
+  parent: BaseScrap
+  id: ScrapBucket
+  name: busted bucket
+  description: Dear god...
+  components:
+  - type: Sprite
+    layers:
+    - state: junk-bucket
+  - type: PhysicalComposition
+    materialComposition:
+      Plastic: 300 # 3 sheets
+
+- type: entity
+  parent: BaseScrap
+  id: ScrapCamera
+  name: broken camera
+  description: It might still be watching.
+  components:
+  - type: Sprite
+    layers:
+    - state: junk-camera
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 500 # 5 sheets
+      Glass: 100 # 1 sheet
+
+- type: entity
+  parent: BaseScrap
+  id: ScrapCanister1
+  name: canister handle
+  description: Helpful for holding a canister. Now you just need the actual canister part.
+  components:
+  - type: Sprite
+    layers:
+    - state: junk-canister-1
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 300 # 3 sheets
+
+- type: entity
+  parent: BaseScrap
+  id: ScrapCanister2
+  name: canister valve
+  description: A valve from a gas canister.
+  components:
+  - type: Sprite
+    layers:
+    - state: junk-canister-2
+  - type: Item
+    size: Small
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 200 # 2 sheets
+
+- type: entity
+  parent: BaseScrap
+  id: ScrapCloset
+  name: closet door
+  description: A blown off door from a maintenance closet. Looks like a nice piece of wall decor.
+  components:
+  - type: Sprite
+    layers:
+    - state: junk-closet
+  - type: MultiHandedItem
+  - type: Item
+    heldPrefix: closet
+    size: Huge
+    shape:
+    - 0,0,5,2
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 1500 # 15 sheets
+
+- type: entity
+  parent: BaseScrap
+  id: ScrapFaxMachine
+  name: fax machine
+  description: The unfortunate result of one too many ASCII arts being sent to Central Command.
+  components:
+  - type: Sprite
+    layers:
+    - state: junk-fax
+  - type: Item
+    size: Huge
+  - type: PhysicalComposition
+    materialComposition:
+      Plastic: 800 # 8 sheets
+      Steel: 200 # 2 sheets
+
+- type: entity
+  parent: BaseScrap
+  id: ScrapFireExtinguisher
+  name: split fire extinguisher
+  description: The large gash down the center makes you worry for the previous user.
+  components:
+  - type: Sprite
+    layers:
+    - state: junk-fireextinguisher
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 600 # 6 sheets
+
+- type: entity
+  parent: BaseScrap
+  id: ScrapFirelock1
+  name: firelock door
+  description: At least you still know what it's meant for.
+  components:
+  - type: Sprite
+    layers:
+    - state: junk-firelock-1
+  - type: Item
+    size: Ginormous
+    heldPrefix: firelock-1
+  - type: MultiHandedItem
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 2000 # 20 sheets
+
+- type: entity
+  parent: BaseScrap
+  id: ScrapFirelock2
+  name: firelock door
+  description: OH! That's where the other half went!
+  components:
+  - type: Sprite
+    layers:
+    - state: junk-firelock-2
+  - type: Item
+    size: Ginormous
+    heldPrefix: firelock-2
+  - type: MultiHandedItem
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 2000 # 20 sheets
+
+- type: entity
+  parent: BaseScrap
+  id: ScrapFirelock3
+  name: firelock frame
+  components:
+  - type: Sprite
+    layers:
+    - state: junk-firelock-3
+  - type: Item
+    size: Large
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 700 # 7 sheets
+
+- type: entity
+  parent: BaseScrap
+  id: ScrapIntercom
+  name: intercom scrap
+  description: You wish it at least came with some encryption keys.
+  components:
+  - type: Sprite
+    layers:
+    - state: junk-intercom-1
+      map: [ "base" ]
+  - type: RandomSprite
+    available:
+    - base:
+        junk-intercom-1: ""
+        junk-intercom-2: ""
+        junk-intercom-3: ""
+  - type: Item
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 400 # 4 sheets
+      Plastic: 300 # 3 sheets
+
+- type: entity
+  parent: BaseScrap
+  id: ScrapJetpack
+  name: busted jetpack
+  description: Looks like it won't be flying any more.
+  components:
+  - type: Sprite
+    layers:
+    - state: junk-jetpack
+  - type: Item
+    size: Huge
+    heldPrefix: jetpack
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 1000 # 10 sheets
+      Plastic: 200 # 2 sheets
+
+- type: entity
+  parent: BaseScrap
+  id: ScrapMedkit
+  name: snapped medkit
+  description: Hopefully they got some use out of it.
+  components:
+  - type: Sprite
+    layers:
+    - state: junk-medkit-1
+      map: [ "base" ]
+  - type: RandomSprite
+    available:
+    - base:
+        junk-medkit-1: ""
+        junk-medkit-2: ""
+  - type: Item
+    size: Large
+  - type: PhysicalComposition
+    materialComposition:
+      Plastic: 500 # 5 sheets
+
+- type: entity
+  parent: BaseScrap
+  id: ScrapMopBucket
+  name: half a mop bucket
+  description: Tiders die. Janitors survive.
+  components:
+  - type: Sprite
+    layers:
+    - state: junk-mop-bucket
+  - type: Item
+    size: Huge
+  - type: PhysicalComposition
+    materialComposition:
+      Plastic: 1500 # 15 sheets
+
+- type: entity
+  parent: BaseScrap
+  id: ScrapPAI
+  name: personal ai device
+  description: A buddy! You still in there? Hello? Buddy???
+  components:
+  - type: Sprite
+    layers:
+    - state: junk-pai
+  - type: Item
+    size: Small
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 300 # 3 sheets
+      Plastic: 200 # 2 sheets
+
+- type: entity
+  parent: BaseScrap
+  id: ScrapPAIGold
+  name: gilded personal ai device
+  description: Wow! What a one-in-a-million find! This would be worth a fortune... if it was in good condition.
+  components:
+  - type: Sprite
+    layers:
+    - state: junk-pai-gold
+  - type: Item
+    size: Small
+  - type: PhysicalComposition
+    materialComposition:
+      Gold: 100 # 1 sheet
+      Plastic: 400 # 4 sheets
+
+- type: entity
+  parent: BaseScrap
+  id: ScrapTube
+  name: shattered sample tube
+  description: A glass tube containing some kind of rare sample. Or at least, it used to contain it. Not much left in there now.
+  components:
+  - type: Sprite
+    layers:
+    - state: tube
+      map: [ "base" ]
+  - type: RandomSprite
+    available:
+    - base:
+        tube: ""
+        tube-bl: ""
+        tube-bk: ""
+        tube-g: ""
+        tube-r: ""
+        tube-y: ""
+  - type: Item
+    size: Small
+  - type: PhysicalComposition
+    materialComposition:
+      Glass: 500 # 5 sheets
+      Plastic: 100 # 1 sheet
+
+
+
diff --git a/Resources/Prototypes/Entities/Objects/Misc/arabianlamp.yml b/Resources/Prototypes/Entities/Objects/Misc/arabianlamp.yml
new file mode 100644
index 00000000000..a15e30fbc72
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Misc/arabianlamp.yml
@@ -0,0 +1,139 @@
+- type: entity
+  name: lamp
+  parent: BaseItem
+  id: ArabianLamp
+  description: Why the heck won't this piece of junk open!?
+  components:
+  - type: Appearance
+  - type: AccessReader
+    access: [ [ "CentralCommand" ] ]
+    breakOnEmag: false
+  - type: Lock
+    lockOnClick: false
+    breakOnEmag: false
+  - type: EntityStorage
+    capacity: 1 # Its smol.
+    itemCanStoreMobs: false #  just leaving this here explicitly since I know at some point someone will want to use this to hold a mob. This also prevents it from becoming His Grace.
+  # - type: StorageFill 
+    # contents: 
+      # - id: PuddleSparkle # Ha! Cute. Unfortunately it despawns before the container is likely to open. 
+  - type: ContainerContainer
+    containers:
+      entity_storage: !type:Container
+  - type: Item
+    size: Normal
+    heldPrefix: lamp
+    sprite: Objects/Misc/arabianlamp.rsi
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      right:
+      - state: inhand-right
+  - type: MeleeWeapon
+    wideAnimationRotation: 180
+    damage:
+      types:
+        Blunt: 6
+  - type: ItemToggleMeleeWeapon
+    activatedDamage:
+        types:
+            Blunt: 6
+            Heat: 3
+    activatedSoundOnHit:
+      path: /Audio/Weapons/Guns/Hits/energy_meat1.ogg
+      params:
+        variation: 0.250
+        volume: -10
+    activatedSoundOnHitNoDamage:
+      path: /Audio/Weapons/Guns/Hits/energy_meat1.ogg
+      params:
+        variation: 0.250
+        volume: -12
+    deactivatedSoundOnHitNoDamage:
+      collection: MetalThud
+  - type: ItemToggle
+    predictable: false
+    soundActivate:
+      collection: lighterOnSounds
+    soundDeactivate:
+      path: /Audio/Items/candle_blowing.ogg
+      params:
+        variation: 0.05
+        volume: 10
+  - type: ItemToggleHot
+  - type: Sprite
+    sprite: Objects/Misc/arabianlamp.rsi
+    layers:
+    - state: lamp 
+      map: [ "enum.StorageVisualLayers.Base" ]
+    - state: lamptop
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: flame
+      visible: false
+      shader: unshaded
+      map: ["enum.ToggleVisuals.Layer"]
+  - type: GenericVisualizer
+    visuals:
+      enum.ToggleVisuals.Toggled:
+        enum.ToggleVisuals.Layer:
+          True: { visible: true }
+          False: { visible: false }
+  - type: EntityStorageVisuals
+    stateBaseClosed: lamp
+    stateDoorOpen: lamp
+    stateDoorClosed: lamptop
+  - type: ToggleableLightVisuals
+    spriteLayer: flame
+    inhandVisuals:
+      left:
+      - state: inhand-left-flame
+        shader: unshaded
+      right:
+      - state: inhand-right-flame
+        shader: unshaded
+  - type: SolutionContainerManager
+    solutions:
+      Welder:
+        reagents:
+        - ReagentId: WeldingFuel
+          Quantity: 25
+        maxVol: 25
+  - type: SolutionTransfer
+    transferAmount: 5
+    canChangeTransferAmount: false
+  - type: Spillable
+    solution: Welder
+  - type: DrawableSolution
+    solution: Welder
+  - type: RefillableSolution
+    solution: Welder
+  - type: DrainableSolution
+    solution: Welder
+  - type: ExaminableSolution
+    solution: Welder
+  - type: SolutionRegeneration
+    solution: Welder
+    generated:
+      reagents:
+      - ReagentId: WeldingFuel
+        Quantity: 0.1
+    duration: 5
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Items/welder_drop.ogg
+  - type: Welder
+    fuelConsumption: 0.05
+    fuelLitCost: 0.05
+    tankSafe: true
+  - type: PointLight
+    enabled: false
+    netsync: false
+    radius: 5
+    color: orange
+  - type: StaticPrice
+    price: 1500
+  - type: Prayable
+    sentMessage: prayer-popup-notify-lamp-sent
+    notificationPrefix: prayer-chat-notify-lamp
+    verb: prayer-verbs-rub
+    verbImage: null
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
index 0b9f00be65c..8ff12a2325a 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
@@ -83,7 +83,7 @@
 - type: entity
   id: BedsheetCentcom
   parent: BedsheetBase
-  name: CentCom bedsheet
+  name: CentComm bedsheet
   description: Woven with advanced nanothread for warmth as well as being very decorated, essential for all officials.
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Misc/books.yml b/Resources/Prototypes/Entities/Objects/Misc/books.yml
index fd4cac781ba..97e0814a9f5 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/books.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/books.yml
@@ -108,6 +108,7 @@
     openOnActivation: true
     guides:
     - Bartender
+    #- Drinks # DeltaV - doesn't exist
 
 - type: entity
   id: BookHowToCookForFortySpaceman
@@ -130,6 +131,7 @@
     openOnActivation: true
     guides:
     - Chef
+    - FoodRecipes
 
 - type: entity
   id: BookLeafLoversSecret
@@ -155,6 +157,7 @@
     openOnActivation: true
     guides:
     - Botany
+    - Chemicals
 
 - type: entity
   id: BookEngineersHandbook
@@ -231,6 +234,7 @@
     openOnActivation: true
     guides:
     - Security
+    - Antagonists
 
 - type: entity
   id: BookHowToKeepStationClean
@@ -352,6 +356,35 @@
     openOnActivation: true
     guides:
     - Chemicals
+    - Chemist
+
+- type: entity
+  id: BookSpaceLaw
+  parent: BaseItem
+  name: space law
+  description: A set of Nanotrasen guidelines for keeping law and order on their space stations.
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/books.rsi
+    layers:
+    - state: paper
+    - state: cover_strong
+      color: "#87011c"
+    - state: icon_law
+      color: "#f7d61a"
+  - type: Tag
+    tags:
+    - Book
+  #- type: GuideHelp
+    #openOnActivation: true
+    #guides:
+    #- SpaceLaw # TODO: Delta-V space law guidebook
+  - type: MeleeWeapon # so you can beat stupid cadets
+    soundHit:
+      collection: Punch
+    damage:
+      types:
+        Blunt: 1
 
 - type: entity
   parent: BookBase
diff --git a/Resources/Prototypes/Entities/Objects/Misc/books_author.yml b/Resources/Prototypes/Entities/Objects/Misc/books_author.yml
index 9adb14f4ebe..47e5a916303 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/books_author.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/books_author.yml
@@ -318,7 +318,7 @@
 - type: entity
   parent: BookBase
   id: BookIanMountain
-  name: the adventures of ian and renault - A mountain expedition
+  name: the adventures of ian and renault - a mountain expedition
   description: The book is in new condition. The cover is a stunning mountain landscape with Ian and Renault in the foreground, looking out over the vista of the surrounding peaks and valleys. The title is written in bold, block letters at the top, with the subtitle, "A Mountain Expedition," written underneath.
   components:
     - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Misc/buffering.yml b/Resources/Prototypes/Entities/Objects/Misc/buffering.yml
index dbd35344594..c97ffe89edd 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/buffering.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/buffering.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: BufferingIcon
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Misc/buffering.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
index 5aaa58dbbee..0389db27ea0 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
@@ -7,8 +7,8 @@
   - type: Sprite
     sprite: Objects/Misc/fire_extinguisher.rsi
     layers:
-        - state: fire_extinguisher_closed
-          map: [ "enabled" ]
+    - state: fire_extinguisher_closed
+      map: [ "enum.ToggleVisuals.Layer" ]
   - type: Item
     sprite: Objects/Misc/fire_extinguisher.rsi
     size: Normal
@@ -24,6 +24,8 @@
   - type: DrainableSolution
     solution: spray
   - type: SolutionTransfer
+    maxTransferAmount: 100
+    transferAmount: 100
   - type: UseDelay
   - type: Spray
     transferAmount: 10
@@ -34,8 +36,20 @@
     vaporAmount: 3
     vaporSpread: 90
     sprayVelocity: 2.0
-  - type: FireExtinguisher
-    hasSafety: true
+  - type: ItemToggle
+    soundActivate:
+      path: /Audio/Machines/button.ogg
+      params:
+        variation: 0.125
+        volume: -4
+    soundDeactivate:
+      path: /Audio/Machines/button.ogg
+      params:
+        variation: 0.125
+        volume: -4
+  - type: ToggleVerb
+    text: fire-extinguisher-component-verb-text
+  - type: SpraySafety
   - type: MeleeWeapon
     wideAnimationRotation: 180
     damage:
@@ -46,14 +60,14 @@
   - type: Tool
     qualities:
     - Rolling
-    speedModifier: 0.5 # its very big, akward to use
+    speedModifier: 0.5 # its very big, awkward to use
   - type: Appearance
   - type: GenericVisualizer
     visuals:
-      enum.FireExtinguisherVisuals.Safety:
-        enabled:
-          True: { state: fire_extinguisher_closed }
-          False: { state: fire_extinguisher_open }
+      enum.ToggleVisuals.Toggled:
+        enum.ToggleVisuals.Layer:
+          True: { state: fire_extinguisher_open }
+          False: { state: fire_extinguisher_closed }
   - type: PhysicalComposition
     materialComposition:
       Steel: 100
@@ -62,7 +76,7 @@
   name: extinguisher spray
   id: ExtinguisherSpray
   parent: Vapor
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Effects/extinguisherSpray.rsi
@@ -107,4 +121,4 @@
   - type: PhysicalComposition
     materialComposition:
       Steel: 50
-      Glass: 40
\ No newline at end of file
+      Glass: 40
diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
index a02f94215b8..a9b86d4d830 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -132,7 +132,7 @@
   name: interrogator lamp
   id: LampInterrogator
   parent: BaseLamp
-  description: Ultra-bright lamp for the bad cop
+  description: Ultra-bright lamp for the bad cop.
   components:
   - type: Sprite
     sprite: Objects/Misc/Lights/lampint.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
index a502c714049..b1ccef48e87 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
@@ -26,6 +26,7 @@
   - type: GuideHelp
     guides:
     - Security
+    - Antagonists
   - type: UseDelay
     delay: 3
 
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index 00c49ba934c..80940efb04f 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -37,7 +37,7 @@
     - state: default
     - state: idpassenger
   - type: PresetIdCard
-    jobName: Passenger
+    job: Passenger
 
 - type: entity
   parent: PassengerIDCard
@@ -45,7 +45,7 @@
   name: technical assistant ID card
   components:
   - type: PresetIdCard
-    jobName: TechnicalAssistant
+    job: TechnicalAssistant
   - type: Sprite
     layers:
     - state: default
@@ -57,7 +57,7 @@
   name: medical intern ID card
   components:
   - type: PresetIdCard
-    jobName: MedicalIntern
+    job: MedicalIntern
   - type: Sprite
     layers:
     - state: default
@@ -69,7 +69,7 @@
   name: research assistant ID card
   components:
   - type: PresetIdCard
-    jobName: ResearchAssistant
+    job: ResearchAssistant
   - type: Sprite
     layers:
     - state: default
@@ -81,7 +81,7 @@
   name: security cadet ID card
   components:
   - type: PresetIdCard
-    jobName: SecurityCadet
+    job: SecurityCadet
   - type: Sprite
     layers:
     - state: default
@@ -93,7 +93,7 @@
   name: service worker ID card
   components:
   - type: PresetIdCard
-    jobName: ServiceWorker
+    job: ServiceWorker
   - type: Sprite
     layers:
     - state: default
@@ -111,7 +111,7 @@
   - type: Item
     heldPrefix: gold
   - type: PresetIdCard
-    jobName: Captain
+    job: Captain
   - type: Tag
     tags:
     - DoorBumpOpener
@@ -130,7 +130,7 @@
     - state: default
     - state: idsecurityofficer
   - type: PresetIdCard
-    jobName: SecurityOfficer
+    job: SecurityOfficer
 
 - type: entity
   parent: IDCardStandard
@@ -142,7 +142,7 @@
         - state: default
         - state: idwarden
     - type: PresetIdCard
-      jobName: Warden
+      job: Warden
 
 - type: entity
   parent: IDCardStandard
@@ -154,7 +154,7 @@
     - state: default
     - state: idstationengineer
   - type: PresetIdCard
-    jobName: StationEngineer
+    job: StationEngineer
 
 - type: entity
   parent: IDCardStandard
@@ -166,7 +166,7 @@
     - state: default
     - state: idmedicaldoctor
   - type: PresetIdCard
-    jobName: MedicalDoctor
+    job: MedicalDoctor
 
 - type: entity
   parent: IDCardStandard
@@ -178,7 +178,7 @@
     - state: default
     - state: idparamedic
   - type: PresetIdCard
-    jobName: Paramedic
+    job: Paramedic
 
 - type: entity
   parent: IDCardStandard
@@ -190,7 +190,7 @@
     - state: default
     - state: idchemist
   - type: PresetIdCard
-    jobName: Chemist
+    job: Chemist
 
 - type: entity
   parent: IDCardStandard
@@ -202,7 +202,7 @@
     - state: default
     - state: idcargotechnician
   - type: PresetIdCard
-    jobName: CargoTechnician
+    job: CargoTechnician
 
 - type: entity
   parent: IDCardStandard
@@ -214,7 +214,7 @@
     - state: default
     - state: idshaftminer
   - type: PresetIdCard
-    jobName: SalvageSpecialist
+    job: SalvageSpecialist
 
 - type: entity
   parent: IDCardStandard
@@ -228,7 +228,7 @@
     - type: Item
       heldPrefix: silver
     - type: PresetIdCard
-      jobName: Quartermaster
+      job: Quartermaster
 
 - type: entity
   parent: IDCardStandard
@@ -240,7 +240,7 @@
     - state: default
     - state: idscientist
   - type: PresetIdCard
-    jobName: Scientist
+    job: Scientist
 
 - type: entity
   parent: IDCardStandard
@@ -252,7 +252,7 @@
     - state: default
     - state: idclown
   - type: PresetIdCard
-    jobName: Clown
+    job: Clown
 
 - type: entity
   parent: IDCardStandard
@@ -264,7 +264,7 @@
     - state: default
     - state: idmime
   - type: PresetIdCard
-    jobName: Mime
+    job: Mime
 
 - type: entity
   parent: IDCardStandard
@@ -277,7 +277,7 @@
         - sprite: DeltaV/Objects/Misc/id_cards.rsi # DeltaV - Give Chaplain ID Epistemics colors
           state: idchaplain
     - type: PresetIdCard
-      jobName: Chaplain
+      job: Chaplain
 
 - type: entity
   parent: IDCardStandard
@@ -289,7 +289,7 @@
     - state: default
     - state: idjanitor
   - type: PresetIdCard
-    jobName: Janitor
+    job: Janitor
 
 - type: entity
   parent: IDCardStandard
@@ -301,7 +301,7 @@
     - state: default
     - state: idbartender
   - type: PresetIdCard
-    jobName: Bartender
+    job: Bartender
 
 - type: entity
   parent: IDCardStandard
@@ -313,8 +313,8 @@
         - state: default
         - state: idbartender
     - type: PresetIdCard
-      jobName: Bartender
-      idName: Pun Pun
+      job: Bartender
+      name: Pun Pun
 
 - type: entity
   parent: IDCardStandard
@@ -326,7 +326,7 @@
     - state: default
     - state: idcook
   - type: PresetIdCard
-    jobName: Chef
+    job: Chef
 
 - type: entity
   parent: IDCardStandard
@@ -338,7 +338,7 @@
         - state: default
         - state: idbotanist
     - type: PresetIdCard
-      jobName: Botanist
+      job: Botanist
 
 - type: entity
   parent: IDCardStandard
@@ -350,7 +350,7 @@
         - state: default
         - state: idcurator
     - type: PresetIdCard
-      jobName: Librarian
+      job: Librarian
 
 - type: entity
   parent: IDCardStandard
@@ -363,7 +363,7 @@
         - sprite: DeltaV/Objects/Misc/id_cards.rsi # DeltaV - Give Lawyer ID Justice colors
           state: idlawyer
     - type: PresetIdCard
-      jobName: Lawyer
+      job: Lawyer
 
 - type: entity
   parent: IDCardStandard
@@ -377,7 +377,7 @@
   - type: Item
     heldPrefix: silver
   - type: PresetIdCard
-    jobName: HeadOfPersonnel
+    job: HeadOfPersonnel
 
 - type: entity
   parent: IDCardStandard
@@ -391,7 +391,7 @@
   - type: Item
     heldPrefix: silver
   - type: PresetIdCard
-    jobName: ChiefEngineer
+    job: ChiefEngineer
 
 - type: entity
   parent: IDCardStandard
@@ -405,7 +405,7 @@
   - type: Item
     heldPrefix: silver
   - type: PresetIdCard
-    jobName: ChiefMedicalOfficer
+    job: ChiefMedicalOfficer
 
 - type: entity
   parent: IDCardStandard
@@ -419,7 +419,7 @@
   - type: Item
     heldPrefix: silver
   - type: PresetIdCard
-    jobName: ResearchDirector
+    job: ResearchDirector
 
 - type: entity
   parent: IDCardStandard
@@ -433,7 +433,7 @@
   - type: Item
     heldPrefix: silver
   - type: PresetIdCard
-    jobName: HeadOfSecurity
+    job: HeadOfSecurity
 
 - type: entity
   parent: IDCardStandard
@@ -445,7 +445,7 @@
     - state: default
     - state: idbrigmedic
   - type: PresetIdCard # Delta V - Brigmedic, see Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml
-    jobName: Brigmedic
+    job: Brigmedic
 
 - type: entity
   parent: IDCardStandard
@@ -571,7 +571,7 @@
         - state: default
         - state: idmusician
     - type: PresetIdCard
-      jobName: Musician
+      job: Musician
 
 - type: entity
   parent: CentcomIDCard
@@ -584,7 +584,7 @@
   - type: Item
     heldPrefix: blue
   - type: IdCard
-    jobTitle: Centcom Agent
+    jobTitle: Centcomm Agent
 
 - type: entity
   name: passenger ID card
@@ -593,7 +593,7 @@
   suffix: Agent
   components:
   - type: PresetIdCard
-    jobName: Passenger
+    job: Passenger
   - type: Access
     tags:
     - Maintenance
@@ -603,62 +603,6 @@
     - state: default
     - state: idpassenger
   - type: AgentIDCard
-    icons:
-    # TODO figure out a better way of doing this.
-    # Probably by adding a bool or icon-category data-field to the icon prototype?
-    - JobIconDetective
-    - JobIconQuarterMaster
-    - JobIconBotanist
-    - JobIconBoxer
-    - JobIconAtmosphericTechnician
-    - JobIconNanotrasen
-    - JobIconPrisoner
-    - JobIconJanitor
-    - JobIconChemist
-    - JobIconStationEngineer
-    - JobIconSecurityOfficer
-    - JobIconChiefMedicalOfficer
-    - JobIconRoboticist
-    - JobIconChaplain
-    - JobIconLawyer
-    - JobIconUnknown
-    - JobIconLibrarian
-    - JobIconCargoTechnician
-    - JobIconScientist
-    - JobIconResearchAssistant
-    - JobIconGeneticist
-    - JobIconClown
-    - JobIconCaptain
-    - JobIconHeadOfPersonnel
-    - JobIconVirologist
-    - JobIconShaftMiner
-    - JobIconPassenger
-    - JobIconChiefEngineer
-    - JobIconBartender
-    - JobIconHeadOfSecurity
-    - JobIconMedicalDoctor
-    - JobIconParamedic
-    - JobIconChef
-    - JobIconWarden
-    - JobIconResearchDirector
-    - JobIconMime
-    - JobIconMusician
-    - JobIconReporter
-    - JobIconPsychologist
-    - JobIconMedicalIntern
-    - JobIconTechnicalAssistant
-    - JobIconServiceWorker
-    - JobIconSecurityCadet
-    - JobIconZookeeper
-    - JobIconPrisonGuard # Nyanotrasen - PrisonGuard, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml
-    - JobIconMailCarrier # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml
-    - JobIconMartialArtist # Nyanotrasen - MartialArtist, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml
-    - JobIconGladiator # Nyanotrasen - Gladiator, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml
-    - JobIconForensicMantis  # Nyanotrasen - ForensicMantis, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
-    - JobIconClerk # Delta V - Added justice dept
-    - JobIconChiefJustice # Delta V - Added justice dept
-    - JobIconProsecutor # Delta V - Added justice dept
-    - JobIconVisitor
   - type: ActivatableUI
     key: enum.AgentIDCardUiKey.Key
     inHandsOnly: true
@@ -697,7 +641,7 @@
     - state: orange
     - state: idatmospherictechnician
   - type: PresetIdCard
-    jobName: AtmosphericTechnician
+    job: AtmosphericTechnician
 
 - type: entity
   parent: IDCardStandard
@@ -735,7 +679,7 @@
     - state: default
     - state: idpsychologist
   - type: PresetIdCard
-    jobName: Psychologist
+    job: Psychologist
 
 - type: entity
   parent: IDCardStandard
@@ -747,7 +691,7 @@
     - state: default
     - state: idreporter
   - type: PresetIdCard
-    jobName: Reporter
+    job: Reporter
 
 - type: entity
   parent: IDCardStandard
@@ -759,7 +703,7 @@
     - state: default
     - state: idboxer
   - type: PresetIdCard
-    jobName: Boxer
+    job: Boxer
 
 - type: entity
   parent: IDCardStandard
@@ -771,7 +715,7 @@
     - state: default
     - state: idzookeeper
   - type: PresetIdCard
-    jobName: Zookeeper
+    job: Zookeeper
 
 - type: entity
   parent: IDCardStandard
@@ -783,7 +727,7 @@
     - state: default
     - state: iddetective
   - type: PresetIdCard
-    jobName: Detective
+    job: Detective
 
 - type: entity
   parent: CentcomIDCard
@@ -797,7 +741,7 @@
   - type: Item
     heldPrefix: blue
   - type: IdCard
-    jobTitle: Centcom Quarantine Officer
+    jobTitle: Centcomm Quarantine Officer
 
 - type: entity
   parent: IDCardStandard
@@ -822,9 +766,9 @@
     layers:
     - state: default
     - state: idseniorengineer
-  - type: PresetIdCard # DeltaV - Change senior job titles
-    virtualJobName: "job-name-seniorengineer"
-    virtualJobIcon: "JobIconSeniorEngineer"
+  - type: IdCard # DeltaV - Change senior job titles
+    jobTitle: Senior Engineer
+    jobIcon: JobIconSeniorEngineer
 
 - type: entity
   parent: ResearchIDCard
@@ -835,9 +779,9 @@
     layers:
     - state: default
     - state: idseniorresearcher
-  - type: PresetIdCard # DeltaV - Change senior job titles
-    virtualJobName: "job-name-seniorresearcher"
-    virtualJobIcon: "JobIconSeniorResearcher"
+  - type: IdCard # DeltaV - Change senior job titles
+    jobTitle: Senior Researcher
+    jobIcon: JobIconSeniorResearcher
 
 - type: entity
   parent: MedicalIDCard
@@ -848,9 +792,9 @@
     layers:
     - state: default
     - state: idseniorphysician
-  - type: PresetIdCard # DeltaV - Change senior job titles
-    virtualJobName: "job-name-seniorphysician"
-    virtualJobIcon: "JobIconSeniorPhysician"
+  - type: IdCard # DeltaV - Change senior job titles
+    jobTitle: Senior Physician
+    jobIcon: JobIconSeniorPhysician
 
 - type: entity
   parent: SecurityIDCard
@@ -861,9 +805,9 @@
     layers:
     - state: default
     - state: idseniorofficer
-  - type: PresetIdCard # DeltaV - Change senior job titles
-    virtualJobName: "job-name-seniorofficer"
-    virtualJobIcon: "JobIconSeniorOfficer"
+  - type: IdCard # DeltaV - Change senior job titles
+    jobTitle: Senior Officer
+    jobIcon: JobIconSeniorOfficer
 
 - type: entity
   parent: IDCardStandard
diff --git a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
index ca56ef5acbb..e6b81e7ce40 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
@@ -298,7 +298,7 @@
           data: { state: spookysmoke_static }
 
 - type: entity
-  name: Haze
+  name: haze
   id: ShadowKudzuWeak
   parent: ShadowKudzu
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index 1c8d8754884..adb5776ec71 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -104,7 +104,7 @@
   name: artifact analyzer printout
   parent: Paper
   id: PaperArtifactAnalyzer
-  description: 'The readout of a device forgotten to time'
+  description: The readout of a device forgotten to time.
   components:
   - type: Sprite
     layers:
@@ -219,6 +219,7 @@
   - type: GuideHelp
     guides:
     - CargoBounties
+    - Cargo
 
 - type: entity
   name: character sheet
@@ -228,7 +229,6 @@
   components:
   - type: Paper
     contentSize: 10000
-    escapeFormatting: false
     content: book-cnc-sheet
   - type: Sprite
     layers:
@@ -252,7 +252,7 @@
 - type: entity
   parent: Paper
   id: PaperWritten
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     layers:
@@ -410,10 +410,10 @@
 
 - type: entity
   id: BoxFolderCentCom
-  name: CentCom folder
+  name: CentComm folder
   parent: BoxFolderBase
   suffix: DO NOT MAP
-  description: CentCom's miserable little pile of secrets!
+  description: CentComm's miserable little pile of secrets!
   components:
   - type: Sprite
     layers:
@@ -482,8 +482,8 @@
 - type: entity
   id: BoxFolderCentComClipboard
   parent: BoxFolderClipboard
-  name: CentCom clipboard
-  description: A luxurious clipboard upholstered with green velvet. Often seen carried by CentCom officials, seldom seen actually used.
+  name: CentComm clipboard
+  description: A luxurious clipboard upholstered with green velvet. Often seen carried by CentComm officials, seldom seen actually used.
   components:
   - type: Sprite
     sprite: Objects/Misc/cc-clipboard.rsi
@@ -548,6 +548,7 @@
           tags:
           - Write
   - type: CargoOrderConsole
+  - type: BankClient
   - type: ActivatableUI
     verbText: qm-clipboard-computer-verb-text
     key: enum.CargoConsoleUiKey.Orders
@@ -563,3 +564,100 @@
         Blunt: 10
   - type: StealTarget
     stealGroup: BoxFolderQmClipboard
+
+- type: entity
+  parent: Paper
+  id: TraitorCodePaper
+  name: syndicate codeword
+  description: A leaked codeword to possibly get in touch with the Syndicate.
+  suffix: DO NOT MAP
+  components:
+  - type: TraitorCodePaper
+
+- type: entity
+  parent: Paper
+  id: AllTraitorCodesPaper
+  name: syndicate codewords registry
+  description: A registry of all active Syndicate codewords.
+  suffix: Admeme
+  components:
+  - type: TraitorCodePaper
+    fakeCodewords: false
+    codewordShowAll: true
+
+- type: entity
+  name: envelope
+  parent: BaseItem
+  id: Envelope
+  description: 'A small envelope for keeping prying eyes off of your sensitive documents.'
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/bureaucracy.rsi
+    layers:
+    - state: envelope_open
+      map: ["enum.EnvelopeVisualLayers.Open"]
+    - state: envelope_closed
+      map: ["enum.EnvelopeVisualLayers.Sealed"]
+      visible: false
+    - state: envelope_torn
+      map: ["enum.EnvelopeVisualLayers.Torn"]
+      visible: false
+    - state: paper_stamp-generic
+      map: ["enum.PaperVisualLayers.Stamp"]
+      visible: false
+  - type: Paper
+    content: envelope-default-message
+  - type: PaperVisuals
+    headerImagePath: "/Textures/Interface/Paper/paper_heading_postage_stamp.svg.96dpi.png"
+    headerMargin: 216.0, 0.0, 0.0, 0.0
+    contentMargin: 0.0, 0.0, 0.0, 0.0
+    maxWritableArea: 368.0, 256.0
+  - type: Envelope
+  - type: ContainerContainer
+    containers:
+      letter_slot: !type:ContainerSlot
+  - type: ItemSlots
+    slots:
+      letter_slot:
+        name: envelope-letter-slot
+        insertSound: /Audio/Effects/packetrip.ogg
+        ejectSound: /Audio/Effects/packetrip.ogg
+        whitelist:
+          tags:
+            - Paper
+  - type: ActivatableUI
+    key: enum.PaperUiKey.Key
+    requireHands: false
+  - type: UserInterface
+    interfaces:
+      enum.PaperUiKey.Key:
+        type: PaperBoundUserInterface
+  - type: Item
+    size: Tiny
+  - type: Tag
+    tags:
+    - Trash
+    - Document
+  #- type: Appearance, hide stamp marks until we have some kind of displacement
+  - type: Flammable
+    fireSpread: true
+    canResistFire: false
+    alwaysCombustible: true
+    canExtinguish: true
+    damage:
+      types:
+        Heat: 1
+  - type: FireVisuals
+    sprite: Effects/fire.rsi
+    normalState: fire
+  - type: Damageable
+    damageModifierSet: Wood
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 15
+      behaviors:
+      - !type:EmptyAllContainersBehaviour
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
diff --git a/Resources/Prototypes/Entities/Objects/Misc/pen.yml b/Resources/Prototypes/Entities/Objects/Misc/pen.yml
index 635df230a4a..8680e414c39 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/pen.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/pen.yml
@@ -18,6 +18,14 @@
   - type: PhysicalComposition
     materialComposition:
       Steel: 25
+  - type: EmitSoundOnUse
+    sound:
+      path: /Audio/Items/pen_click.ogg
+      params:
+        volume: -4
+        maxDistance: 2
+  - type: UseDelay
+    delay: 1.5
 
 - type: entity
   parent: Pen
@@ -29,6 +37,7 @@
     removalTime: 0.0
   - type: ThrowingAngle
     angle: 315
+  - type: LandAtCursor
   - type: DamageOtherOnHit
     damage:
       types:
@@ -86,7 +95,7 @@
     state: pen_cap
 
 - type: entity
-  name: CentCom pen
+  name: CentComm pen
   parent: CyberPen
   id: PenCentcom
   description: In an attempt to keep up with the "power" of the cybersun bureaucracy, NT made a replica of cyber pen, in their corporate style.
diff --git a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml
index b380ccccc29..3cf9c03a9cf 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml
@@ -51,7 +51,7 @@
     state: stamp-cap
 
 - type: entity
-  name: CentCom rubber stamp
+  name: CentComm rubber stamp
   parent: RubberStampBase
   id: RubberStampCentcom
   suffix: DO NOT MAP
diff --git a/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml b/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml
index 9561fa3538f..02feda953f8 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml
@@ -108,8 +108,6 @@
     - type: Transform
       anchored: true
     - type: Slippery
-      paralyzeTime: 2
-      launchForwardsMultiplier: 1.5
     - type: StepTrigger
       intersectRatio: 0.2
     - type: Physics
diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
index 9690d0bdfe8..28788e9a137 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
@@ -17,7 +17,7 @@
   id: SadTromboneImplant
   name: sad trombone implant
   description: This implant plays a sad tune when the user dies.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: SubdermalImplant
       whitelist:
@@ -37,7 +37,7 @@
   id: LightImplant
   name: light implant
   description: This implant emits light from the user's skin on activation.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: SubdermalImplant
       implantAction: ActionToggleLight
@@ -59,7 +59,7 @@
   id: BikeHornImplant
   name: bike horn implant
   description: This implant lets the user honk anywhere at any time.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: SubdermalImplant
       implantAction: ActionActivateHonkImplant
@@ -80,7 +80,7 @@
   id: TrackingImplant
   name: tracking implant
   description: This implant has a tracking device attached to the suit sensor network, as well as a condition monitor for the Security radio channel.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: SubdermalImplant
       whitelist:
@@ -110,7 +110,7 @@
   id: StorageImplant
   name: storage implant
   description: This implant grants hidden storage within a person's body using bluespace technology.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: SubdermalImplant
       implantAction: ActionOpenStorageImplant
@@ -134,7 +134,7 @@
   id: FreedomImplant
   name: freedom implant
   description: This implant lets the user break out of hand restraints up to three times before ceasing to function anymore.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: SubdermalImplant
       implantAction: ActionActivateFreedomImplant
@@ -147,7 +147,7 @@
   id: UplinkImplant
   name: uplink implant
   description: This implant lets the user access a hidden Syndicate uplink at will.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: SubdermalImplant
     implantAction: ActionOpenUplinkImplant
@@ -167,13 +167,13 @@
   id: EmpImplant
   name: EMP implant
   description: This implant creates an electromagnetic pulse when activated.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: SubdermalImplant
       implantAction: ActionActivateEmpImplant
     - type: TriggerImplantAction
     - type: EmpOnTrigger
-      range: 1.75
+      range: 2.75
       energyConsumption: 50000
       disableDuration: 10
 
@@ -182,7 +182,7 @@
   id: ScramImplant
   name: scram implant
   description: This implant randomly teleports the user within a large radius when activated.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: SubdermalImplant
       implantAction: ActionActivateScramImplant
@@ -194,7 +194,7 @@
   id: DnaScramblerImplant
   name: DNA scrambler implant
   description: This implant lets the user randomly change their appearance and name once.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: SubdermalImplant
       implantAction: ActionActivateDnaScramblerImplant
@@ -209,7 +209,7 @@
   id: MicroBombImplant
   name: micro-bomb implant
   description: This implant detonates the user upon activation or upon death.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: SubdermalImplant
       permanent: true
@@ -239,7 +239,7 @@
   id: MacroBombImplant
   name: macro-bomb implant
   description: This implant creates a large explosion on death after a preprogrammed countdown.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: SubdermalImplant
       permanent: true
@@ -274,7 +274,7 @@
   id: DeathAcidifierImplant
   name: death-acidifier implant
   description: This implant melts the user and their equipment upon death.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: SubdermalImplant
     permanent: true
@@ -298,7 +298,7 @@
   id: DeathRattleImplant
   name: death rattle implant
   description: This implant will inform the Syndicate radio channel should the user fall into critical condition or die.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: SubdermalImplant
       permanent: true
@@ -318,7 +318,7 @@
   id: MindShieldImplant
   name: mindshield implant
   description: This implant will ensure loyalty to Nanotrasen and prevent mind control devices.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
    - type: SubdermalImplant
      permanent: true
diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
index 7de91cbb636..1e5f2573fda 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
@@ -41,6 +41,165 @@
       types:
         Blunt: 5
 
+- type: entity
+  name: steel dark checker tile
+  parent: FloorTileItemSteel
+  id: FloorTileItemSteelCheckerDark
+  components:
+  - type: Sprite
+    state: checker-dark
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorSteelCheckerDark
+  - type: Stack
+    stackType: FloorTileSteelCheckerDark
+
+- type: entity
+  name: steel light checker tile
+  parent: FloorTileItemSteel
+  id: FloorTileItemSteelCheckerLight
+  components:
+  - type: Sprite
+    state: checker-light
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorSteelCheckerLight
+  - type: Stack
+    stackType: FloorTileSteelCheckerLight
+
+- type: entity
+  name: dark tile
+  parent: FloorTileItemBase
+  id: FloorTileItemDark
+  components:
+  - type: Sprite
+    state: dark
+  - type: Item
+    heldPrefix: dark
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorDark
+  - type: Stack
+    stackType: FloorTileDark
+  - type: Construction
+    graph: TileDark
+    node: darktile
+
+- type: entity
+  name: dark steel diagonal mini tile
+  parent: FloorTileItemDark
+  id: FloorTileItemDarkDiagonalMini
+  components:
+  - type: Sprite
+    state: dark-diagonal-mini
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorDarkDiagonalMini
+  - type: Stack
+    stackType: FloorTileDarkDiagonalMini
+
+- type: entity
+  name: dark steel diagonal tile
+  parent: FloorTileItemDark
+  id: FloorTileItemDarkDiagonal
+  components:
+  - type: Sprite
+    state: dark-diagonal
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorDarkDiagonal
+  - type: Stack
+    stackType: FloorTileDarkDiagonal
+
+- type: entity
+  name: dark steel herringbone
+  parent: FloorTileItemDark
+  id: FloorTileItemDarkHerringbone
+  components:
+  - type: Sprite
+    state: dark-herringbone
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorDarkHerringbone
+  - type: Stack
+    stackType: FloorTileDarkHerringbone
+
+- type: entity
+  name: dark steel mini tile
+  parent: FloorTileItemDark
+  id: FloorTileItemDarkMini
+  components:
+  - type: Sprite
+    state: dark-mini
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorDarkMini
+  - type: Stack
+    stackType: FloorTileDarkMini
+
+- type: entity
+  name: dark steel mono tile
+  parent: FloorTileItemDark
+  id: FloorTileItemDarkMono
+  components:
+  - type: Sprite
+    state: dark-mono
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorDarkMono
+  - type: Stack
+    stackType: FloorTileDarkMono
+
+- type: entity
+  name: dark steel pavement
+  parent: FloorTileItemDark
+  id: FloorTileItemDarkPavement
+  components:
+  - type: Sprite
+    state: dark-pavement
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorDarkPavement
+  - type: Stack
+    stackType: FloorTileDarkPavement
+
+- type: entity
+  name: dark steel vertical pavement
+  parent: FloorTileItemDark
+  id: FloorTileItemDarkPavementVertical
+  components:
+  - type: Sprite
+    state: dark-pavement-vertical
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorDarkPavementVertical
+  - type: Stack
+    stackType: FloorTileDarkPavementVertical
+
+- type: entity
+  name: offset dark steel tile
+  parent: FloorTileItemDark
+  id: FloorTileItemDarkOffset
+  components:
+  - type: Sprite
+    state: dark-offset
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorDarkOffset
+  - type: Stack
+    stackType: FloorTileDarkOffset
+
 - type: entity
   name: steel tile
   parent: FloorTileItemBase
@@ -61,66 +220,116 @@
     node: steeltile
 
 - type: entity
-  name: steel dark checker tile
+  name: offset steel tile
   parent: FloorTileItemSteel
-  id: FloorTileItemSteelCheckerDark
+  id: FloorTileItemSteelOffset
   components:
   - type: Sprite
-    state: checker-dark
+    state: steel-offset
   - type: FloorTile
     outputs:
       - Plating
-      - FloorSteelCheckerDark
+      - FloorSteelOffset
+  - type: Stack
+    stackType: FloorTileSteelOffset
 
 - type: entity
-  name: steel light checker tile
+  name: steel diagonal mini tile
   parent: FloorTileItemSteel
-  id: FloorTileItemSteelCheckerLight
+  id: FloorTileItemSteelDiagonalMini
   components:
   - type: Sprite
-    state: checker-light
+    state: steel-diagonal-mini
   - type: FloorTile
     outputs:
       - Plating
-      - FloorSteelCheckerLight
+      - FloorSteelDiagonalMini
+  - type: Stack
+    stackType: FloorTileSteelDiagonalMini
 
 - type: entity
-  name: steel tile
-  parent: FloorTileItemBase
-  id: FloorTileItemMetalDiamond
+  name: steel diagonal tile
+  parent: FloorTileItemSteel
+  id: FloorTileItemSteelDiagonal
   components:
   - type: Sprite
-    state: metaldiamond
-  - type: Item
-    heldPrefix: steel
+    state: steel-diagonal
   - type: FloorTile
     outputs:
       - Plating
-      - FloorMetalDiamond
+      - FloorSteelDiagonal
   - type: Stack
-    stackType: FloorTileMetalDiamond
-#  - type: Construction
-#    graph: TileSteel
-#    node: steeltile
+    stackType: FloorTileSteelDiagonal
 
 - type: entity
-  name: wood floor
-  parent: FloorTileItemBase
-  id: FloorTileItemWood
+  name: steel herringbone
+  parent: FloorTileItemSteel
+  id: FloorTileItemSteelHerringbone
   components:
   - type: Sprite
-    state: wood
-  - type: Item
-    heldPrefix: wood
+    state: steel-herringbone
   - type: FloorTile
     outputs:
       - Plating
-      - FloorWood
+      - FloorSteelHerringbone
   - type: Stack
-    stackType: FloorTileWood
-  - type: Construction
-    graph: TileWood
-    node: woodtile
+    stackType: FloorTileSteelHerringbone
+
+- type: entity
+  name: steel mini tile
+  parent: FloorTileItemSteel
+  id: FloorTileItemSteelMini
+  components:
+  - type: Sprite
+    state: steel-mini
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorSteelMini
+  - type: Stack
+    stackType: FloorTileSteelMini
+
+- type: entity
+  name: steel mono tile
+  parent: FloorTileItemSteel
+  id: FloorTileItemSteelMono
+  components:
+  - type: Sprite
+    state: steel-mono
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorSteelMono
+  - type: Stack
+    stackType: FloorTileSteelMono
+
+- type: entity
+  name: steel pavement
+  parent: FloorTileItemSteel
+  id: FloorTileItemSteelPavement
+  components:
+  - type: Sprite
+    state: steel-pavement
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorSteelPavement
+  - type: Stack
+    stackType: FloorTileSteelPavement
+
+- type: entity
+  name: steel vertical pavement
+  parent: FloorTileItemSteel
+  id: FloorTileItemSteelPavementVertical
+  components:
+  - type: Sprite
+    state: steel-pavement-vertical
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorSteelPavementVertical
+  - type: Stack
+    stackType: FloorTileSteelPavementVertical
 
 - type: entity
   name: white tile
@@ -142,23 +351,154 @@
     node: whitetile
 
 - type: entity
-  name: dark tile
+  name: offset white steel tile
+  parent: FloorTileItemWhite
+  id: FloorTileItemWhiteOffset
+  components:
+  - type: Sprite
+    state: white-offset
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorWhiteOffset
+  - type: Stack
+    stackType: FloorTileWhiteOffset
+
+- type: entity
+  name: white steel diagonal mini tile
+  parent: FloorTileItemWhite
+  id: FloorTileItemWhiteDiagonalMini
+  components:
+  - type: Sprite
+    state: white-diagonal-mini
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorWhiteDiagonalMini
+  - type: Stack
+    stackType: FloorTileWhiteDiagonalMini
+
+- type: entity
+  name: white steel diagonal tile
+  parent: FloorTileItemWhite
+  id: FloorTileItemWhiteDiagonal
+  components:
+  - type: Sprite
+    state: white-diagonal
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorWhiteDiagonal
+  - type: Stack
+    stackType: FloorTileWhiteDiagonal
+
+- type: entity
+  name: white steel herringbone
+  parent: FloorTileItemWhite
+  id: FloorTileItemWhiteHerringbone
+  components:
+  - type: Sprite
+    state: white-herringbone
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorWhiteHerringbone
+  - type: Stack
+    stackType: FloorTileWhiteHerringbone
+
+- type: entity
+  name: white steel mini tile
+  parent: FloorTileItemWhite
+  id: FloorTileItemWhiteMini
+  components:
+  - type: Sprite
+    state: white-mini
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorWhiteMini
+  - type: Stack
+    stackType: FloorTileWhiteMini
+
+- type: entity
+  name: white steel mono tile
+  parent: FloorTileItemWhite
+  id: FloorTileItemWhiteMono
+  components:
+  - type: Sprite
+    state: white-mono
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorWhiteMono
+  - type: Stack
+    stackType: FloorTileWhiteMono
+
+- type: entity
+  name: white steel pavement
+  parent: FloorTileItemWhite
+  id: FloorTileItemWhitePavement
+  components:
+  - type: Sprite
+    state: white-pavement
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorWhitePavement
+  - type: Stack
+    stackType: FloorTileWhitePavement
+
+- type: entity
+  name: white steel vertical pavement
+  parent: FloorTileItemWhite
+  id: FloorTileItemWhitePavementVertical
+  components:
+  - type: Sprite
+    state: white-pavement-vertical
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorWhitePavementVertical
+  - type: Stack
+    stackType: FloorTileWhitePavementVertical
+
+- type: entity
+  name: steel tile
   parent: FloorTileItemBase
-  id: FloorTileItemDark
+  id: FloorTileItemMetalDiamond
   components:
   - type: Sprite
-    state: dark
+    state: metaldiamond
   - type: Item
-    heldPrefix: dark
+    heldPrefix: steel
   - type: FloorTile
     outputs:
       - Plating
-      - FloorDark
+      - FloorMetalDiamond
   - type: Stack
-    stackType: FloorTileDark
+    stackType: FloorTileMetalDiamond
+#  - type: Construction
+#    graph: TileSteel
+#    node: steeltile
+
+- type: entity
+  name: wood floor
+  parent: FloorTileItemBase
+  id: FloorTileItemWood
+  components:
+  - type: Sprite
+    state: wood
+  - type: Item
+    heldPrefix: wood
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorWood
+  - type: Stack
+    stackType: FloorTileWood
   - type: Construction
-    graph: TileDark
-    node: darktile
+    graph: TileWood
+    node: woodtile
 
 - type: entity
   name: techmaint floor
@@ -522,6 +862,34 @@
   - type: Stack
     stackType: FloorTileConcrete
 
+- type: entity
+  name: concrete mono tile
+  parent: FloorTileItemConcrete
+  id: FloorTileItemConcreteMono
+  components:
+  - type: Sprite
+    state: concrete-mono
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorConcreteMono
+  - type: Stack
+    stackType: FloorTileConcreteMono
+
+- type: entity
+  name: concrete smooth
+  parent: FloorTileItemConcrete
+  id: FloorTileItemConcreteSmooth
+  components:
+  - type: Sprite
+    state: concrete-smooth
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorConcreteSmooth
+  - type: Stack
+    stackType: FloorTileConcreteSmooth
+
 - type: entity
   parent: FloorTileItemBase
   id: FloorTileItemGrayConcrete
@@ -538,6 +906,34 @@
   - type: Stack
     stackType: FloorTileGrayConcrete
 
+- type: entity
+  name: gray concrete mono tile
+  parent: FloorTileItemGrayConcrete
+  id: FloorTileItemGrayConcreteMono
+  components:
+  - type: Sprite
+    state: grayconcrete-mono
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorGrayConcreteMono
+  - type: Stack
+    stackType: FloorTileGrayConcreteMono
+
+- type: entity
+  name: gray concrete smooth
+  parent: FloorTileItemGrayConcrete
+  id: FloorTileItemGrayConcreteSmooth
+  components:
+  - type: Sprite
+    state: grayconcrete-smooth
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorGrayConcreteSmooth
+  - type: Stack
+    stackType: FloorTileGrayConcreteSmooth
+
 - type: entity
   parent: FloorTileItemBase
   id: FloorTileItemOldConcrete
@@ -554,6 +950,34 @@
   - type: Stack
     stackType: FloorTileOldConcrete
 
+- type: entity
+  name: old concrete mono tile
+  parent: FloorTileItemOldConcrete
+  id: FloorTileItemOldConcreteMono
+  components:
+  - type: Sprite
+    state: oldconcrete-mono
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorOldConcreteMono
+  - type: Stack
+    stackType: FloorTileOldConcreteMono
+
+- type: entity
+  name: old concrete smooth
+  parent: FloorTileItemOldConcrete
+  id: FloorTileItemOldConcreteSmooth
+  components:
+  - type: Sprite
+    state: oldconcrete-smooth
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorOldConcreteSmooth
+  - type: Stack
+    stackType: FloorTileOldConcreteSmooth
+
 # Carpets
 - type: entity
   name: blue arcade floor
diff --git a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
index 86667f094fd..e735b2dcddc 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
@@ -87,6 +87,11 @@
         Blunt: 1
   - type: Shovel
     speedModifier: 0.1 # you can try
+  - type: ReactionMixer
+    mixMessage: "spoon-mixing-success"
+    timeToMix: 0.5
+    reactionTypes:
+    - Stir
 
 - type: entity
   parent: UtensilBasePlastic
@@ -103,6 +108,11 @@
     - Spoon
   - type: Shovel
     speedModifier: 0.1 # you can try
+  - type: ReactionMixer
+    mixMessage: "spoon-mixing-success"
+    timeToMix: 0.5
+    reactionTypes:
+    - Stir
 
 - type: entity
   parent: UtensilBasePlastic
@@ -137,6 +147,11 @@
   - type: Utensil
     types:
     - Spoon
+  - type: ReactionMixer
+    mixMessage: "spoon-mixing-success"
+    timeToMix: 0.5
+    reactionTypes:
+    - Stir
   - type: MeleeWeapon
     wideAnimationRotation: 180
     attackRate: 2
diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
index dc24ac485a1..8182accfb6f 100644
--- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml
+++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@@ -382,8 +382,10 @@
         path: /Audio/Weapons/ebladehum.ogg
     - type: ItemToggleSize
       activatedSize: Huge
-    - type: ItemToggleDisarmMalus
-      activatedDisarmMalus: 0.6
+    - type: ComponentToggler
+      components:
+      - type: DisarmMalus
+        malus: 0.6
     - type: Sprite
       sprite: Objects/Weapons/Melee/e_shield.rsi
       layers:
@@ -415,7 +417,6 @@
       energy: 2
       color: blue
     - type: Reflect
-      enabled: false
       reflectProb: 0.95
       reflects:
         - Energy
@@ -492,8 +493,10 @@
         path: /Audio/Weapons/telescopicoff.ogg
         params:
           volume: -5
-    - type: ItemToggleDisarmMalus
-      activatedDisarmMalus: 0.6
+    - type: ComponentToggler
+      components:
+      - type: DisarmMalus
+        malus: 0.6
     - type: ItemToggleSize
       activatedSize: Huge
     - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
index 088a503cf58..c96643d16b7 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: bible
-  description: New Interstellar Version 2340
+  description: New Interstellar Version 2340.
   parent: BaseStorageItem
   id: Bible
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chapel/urn.yml b/Resources/Prototypes/Entities/Objects/Specific/Chapel/urn.yml
index 55a58ef18a1..72d21977c6c 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Chapel/urn.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Chapel/urn.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: urn
-  description: Store the Dead smart and Compact since 2300
+  description: Store the Dead smart and Compact since 2300.
   parent: BaseStorageItem
   id: Urn
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml
index a4692db9b5f..4af29b6632b 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml
@@ -29,4 +29,5 @@
         - PillCanister
         - Bottle
         - Syringe
+        - Dropper
   - type: Dumpable
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
index abde52d4066..5f6cf903aaa 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
@@ -163,6 +163,16 @@
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/sugarcane.rsi
 
+- type: entity
+  parent: SeedBase
+  name: packet of papercane seeds
+  id: PapercaneSeeds
+  components:
+    - type: Seed
+      seedId: papercane
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/papercane.rsi
+
 - type: entity
   parent: SeedBase
   name: packet of tower cap spores
@@ -243,6 +253,16 @@
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/apple.rsi
 
+- type: entity
+  parent: SeedBase
+  name: packet of golden apple seeds
+  id: GoldenAppleSeeds
+  components:
+    - type: Seed
+      seedId: goldenApple
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/golden_apple.rsi
+
 - type: entity
   parent: SeedBase
   name: packet of corn seeds
@@ -427,6 +447,17 @@
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/galaxythistle.rsi
 
+- type: entity
+  parent: SeedBase
+  name: packet of glasstle seeds
+  description: "Scars of gloomy nights."
+  id: GlasstleSeeds
+  components:
+    - type: Seed
+      seedId: glasstle
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/glasstle.rsi
+
 - type: entity
   parent: SeedBase
   name: packet of fly amanita spores
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index f4cc09430a2..ccb79008105 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -50,6 +50,7 @@
   - type: GuideHelp
     guides:
     - Janitorial
+  - type: DnaSubstanceTrace
 
 - type: entity
   parent: BaseItem
@@ -109,6 +110,7 @@
       tags:
         - Mop
         - MopAdv
+    - type: DnaSubstanceTrace
 
 - type: entity
   name: wet floor sign
@@ -238,6 +240,7 @@
     embedOnThrow: True
   - type: ThrowingAngle
     angle: 0
+  - type: LandAtCursor
   - type: Ammo
     muzzleFlash: null
   - type: Projectile
@@ -331,3 +334,4 @@
     - type: CleansForensics
     - type: Fiber
       fiberColor: fibers-white
+    - type: DnaSubstanceTrace
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
index 5678de6bafc..8056d1e909e 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
@@ -21,8 +21,6 @@
     sprite: Objects/Specific/Janitorial/soap.rsi
     storedRotation: -90
   - type: Slippery
-    paralyzeTime: 2
-    launchForwardsMultiplier: 1.5
   - type: StepTrigger
     intersectRatio: 0.2
   - type: CollisionWake
@@ -129,8 +127,8 @@
   - type: SolutionContainerVisuals
     fillBaseName: syndie-
   - type: Slippery
-    paralyzeTime: 5
-    launchForwardsMultiplier: 2.5
+    paralyzeTime: 3
+    launchForwardsMultiplier: 3
   - type: Item
     heldPrefix: syndie
   - type: FlavorProfile
@@ -146,7 +144,7 @@
 - type: entity
   name: soaplet
   id: SoapletSyndie
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: Soap
   description: A tiny piece of syndicate soap.
   components:
@@ -154,8 +152,8 @@
     layers:
     - state: syndie-soaplet
   - type: Slippery
-    paralyzeTime: 5
-    launchForwardsMultiplier: 2.5
+    paralyzeTime: 1.5 # these things are tiny
+    launchForwardsMultiplier: 1.5
   - type: StepTrigger
     intersectRatio: 0.04
   - type: Item
@@ -196,7 +194,6 @@
   - type: SolutionContainerVisuals
     fillBaseName: gibs-
   - type: Slippery
-    paralyzeTime: 2
   - type: StepTrigger
   - type: Item
     heldPrefix: gibs
@@ -221,8 +218,8 @@
   - type: SolutionContainerVisuals
     fillBaseName: omega-
   - type: Slippery
-    paralyzeTime: 7
-    launchForwardsMultiplier: 3
+    paralyzeTime: 5.0
+    launchForwardsMultiplier: 3.0
   - type: Item
     heldPrefix: omega
   - type: SolutionContainerManager
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
index cddf7f6075a..998d3ecf03e 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
@@ -104,7 +104,7 @@
 - type: entity
   id: Vapor
   name: "vapor"
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: SolutionContainerManager
     solutions:
@@ -136,7 +136,7 @@
 - type: entity
   id: BigVapor
   parent: Vapor
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Effects/chempuff.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Kitchen/foodcarts.yml b/Resources/Prototypes/Entities/Objects/Specific/Kitchen/foodcarts.yml
index ca74dca8a7b..1b9f32009a3 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Kitchen/foodcarts.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Kitchen/foodcarts.yml
@@ -1,5 +1,5 @@
 - type: entity
-  name: Food Cart
+  name: food cart
   id: FoodCartBase
   abstract: true
   parent: BaseStructureDynamic
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml
index e4befcbb670..6eb56f3245b 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml
@@ -2,7 +2,7 @@
   name: books bag
   id: BooksBag
   parent: BaseStorageItem
-  description: A refined bag to carry your own library
+  description: A refined bag to carry your own library.
   components:
     - type: Sprite
       sprite: Objects/Specific/Library/Equipment/books_bag.rsi
@@ -22,5 +22,9 @@
       whitelist:
         tags:
           - Book
+          - Dice
           - Document
+          - Figurine
+          - TabletopBoard
+          - Write
     - type: Dumpable
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
index 4a61074a8d5..2d06ed0f1dc 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
@@ -31,6 +31,11 @@
       size: Large
     - type: Speech
       speechVerb: Robotic
+    - type: ItemToggle
+      soundActivate:
+        path: /Audio/Items/Defib/defib_safety_on.ogg
+      soundDeactivate:
+        path: /Audio/Items/Defib/defib_safety_off.ogg
     - type: Defibrillator
       zapHeal:
         types:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/disease.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/disease.yml
index ab6cdfc4e3b..7c90a82d7d6 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/disease.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/disease.yml
@@ -2,7 +2,7 @@
   parent: BaseItem
   id: DiseaseSwab
   name: sterile swab
-  description: Used for taking and transfering samples. Sterile until open. Single use only.
+  description: Used for taking and transferring samples. Sterile until open. Single use only.
   components:
   - type: Item
     size: Tiny
@@ -18,6 +18,7 @@
     guides:
   # - Virology (when it's back)
     - Botany
+    - Chemicals
 
 - type: entity
   parent: BaseAmmoProvider # this is for cycling swabs out and not spawning 30 entities, trust
@@ -39,6 +40,7 @@
     guides:
   # - Virology (when it's back)
     - Botany
+    - Chemicals
 
 - type: entity
   parent: BaseItem
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 ab338b9da95..5f0cf2b0d51 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
@@ -1,19 +1,14 @@
 - type: entity
   name: handheld crew monitor
   suffix: DO NOT MAP
-  parent:
-  - BaseItem
-  - PowerCellSlotSmallItem
+  parent: BaseHandheldComputer
+  # CMO-only bud, don't add more.
   id: HandheldCrewMonitor
   description: A hand-held crew monitor displaying the status of suit sensors.
   components:
   - type: Sprite
     sprite: Objects/Specific/Medical/handheldcrewmonitor.rsi
     state: scanner
-  - type: PowerCellDraw
-    drawRate: 0
-    useRate: 20
-  - type: ActivatableUIRequiresPowerCell
   - type: ActivatableUI
     key: enum.CrewMonitoringUIKey.Key
   - type: UserInterface
@@ -98,4 +93,4 @@
     slots:
       cell_slot:
         name: power-cell-slot-component-slot-name-default 
-  
\ No newline at end of file
+  
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
index 9de46755117..6b8d84e3f11 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@@ -446,6 +446,39 @@
     - id: PillHyronalin
       amount: 5
 
+- type: entity
+  name: pill
+  suffix: Potassium iodide 10u
+  parent: Pill
+  id: PillPotassiumIodide
+  components:
+  - type: Pill
+    pillType: 8
+  - type: Sprite
+    state: pill9
+  - type: Label
+    currentLabel: potassium iodide 10u
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: PotassiumIodide
+          Quantity: 10
+
+- type: entity
+  name: pill canister
+  parent: PillCanister
+  id: PillCanisterPotassiumIodide
+  suffix: Potassium iodide 10u, 5
+  components:
+  - type: Label
+    currentLabel: potassium iodide 10u
+  - type: StorageFill
+    contents:
+    - id: PillPotassiumIodide
+      amount: 5
+
 - type: entity
   name: pill
   suffix: Iron 10u
@@ -752,6 +785,10 @@
       prob: 0.10
       maxAmount: 7
       orGroup: RandomPill
+    - id: PillPotassiumIodide
+      prob: 0.10
+      maxAmount: 7
+      orGroup: RandomPill
     - id: PillIron
       prob: 0.10
       maxAmount: 7
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
index c01aaa84a9d..97a41a50df4 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
@@ -21,6 +21,8 @@
     interfaces:
       enum.HealthAnalyzerUiKey.Key:
         type: HealthAnalyzerBoundUserInterface
+  - type: ItemToggle
+    onUse: false
   - type: HealthAnalyzer
     scanningEndSound:
       path: "/Audio/Items/Medical/healthscanner.ogg"
@@ -36,7 +38,7 @@
           False: { visible: false }
   - type: GuideHelp
     guides:
-      - Medical Doctor
+    - Medical Doctor
 
 - type: entity
   id: HandheldHealthAnalyzer
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index ddaf20351cd..6f684cafadc 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -191,7 +191,7 @@
   name: brute auto-injector
   parent: ChemicalMedipen
   id: BruteAutoInjector
-  description: A rapid dose of bicaridine and tranexamic acid, intended for combat applications
+  description: A rapid dose of bicaridine and tranexamic acid, intended for combat applications.
   components:
   - type: Sprite
     sprite: Objects/Specific/Medical/medipen.rsi
@@ -223,7 +223,7 @@
   name: burn auto-injector
   parent: ChemicalMedipen
   id: BurnAutoInjector
-  description: A rapid dose of dermaline and leporazine, intended for combat applications
+  description: A rapid dose of dermaline and leporazine, intended for combat applications.
   components:
   - type: Sprite
     sprite: Objects/Specific/Medical/medipen.rsi
@@ -432,6 +432,8 @@
     delay: 0.5
   - type: StaticPrice # A new shitcurity meta
     price: 75
+  - type: EmitSoundOnUse
+    handle: false # don't want the sound to stop the self-inject from triggering
 
 - type: entity
   parent: BaseItem
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
index 3b5b5d799f1..1a4fd62c5cc 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: BodyBag
-  parent: BaseFoldable
+  parent: BaseDeployFoldable
   name: body bag
   description: A plastic bag designed for the storage and transportation of cadavers to stop body decomposition.
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
index c4f7798154e..8b1606dc5d3 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
@@ -173,12 +173,12 @@
     sprite: Objects/Specific/Medical/Surgery/saw.rsi
     state: saw
   - type: Item
+    size: Normal
     sprite: Objects/Specific/Medical/Surgery/saw.rsi
     storedRotation: 90
   - type: Tool
     qualities:
       - Sawing
-    speedModifier: 1.0
 # No melee for regular saw because have you ever seen someone use a band saw as a weapon? It's dumb.
 
 - type: entity
@@ -190,6 +190,7 @@
   - type: Sprite
     state: improv
   - type: Item
+    size: Small
     heldPrefix: improv
   - type: MeleeWeapon
     damage:
@@ -198,8 +199,6 @@
     soundHit:
       path: /Audio/Weapons/bladeslice.ogg
   - type: Tool
-    qualities:
-      - Sawing
     speedModifier: 0.5
 
 - type: entity
@@ -212,7 +211,6 @@
     state: electric
   - type: Item
     heldPrefix: electric
-    storedRotation: 90
   - type: MeleeWeapon
     damage:
       groups:
@@ -220,29 +218,19 @@
     soundHit:
       path: /Audio/Items/drill_hit.ogg
   - type: Tool
-    qualities:
-      - Sawing
     speedModifier: 1.5
 
 - type: entity
   name: advanced circular saw
   id: SawAdvanced
-  parent: Saw
+  parent: SawElectric
   description: You think you can cut anything with it.
   components:
   - type: Sprite
     state: advanced
   - type: Item
     heldPrefix: advanced
-    storedRotation: 90
   - type: MeleeWeapon
     attackRate: 1.5
-    damage:
-      groups:
-        Brute: 15
-    soundHit:
-      path: /Audio/Items/drill_hit.ogg
   - type: Tool
-    qualities:
-      - Sawing
     speedModifier: 2.0
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml
index 113017cc84a..5216a332281 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml
@@ -40,23 +40,22 @@
       - state: screen
         shader: unshaded
         visible: false
-        map: ["enum.PowerDeviceVisualLayers.Powered"]
+        map: ["enum.ToggleVisuals.Layer"]
   - type: Appearance
   - type: GenericVisualizer
     visuals:
-      enum.ProximityBeeperVisuals.Enabled:
-        enum.PowerDeviceVisualLayers.Powered:
+      enum.ToggleVisuals.Toggled:
+        enum.ToggleVisuals.Layer:
           True: { visible: true }
           False: { visible: false }
+  - type: ItemToggle
   - type: ProximityBeeper
   - type: ProximityDetector
-    enabled: false
     range: 20
     criteria:
       components:
       - Anomaly
   - type: Beeper
-    enabled: false
     minBeepInterval: 0.15
     maxBeepInterval: 1.00
     beepSound:
@@ -152,3 +151,10 @@
   - type: ContainerContainer
     containers:
       core_slot: !type:ContainerSlot
+  - type: DamageOnAttackedProtection
+    damageProtection:
+      flatReductions:
+        Heat: 100
+        Cold: 100
+        Radiation: 100
+    slots: NONE
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index c7951cd945c..7dcdad8122c 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -17,7 +17,8 @@
     - BorgModuleGeneric
   - type: GuideHelp
     guides:
-      - Cyborgs
+    - Cyborgs
+    - Robotics
 
 - type: entity
   id: BaseProviderBorgModule
@@ -345,12 +346,12 @@
     - state: icon-treatment
   - type: ItemBorgModule
     items:
+    - HandheldHealthAnalyzerUnpowered
     - Brutepack10Lingering
     - Ointment10Lingering
     - Gauze10Lingering
     - Bloodpack10Lingering
     - Syringe
-    - Dropper
 
 - type: entity
   id: BorgModuleDefibrillator
@@ -505,8 +506,8 @@
     - state: icon-syndicate
   - type: ItemBorgModule
     items:
-    - WeaponAdvancedLaser
-    - Machete
+    - WeaponPistolEchis
+    - EnergyDaggerLoud
 
 - type: entity
   id: BorgModuleOperative
@@ -537,7 +538,7 @@
       - state: icon-syndicate
     - type: ItemBorgModule
       items:
-      - EnergySwordDouble
+      - CyborgEnergySwordDouble
       - PinpointerSyndicateNuclear
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml
index 40698792d96..66e65c73af4 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml
@@ -254,3 +254,4 @@
   - type: GuideHelp
     guides:
     - Cyborgs
+    - Robotics
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
index 308c013da46..fdca31a4308 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
@@ -47,7 +47,8 @@
   - type: Appearance
   - type: GuideHelp
     guides:
-      - Cyborgs
+    - Cyborgs
+    - Robotics
 
 - type: entity
   parent: MMI
@@ -123,3 +124,4 @@
     - type: GuideHelp
       guides:
       - Cyborgs
+      - Robotics
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml
index 451230bbf1f..336c9bac1e0 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: BarberScissors
   name: barber scissors
-  description: is able to reshape the hairstyle of any crew cut to your liking.
+  description: Is able to reshape the hairstyle of any crew cut to your liking.
   parent: BaseItem
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml
index 953c05f107e..415b59a6e54 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml
@@ -460,7 +460,7 @@
   parent: BaseVendingMachineRestock
   id: VendingMachineRestockHappyHonk
   name: Happy Honk restock box
-  description: place this box full of fun into the restock slot on the Happy Honk Dispenser to begin.
+  description: Place this box full of fun into the restock slot on the Happy Honk Dispenser to begin.
   components:
   - type: VendingMachineRestock
     canRestock:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
index d318c606adf..d1020ff6094 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
@@ -82,13 +82,14 @@
     - type: Tag
       tags:
       - ChemDispensable
+    - type: DnaSubstanceTrace
 
 - type: entity
   parent: Jug
   name: jug
   suffix: carbon
   id: JugCarbon
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Label
       currentLabel: reagent-name-carbon
@@ -104,7 +105,7 @@
   name: jug
   suffix: iodine
   id: JugIodine
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Label
       currentLabel: reagent-name-iodine
@@ -120,7 +121,7 @@
   name: jug
   suffix: fluorine
   id: JugFluorine
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Label
       currentLabel: reagent-name-fluorine
@@ -136,7 +137,7 @@
   name: jug
   suffix: chlorine
   id: JugChlorine
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Label
       currentLabel: reagent-name-chlorine
@@ -152,7 +153,7 @@
   name: jug
   suffix: aluminium
   id: JugAluminium
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Label
       currentLabel: reagent-name-aluminium
@@ -168,7 +169,7 @@
   name: jug
   suffix: phosphorus
   id: JugPhosphorus
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Label
       currentLabel: reagent-name-phosphorus
@@ -184,7 +185,7 @@
   name: jug
   suffix: sulfur
   id: JugSulfur
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Label
       currentLabel: reagent-name-sulfur
@@ -200,7 +201,7 @@
   name: jug
   suffix: silicon
   id: JugSilicon
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Label
       currentLabel: reagent-name-silicon
@@ -216,7 +217,7 @@
   name: jug
   suffix: hydrogen
   id: JugHydrogen
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Label
       currentLabel: reagent-name-hydrogen
@@ -232,7 +233,7 @@
   name: jug
   suffix: lithium
   id: JugLithium
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Label
       currentLabel: reagent-name-lithium
@@ -248,7 +249,7 @@
   name: jug
   suffix: sodium
   id: JugSodium
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Label
       currentLabel: reagent-name-sodium
@@ -264,7 +265,7 @@
   name: jug
   suffix: potassium
   id: JugPotassium
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Label
       currentLabel: reagent-name-potassium
@@ -280,7 +281,7 @@
   name: jug
   suffix: radium
   id: JugRadium
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Label
       currentLabel: reagent-name-radium
@@ -296,7 +297,7 @@
   name: jug
   suffix: iron
   id: JugIron
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Label
       currentLabel: reagent-name-iron
@@ -312,7 +313,7 @@
   name: jug
   suffix: copper
   id: JugCopper
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Label
       currentLabel: reagent-name-copper
@@ -328,7 +329,7 @@
   name: jug
   suffix: gold
   id: JugGold
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Label
       currentLabel: reagent-name-gold
@@ -344,7 +345,7 @@
   name: jug
   suffix: mercury
   id: JugMercury
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Label
       currentLabel: reagent-name-mercury
@@ -360,7 +361,7 @@
   name: jug
   suffix: silver
   id: JugSilver
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Label
       currentLabel: reagent-name-silver
@@ -376,7 +377,7 @@
   name: jug
   suffix: ethanol
   id: JugEthanol
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Label
       currentLabel: reagent-name-ethanol
@@ -392,7 +393,7 @@
   name: jug
   suffix: sugar
   id: JugSugar
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Label
       currentLabel: reagent-name-sugar
@@ -408,7 +409,7 @@
   name: jug
   suffix: nitrogen
   id: JugNitrogen
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Label
       currentLabel: reagent-name-nitrogen
@@ -424,7 +425,7 @@
   name: jug
   suffix: oxygen
   id: JugOxygen
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Label
       currentLabel: reagent-name-oxygen
@@ -440,7 +441,7 @@
   name: jug
   suffix: Plant-B-Gone
   id: JugPlantBGone
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Label
       currentLabel: reagent-name-plant-b-gone
@@ -456,7 +457,7 @@
   name: jug
   suffix: welding fuel
   id: JugWeldingFuel
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Label
       currentLabel: reagent-name-welding-fuel
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
index 6fdb77fe5fc..f8f55cf8fc5 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
@@ -93,6 +93,7 @@
         transferForensics: true
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+  - type: DnaSubstanceTrace
 
 - type: entity
   parent: BaseChemistryEmptyBottle
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml
index 39a35dba8c6..eca666ca4f4 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml
@@ -101,6 +101,7 @@
         acts: [ "Destruction" ]
   - type: Spillable
     solution: beaker
+  - type: DnaSubstanceTrace
 
 - type: entity
   id: VestineChemistryVial
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
index beb77c65f81..38e0b08bf1d 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -92,6 +92,7 @@
         Blunt: 5
   - type: StaticPrice
     price: 30
+  - type: DnaSubstanceTrace
 
 - type: entity
   parent: BaseItem
@@ -153,6 +154,7 @@
     damageModifierSet: Glass
   - type: StaticPrice
     price: 30
+  - type: DnaSubstanceTrace
 
 - type: entity
   name: beaker
@@ -303,6 +305,7 @@
     solution: injector
   - type: Item
     sprite: Objects/Specific/Chemistry/dropper.rsi
+    size: Tiny
   - type: Appearance
   - type: SolutionContainerVisuals
     maxFillLevels: 1
@@ -311,6 +314,10 @@
     inHandsFillBaseName: -fill-
   - type: StaticPrice
     price: 40
+  - type: DnaSubstanceTrace
+  - type: Tag
+    tags:
+    - Dropper
 
 - type: entity
   name: borgdropper
diff --git a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
index 58c8dae2b05..b64aa3a0412 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
@@ -67,3 +67,4 @@
   - type: PhysicalComposition
     materialComposition:
       Plastic: 50
+  - type: DnaSubstanceTrace
diff --git a/Resources/Prototypes/Entities/Objects/Tools/flare.yml b/Resources/Prototypes/Entities/Objects/Tools/flare.yml
index fdf53148631..d36f67d00d4 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/flare.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flare.yml
@@ -26,7 +26,6 @@
         loop: true
         volume: -10
         maxDistance: 5
-
   - type: Sprite
     sprite: Objects/Misc/flare.rsi
     layers:
diff --git a/Resources/Prototypes/Entities/Objects/Tools/fulton.yml b/Resources/Prototypes/Entities/Objects/Tools/fulton.yml
index cfd0b8f7700..3a6d8ffc225 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/fulton.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/fulton.yml
@@ -87,7 +87,7 @@
 
 - type: entity
   id: FultonEffect
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: fulton effect
   components:
   - type: TimedDespawn
diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
index 53423e84a4f..a8495cef019 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
@@ -9,6 +9,9 @@
   - type: Item
     size: Normal
     sprite: Objects/Tanks/generic.rsi
+  - type: Tag
+    tags:
+    - GasTank
   - type: Clothing
     quickEquip: false
     sprite: Objects/Tanks/generic.rsi
@@ -57,7 +60,7 @@
   parent: GasTankRoundBase
   id: OxygenTank
   name: oxygen tank
-  description: A standard cylindrical gas tank for oxygen.
+  description: A standard cylindrical gas tank for oxygen. It can hold 5 L of gas.
   components:
   - type: Sprite
     sprite: Objects/Tanks/oxygen.rsi
@@ -70,7 +73,7 @@
   parent: GasTankRoundBase
   id: NitrogenTank
   name: nitrogen tank
-  description: A standard cylindrical gas tank for nitrogen.
+  description: A standard cylindrical gas tank for nitrogen. It can hold 5 L of gas.
   components:
   - type: Sprite
     sprite: Objects/Tanks/red.rsi
@@ -83,7 +86,7 @@
   parent: GasTankRoundBase
   id: EmergencyOxygenTank
   name: emergency oxygen tank
-  description: An easily portable tank for emergencies. Contains very little oxygen, rated for survival use only.
+  description: An easily portable tank for emergencies. Contains very little oxygen, rated for survival use only. It can hold 0.66 L of gas.
   components:
   - type: Sprite
     sprite: Objects/Tanks/emergency.rsi
@@ -112,7 +115,7 @@
   parent: EmergencyOxygenTank
   id: EmergencyNitrogenTank
   name: emergency nitrogen tank
-  description: An easily portable tank for emergencies. Contains very little nitrogen, rated for survival use only.
+  description: An easily portable tank for emergencies. Contains very little nitrogen, rated for survival use only. It can hold 0.66 L of gas.
   components:
   - type: Sprite
     sprite: Objects/Tanks/emergency_red.rsi
@@ -125,7 +128,7 @@
   parent: EmergencyOxygenTank
   id: ExtendedEmergencyOxygenTank
   name: extended-capacity emergency oxygen tank
-  description: An emergency tank with extended capacity. Technically rated for prolonged use.
+  description: An emergency tank with extended capacity. Technically rated for prolonged use. It can hold 1.5 L of gas.
   components:
   - type: Sprite
     sprite: Objects/Tanks/emergency_extended.rsi
@@ -142,7 +145,7 @@
   parent: ExtendedEmergencyOxygenTank
   id: ExtendedEmergencyNitrogenTank
   name: extended-capacity emergency nitrogen tank
-  description: An emergency tank with extended capacity. Technically rated for prolonged use.
+  description: An emergency tank with extended capacity. Technically rated for prolonged use. It can hold 1.5 L of gas.
   components:
   - type: Sprite
     sprite: Objects/Tanks/emergency_extended_red.rsi
@@ -155,7 +158,7 @@
   parent: ExtendedEmergencyOxygenTank
   id: DoubleEmergencyOxygenTank
   name: double emergency oxygen tank
-  description: A high-grade dual-tank emergency life support container. It holds a decent amount of oxygen for it's small size.
+  description: A high-grade dual-tank emergency life support container. It holds a decent amount of oxygen for its small size. It can hold 2.5 L of gas.
   components:
   - type: Sprite
     sprite: Objects/Tanks/emergency_double.rsi
@@ -177,7 +180,7 @@
   parent: DoubleEmergencyOxygenTank
   id: DoubleEmergencyNitrogenTank
   name: double emergency nitrogen tank
-  description: A high-grade dual-tank emergency life support container. It holds a decent amount of nitrogen for its small size.
+  description: A high-grade dual-tank emergency life support container. It holds a decent amount of nitrogen for its small size. It can hold 2.5 L of gas.
   components:
   - type: Sprite
     sprite: Objects/Tanks/emergency_double_red.rsi
@@ -190,7 +193,7 @@
   parent: EmergencyOxygenTank
   id: EmergencyFunnyOxygenTank
   name: funny emergency oxygen tank
-  description: An easily portable tank for emergencies. Contains very little oxygen with an extra of funny gas, rated for survival use only.
+  description: An easily portable tank for emergencies. Contains very little oxygen with an extra of funny gas, rated for survival use only. It can hold 0.66 L of gas.
   components:
   - type: Sprite
     sprite: Objects/Tanks/emergency_clown.rsi
@@ -203,7 +206,7 @@
   parent: GasTankRoundBase
   id: AirTank
   name: air tank
-  description: Mixed anyone?
+  description: Mixed anyone? It can hold 5 L of gas.
   components:
   - type: GasTank
     outputPressure: 101.3
@@ -212,7 +215,7 @@
   parent: GasTankRoundBase
   id: NitrousOxideTank
   name: nitrous oxide tank
-  description: Contains a mixture of air and nitrous oxide. Make sure you don't refill it with pure N2O.
+  description: Contains a mixture of air and nitrous oxide. Make sure you don't refill it with pure N2O. It can hold 5 L of gas.
   components:
   - type: Sprite
     sprite: Objects/Tanks/anesthetic.rsi
@@ -228,7 +231,7 @@
   parent: GasTankBase
   id: PlasmaTank
   name: plasma tank
-  description: Contains dangerous plasma. Do not inhale. Extremely flammable.
+  description: Contains dangerous plasma. Do not inhale. Extremely flammable. It can hold 5 L of gas.
   components:
   - type: Sprite
     sprite: Objects/Tanks/plasma.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
index 2320764d9ff..3081f60989e 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
@@ -115,7 +115,7 @@
   name: light pulse test
   parent: BaseItem
   id: LightBehaviourTest1
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Sprite
       sprite: Objects/Misc/glowstick.rsi
@@ -146,7 +146,7 @@
   name: color cycle test
   parent: BaseItem
   id: LightBehaviourTest2
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Sprite
       sprite: Objects/Misc/glowstick.rsi
@@ -178,7 +178,7 @@
   name: multi-behaviour light test
   parent: BaseItem
   id: LightBehaviourTest3
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Sprite
       sprite: Objects/Misc/glowstick.rsi
@@ -218,7 +218,7 @@
   name: light fade in test
   parent: BaseItem
   id: LightBehaviourTest4
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Sprite
       sprite: Objects/Misc/glowstick.rsi
@@ -249,7 +249,7 @@
   name: light pulse radius test
   parent: BaseItem
   id: LightBehaviourTest5
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Sprite
       sprite: Objects/Misc/glowstick.rsi
@@ -280,7 +280,7 @@
   name: light randomize radius test
   parent: BaseItem
   id: LightBehaviourTest6
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Sprite
       sprite: Objects/Misc/glowstick.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml b/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml
index 1b92b4ace22..eecc6a1bb64 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: handheld mass scanner
-  parent: [ BaseItem, PowerCellSlotSmallItem]
+  parent: BaseHandheldComputer
   id: HandHeldMassScanner
   description: A hand-held mass scanner.
   components:
@@ -27,7 +27,6 @@
   - type: PowerCellDraw
     drawRate: 3
     useRate: 100
-  - type: ActivatableUIRequiresPowerCell
   - type: ActivatableUI
     key: enum.RadarConsoleUiKey.Key
     inHandsOnly: true
diff --git a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
index 5b1ef6690c3..e99a6dceb0d 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: JetpackEffect
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: TimedDespawn
     lifetime: 2
@@ -22,8 +22,8 @@
   parent: GasTankBase
   abstract: true
   id: BaseJetpack
-  name: Jetpack
-  description: It's a jetpack.
+  name: jetpack
+  description: It's a jetpack. It can hold 5 L of gas.
   components:
     - type: InputMover
       toParent: true
@@ -188,6 +188,7 @@
   id: JetpackMini
   parent: BaseJetpack
   name: mini jetpack
+  description: It's a jetpack. It can hold 1.5 L of gas.
   suffix: Empty
   components:
     - type: Item
diff --git a/Resources/Prototypes/Entities/Objects/Tools/thief_beacon.yml b/Resources/Prototypes/Entities/Objects/Tools/thief_beacon.yml
new file mode 100644
index 00000000000..c35e66127dd
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Tools/thief_beacon.yml
@@ -0,0 +1,38 @@
+- type: entity
+  id: ThiefBeacon
+  name: thieving beacon
+  description: A device that will teleport everything around it to the thief's vault at the end of the shift.
+  components:
+    - type: ThiefBeacon
+    - type: StealArea
+    - type: Item
+      size: Normal
+    - type: Physics
+      bodyType: Dynamic
+    - type: Fixtures
+      fixtures:
+        fix1:
+          shape:
+            !type:PhysShapeAabb
+            bounds: "-0.25,-0.4,0.25,0.1"
+          density: 20
+          mask:
+            - Impassable
+    - type: Foldable
+      folded: true
+    - type: Clickable
+    - type: InteractionOutline
+    - type: Appearance
+    - type: GenericVisualizer
+      visuals:
+        enum.FoldedVisuals.State:
+          foldedLayer:
+            True: { state: folded_extraction }
+            False: { state: extraction_point }
+    - type: Sprite
+      sprite: Objects/Tools/thief_beacon.rsi
+      drawdepth: SmallObjects
+      noRot: true
+      layers:
+        - state: extraction_point
+          map: [ "foldedLayer" ]
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
index 0a0c7023245..db319118576 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
@@ -155,10 +155,10 @@
     state: icon
   - type: ThiefUndeterminedBackpack
     possibleSets:
-    # - TO DO Thief pinpointer needed
+    # TODO Thief pinpointer needed
     - ChemistrySet
     - ToolsSet
-    - ChameleonSet # - TO DO Chameleon stump PR needed
+    - ChameleonSet # TODO Chameleon stump PR needed
     - SyndieSet
     - SleeperSet
     - CommunicatorSet
diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
index 433f269a7ab..91e422e61cd 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -92,7 +92,7 @@
   name: wrench
   parent: BaseItem
   id: Wrench
-  description: 'A common tool for assembly and disassembly. Remember: righty tighty, lefty loosey.'
+  description: 'A common tool for assembly and disassembly. Remember: lefty latchy, righty removey.'
   components:
   - type: EmitSoundOnLand
     sound:
@@ -189,7 +189,7 @@
   name: multitool
   parent: BaseItem
   id: Multitool
-  description: An advanced tool to copy, store, and send electrical pulses and signals through wires and machines
+  description: An advanced tool to copy, store, and send electrical pulses and signals through wires and machines.
   components:
   - type: EmitSoundOnLand
     sound:
@@ -282,7 +282,7 @@
       price: 56
     - type: GuideHelp
       guides:
-        - NetworkConfigurator
+      - NetworkConfigurator
 
 #Power tools
 #Later on these should switch probably switch damage when changing the tool behavior.
@@ -407,20 +407,6 @@
   components:
   - type: LimitedCharges
     charges: 0
-  - type: RCD
-    availablePrototypes:
-    - WallSolid
-    - FloorSteel
-    - Plating
-    - Catwalk
-    - Grille
-    - Window
-    - WindowDirectional
-    - WindowReinforcedDirectional
-    - ReinforcedWindow
-    - Airlock
-    - AirlockGlass
-    - Firelock
 
 - type: entity
   id: RCDRecharging
diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
index 9db30edb52e..cd188969b53 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
@@ -55,8 +55,10 @@
   - type: ItemToggleSize
     activatedSize: Large
   - type: ItemToggleHot
-  - type: ItemToggleDisarmMalus
-    activatedDisarmMalus: 0.6
+  - type: ComponentToggler
+    components:
+    - type: DisarmMalus
+      malus: 0.6
   - type: ToggleableLightVisuals
     spriteLayer: flame
     inhandVisuals:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
index 630354f23d9..1aac4424149 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
@@ -52,7 +52,7 @@
 
 - type: entity
   id: HotPotatoEffect
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: TimedDespawn
     lifetime: 0.6
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml
index c6c37d36424..8bae55e1f42 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml
@@ -20,6 +20,8 @@
   - type: DeviceLinkSink
     ports:
       - Trigger
+  - type: EmitSoundOnUse
+    handle: false # don't want the sound to stop the explosion from triggering
 
 - type: entity
   parent: BaseItem
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
index e26c4e95404..f5c79a858ef 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
@@ -9,8 +9,6 @@
     - Cartridge
     - ShellShotgun
   - type: CartridgeAmmo
-    count: 6
-    spread: 15
     soundEject:
       collection: ShellEject
   - type: Sprite
@@ -32,7 +30,6 @@
         map: [ "enum.AmmoVisualLayers.Base" ]
   - type: CartridgeAmmo
     proto: PelletShotgunBeanbag
-    count: 1
   - type: SpentAmmoVisuals
     state: "beanbag"
 
@@ -47,8 +44,6 @@
         map: [ "enum.AmmoVisualLayers.Base" ]
   - type: CartridgeAmmo
     proto: PelletShotgunSlug
-    count: 1
-    spread: 0
   - type: SpentAmmoVisuals
     state: "slug"
 
@@ -63,7 +58,6 @@
         map: [ "enum.AmmoVisualLayers.Base" ]
   - type: CartridgeAmmo
     proto: PelletShotgunFlare
-    count: 1
   - type: SpentAmmoVisuals
     state: "flare"
 
@@ -77,7 +71,7 @@
       - state: base
         map: [ "enum.AmmoVisualLayers.Base" ]
   - type: CartridgeAmmo
-    proto: PelletShotgun
+    proto: PelletShotgunSpread
 
 - type: entity
   id: ShellShotgunIncendiary
@@ -89,7 +83,7 @@
       - state: incendiary
         map: [ "enum.AmmoVisualLayers.Base" ]
   - type: CartridgeAmmo
-    proto: PelletShotgunIncendiary
+    proto: PelletShotgunIncendiarySpread
   - type: SpentAmmoVisuals
     state: "incendiary"
 
@@ -103,7 +97,7 @@
       - state: practice
         map: [ "enum.AmmoVisualLayers.Base" ]
   - type: CartridgeAmmo
-    proto: PelletShotgunPractice
+    proto: PelletShotgunPracticeSpread
   - type: SpentAmmoVisuals
     state: "practice"
 
@@ -118,7 +112,6 @@
         map: [ "enum.AmmoVisualLayers.Base" ]
   - type: CartridgeAmmo
     proto: PelletShotgunTranquilizer
-    count: 1
   - type: ChemicalAmmo
   - type: SolutionContainerManager
     solutions:
@@ -145,9 +138,7 @@
     graph: ImprovisedShotgunShellGraph
     node: shell
   - type: CartridgeAmmo
-    count: 10
-    spread: 45 
-    proto: PelletShotgunImprovised
+    proto: PelletShotgunImprovisedSpread
   - type: SpentAmmoVisuals
     state: "improvised"
 
@@ -161,8 +152,6 @@
         - state: depleted-uranium
           map: [ "enum.AmmoVisualLayers.Base" ]
     - type: CartridgeAmmo
-      count: 5
-      spread: 6
-      proto: PelletShotgunUranium
+      proto: PelletShotgunUraniumSpread
     - type: SpentAmmoVisuals
       state: "depleted-uranium"
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml
index 31d7b65fe8b..65b7dbc1655 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml
@@ -1,5 +1,5 @@
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: BaseBullet
   id: BulletAntiMateriel
   name: bullet (.60 anti-materiel)
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml
index 5ce0bf82fe9..d1524cc0c35 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml
@@ -2,7 +2,7 @@
   id: BulletCaselessRifle
   name: bullet (.25 caseless)
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Projectile
     damage:
@@ -13,7 +13,7 @@
   id: BulletCaselessRiflePractice
   name: bullet (.25 caseless practice)
   parent: BaseBulletPractice
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Projectile
     damage:
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 36d41e391ac..873d9702142 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: PelletClusterRubber
-  name: pellet (ball, Rubber)
-  noSpawn: true
+  name: pellet (ball, rubber)
+  categories: [ HideSpawnMenu ]
   parent: BaseBullet
   components:
   - type: Sprite
@@ -19,8 +19,8 @@
 
 - type: entity
   id: PelletClusterLethal
-  name: pellet (ball, Lethal)
-  noSpawn: true
+  name: pellet (ball, lethal)
+  categories: [ HideSpawnMenu ]
   parent: BaseBullet
   components:
   - type: Sprite
@@ -37,7 +37,7 @@
 - type: entity
   id: PelletClusterIncendiary
   name: pellet (ball, incendiary)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: BaseBulletIncendiary
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
index be6a07e486d..d37555c3443 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
@@ -2,7 +2,7 @@
   id: BulletHeavyRifle
   name: bullet (.20 rifle)
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Projectile
     damage:
@@ -13,7 +13,7 @@
   id: BulletMinigun
   name: minigun bullet (.10 rifle)
   parent: BulletHeavyRifle
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Projectile
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
index 3a0df2ac6c7..e580960aa7e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
@@ -2,7 +2,7 @@
   id: BulletLightRifle
   name: bullet (.20 rifle)
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Projectile
     damage:
@@ -13,7 +13,7 @@
   id: BulletLightRiflePractice
   name: bullet (.20 rifle practice)
   parent: BaseBulletPractice
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Projectile
     damage:
@@ -35,7 +35,7 @@
   id: BulletLightRifleIncendiary
   parent: BaseBulletIncendiary
   name: bullet (.20 rifle incendiary)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Projectile
     damage:
@@ -47,7 +47,7 @@
   id: BulletLightRifleUranium
   parent: BaseBulletUranium
   name: bullet (.20 rifle uranium)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Projectile
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
index 1b5cf7890ba..b1095d8011a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
@@ -2,7 +2,7 @@
   id: BulletMagnum
   name: bullet (.45 magnum)
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Projectile
     damage:
@@ -13,7 +13,7 @@
   id: BulletMagnumPractice
   name: bullet (.45 magnum practice)
   parent: BaseBulletPractice
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Projectile
     damage:
@@ -37,7 +37,7 @@
   id: BulletMagnumIncendiary
   parent: BaseBulletIncendiary
   name: bullet (.45 magnum incendiary)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Projectile
     damage:
@@ -49,7 +49,7 @@
   id: BulletMagnumAP
   name: bullet (.45 magnum armor-piercing)
   parent: BaseBulletAP
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Projectile
     damage:
@@ -61,7 +61,7 @@
   id: BulletMagnumUranium
   name: bullet (.45 magnum uranium)
   parent: BaseBulletUranium
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Projectile
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
index 086a8dc914f..0384cecdd7d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
@@ -2,7 +2,7 @@
   id: BulletPistol
   name: bullet (.35 auto)
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Projectile
     damage:
@@ -13,7 +13,7 @@
   id: BulletPistolPractice
   name: bullet (.35 auto practice)
   parent: BaseBulletPractice
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Projectile
     damage:
@@ -35,7 +35,7 @@
   id: BulletPistolIncendiary
   parent: BaseBulletIncendiary
   name: bullet (.35 auto incendiary)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Projectile
     damage:
@@ -47,7 +47,7 @@
   id: BulletPistolUranium
   parent: BaseBulletUranium
   name: bullet (.35 auto uranium)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Projectile
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
index 2113916cf52..ebb16021c96 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
@@ -2,7 +2,7 @@
   id: BulletRifle
   name: bullet (0.20 rifle)
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Projectile
     damage:
@@ -13,7 +13,7 @@
   id: BulletRiflePractice
   name: bullet (0.20 rifle practice)
   parent: BaseBulletPractice
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Projectile
     damage:
@@ -35,7 +35,7 @@
   id: BulletRifleIncendiary
   parent: BaseBulletIncendiary
   name: bullet (0.20 rifle incendiary)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Projectile
     damage:
@@ -47,7 +47,7 @@
   id: BulletRifleUranium
   parent: BaseBulletUranium
   name: bullet (0.20 rifle uranium)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Projectile
     damage:
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 e119a846c9c..ce79b6f4174 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: PelletShotgunSlug
   name: pellet (.50 slug)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: BaseBullet
   components:
   - type: Sprite
@@ -15,7 +15,7 @@
 - type: entity
   id: PelletShotgunBeanbag
   name: beanbag (.50)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: BaseBullet
   components:
   - type: Sprite
@@ -31,7 +31,7 @@
 - type: entity
   id: PelletShotgun
   name: pellet (.50)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: BaseBullet
   components:
   - type: Sprite
@@ -42,10 +42,20 @@
       types:
         Piercing: 10
 
+- type: entity
+  id: PelletShotgunSpread
+  noSpawn: true
+  parent: PelletShotgun
+  components:
+  - type: ProjectileSpread
+    proto: PelletShotgun
+    count: 6
+    spread: 15
+
 - type: entity
   id: PelletShotgunIncendiary
   name: pellet (.50 incendiary)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: BaseBulletIncendiary
   components:
   - type: Sprite
@@ -59,10 +69,20 @@
   - type: IgnitionSource
     ignited: true
 
+- type: entity
+  id: PelletShotgunIncendiarySpread
+  noSpawn: true
+  parent: PelletShotgunIncendiary
+  components:
+  - type: ProjectileSpread
+    proto: PelletShotgunIncendiary
+    count: 6
+    spread: 15
+
 - type: entity
   id: PelletShotgunPractice
   name: pellet (.50 practice)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: BaseBulletPractice
   components:
   - type: Sprite
@@ -73,10 +93,20 @@
       types:
         Blunt: 1
 
+- type: entity
+  id: PelletShotgunPracticeSpread
+  noSpawn: true
+  parent: PelletShotgunPractice
+  components:
+  - type: ProjectileSpread
+    proto: PelletShotgunPractice
+    count: 6
+    spread: 15
+
 - type: entity
   id: PelletShotgunImprovised
   name: improvised pellet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: BaseBullet
   components:
   - type: Sprite
@@ -88,11 +118,20 @@
         Piercing: 3
         Slash: 3
 
+- type: entity
+  id: PelletShotgunImprovisedSpread
+  noSpawn: true
+  parent: PelletShotgunImprovised
+  components:
+  - type: ProjectileSpread
+    proto: PelletShotgunImprovised
+    count: 10
+    spread: 45
 
 - type: entity
   id: PelletShotgunTranquilizer
   name: pellet (.50 tranquilizer)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: BaseBulletPractice
   components:
   - type: Sprite
@@ -119,7 +158,7 @@
 - type: entity
   id: PelletShotgunFlare
   name: pellet (.50 flare)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Physics
     bodyType: Dynamic
@@ -166,7 +205,7 @@
 - type: entity
   id: PelletShotgunUranium
   name: pellet (.50 uranium)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: BaseBullet
   components:
   - type: Sprite
@@ -178,10 +217,20 @@
         Radiation: 5
         Piercing: 5
 
+- type: entity
+  id: PelletShotgunUraniumSpread
+  noSpawn: true
+  parent: PelletShotgunUranium
+  components:
+  - type: ProjectileSpread
+    proto: PelletShotgunUranium
+    count: 5
+    spread: 6
+
 - type: entity
   id: PelletGrapeshot #tally fucking ho
   name: grapeshot pellet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: BaseBullet
   components:
   - type: Sprite
@@ -196,11 +245,21 @@
         Piercing: 25
         Structural: 5
 
+- type: entity
+  id: PelletGrapeshotSpread
+  noSpawn: true
+  parent: PelletGrapeshot
+  components:
+  - type: ProjectileSpread
+    proto: PelletGrapeshot
+    count: 5
+    spread: 40
+
 - type: entity
   id: PelletGlass
   name: glass shard
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     noRot: false
@@ -215,3 +274,13 @@
     damage:
       types:
         Slash: 25
+
+- type: entity
+  id: PelletGlassSpread
+  parent: PelletGlass
+  noSpawn: true
+  components:
+  - type: ProjectileSpread
+    proto: PelletGlass
+    count: 5
+    spread: 10
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml
index 9b6c288e378..14595bd34a2 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml
@@ -31,3 +31,4 @@
     removalTime: .2
   - type: ThrowingAngle
     angle: 180
+  - type: LandAtCursor
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
index 152de7e92f2..04d405e8815 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
@@ -175,9 +175,7 @@
   parent: BaseCannonBall
   components:
   - type: CartridgeAmmo
-    proto: PelletGrapeshot
-    count: 5
-    spread: 40
+    proto: PelletGrapeshotSpread
     deleteOnSpawn: true
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi
@@ -190,9 +188,7 @@
   parent: BaseCannonBall
   components:
   - type: CartridgeAmmo
-    proto: PelletGlass
-    count: 5
-    spread: 10
+    proto: PelletGlassSpread
     deleteOnSpawn: true
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi
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 5e7bb82365a..c8e3279ac74 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -445,6 +445,7 @@
     - type: GuideHelp
       guides:
       - Security
+      - Antagonists
 
 - type: entity
   name: disabler SMG
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
index 9d685e1ddc0..aa1e7ec84d6 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
@@ -2,7 +2,7 @@
   name: BaseWeaponHeavyMachineGun
   parent: BaseItem
   id: BaseWeaponHeavyMachineGun
-  description: Spray and pray
+  description: Spray and pray.
   abstract: true
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
index 728783fb3ea..1a2e6167e1a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
@@ -24,7 +24,7 @@
   name: china lake
   parent: [BaseWeaponLauncher, BaseGunWieldable]
   id: WeaponLauncherChinaLake
-  description: PLOOP
+  description: PLOOP.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi
@@ -166,6 +166,8 @@
     - type: TetherGun
       frequency: 5
       dampingRatio: 4
+    - type: ItemToggle
+      onUse: false
     - type: PowerCellDraw
     - type: Sprite
       sprite: Objects/Weapons/Guns/Launchers/tether_gun.rsi
@@ -211,6 +213,8 @@
         path: /Audio/Weapons/soup.ogg
         params:
           volume: 2
+    - type: ItemToggle
+      onUse: false
     - type: PowerCellDraw
     - type: Sprite
       sprite: Objects/Weapons/Guns/Launchers/force_gun.rsi
@@ -247,6 +251,7 @@
     - type: Gun
       soundGunshot: /Audio/Weapons/Guns/Gunshots/harpoon.ogg
       fireRate: 0.5
+      clumsyProof: true
     - type: BasicEntityAmmoProvider
       proto: GrapplingHook
       capacity: 1
@@ -355,7 +360,7 @@
   parent: WeaponLauncherMultipleRocket
   id: WeaponLauncherAdmemeMeteorLarge
   suffix: Admeme
-  description: It fires large meteors
+  description: It fires large meteors.
   components:
   - type: BallisticAmmoProvider
     whitelist:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
index 61db805395e..08221914d32 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -47,6 +47,7 @@
         whitelist:
           tags:
             - MagazinePistol
+        whitelistFailPopup: gun-magazine-whitelist-fail
       gun_chamber:
         name: Chamber
         startingItem: CartridgePistol
@@ -75,6 +76,7 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Pistols/viper.rsi
+  - type: Gun
     availableModes: # DeltaV - force semi for balance
     - SemiAuto
   - type: ItemSlots
@@ -89,6 +91,7 @@
           tags:
             - MagazinePistol
             - MagazinePistolHighCapacity
+        whitelistFailPopup: gun-magazine-whitelist-fail
       gun_chamber:
         name: Chamber
         startingItem: CartridgePistol
@@ -101,6 +104,41 @@
       gun_magazine: !type:ContainerSlot
       gun_chamber: !type:ContainerSlot
 
+- type: entity
+  name: echis
+  parent: BaseItem
+  id: WeaponPistolEchis
+  description: A viper for use by cyborgs. Creates .35 ammo on the fly from an internal ammo fabricator, which slowly self-charges.
+  components:
+  - type: Gun
+    fireRate: 5
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+      - FullAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/pistol.ogg
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Pistols/viper.rsi
+    layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-0
+        map: ["enum.GunVisualLayers.Mag"]
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+  - type: ProjectileBatteryAmmoProvider
+    proto: BulletPistol
+    fireCost: 100
+  - type: Battery
+    maxCharge: 1000
+    startingCharge: 1000
+  - type: BatterySelfRecharger
+    autoRecharge: true
+    autoRechargeRate: 25
+  - type: AmmoCounter
+
 - type: entity
   name: cobra
   parent: BaseWeaponPistol
@@ -137,6 +175,7 @@
         whitelist:
           tags:
             - MagazinePistolCaselessRifle
+        whitelistFailPopup: gun-magazine-whitelist-fail
       gun_chamber:
         name: Chamber
         startingItem: CartridgeCaselessRifle
@@ -231,6 +270,7 @@
         whitelist:
           tags:
             - MagazineMagnum
+        whitelistFailPopup: gun-magazine-whitelist-fail
       gun_chamber:
         name: Chamber
         startingItem: CartridgeMagnum
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
index 3f37d308db5..89db3240bef 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
@@ -1,7 +1,7 @@
 # Used to animate the hitscan effects because effectsystem doesn't support it
 - type: entity
   id: HitscanEffect
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: TimedDespawn
     lifetime: 2.0
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml
index d70b05bf61d..9be9e43e943 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: BulletImpactEffect
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: TimedDespawn
     lifetime: 0.25
@@ -18,7 +18,7 @@
 
 - type: entity
   id: BulletImpactEffectDisabler
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: TimedDespawn
       lifetime: 0.2
@@ -36,7 +36,7 @@
 
 - type: entity
   id: BulletImpactEffectOrangeDisabler
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: TimedDespawn
     lifetime: 0.2
@@ -55,7 +55,7 @@
 
 - type: entity
   id: BulletImpactEffectKinetic
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: TimedDespawn
     lifetime: 0.2
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
index d6adcd614e3..d11f96d8752 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
@@ -3,7 +3,7 @@
   name: fireball
   description: You better GITTAH WEIGH.
   parent: BulletRocket
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: PointLight
     color: "#E25822"
@@ -31,7 +31,7 @@
     fireStacks: 0.35
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: BaseBulletTrigger
   id: ProjectileDragonsBreath
   name: dragon's breath
@@ -68,7 +68,7 @@
   name: fireball
   description: Hovering blob of flame.
   parent: ProjectileFireball
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: TimedDespawn
     lifetime: 30
@@ -82,7 +82,7 @@
 - type: entity
   id: ProjectilePolyboltBase
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/magic.rsi
@@ -99,7 +99,7 @@
   parent: ProjectilePolyboltBase
   name: carp polybolt
   description: Nooo, I don't wanna be fish!
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: PolymorphOnCollide
     polymorph: WizardForcedCarp
@@ -112,7 +112,7 @@
   parent: ProjectilePolyboltBase
   name: monkey polybolt
   description: Nooo, I don't wanna be monkey!
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: PolymorphOnCollide
     polymorph: WizardForcedMonkey
@@ -125,7 +125,7 @@
   parent: ProjectilePolyboltBase
   name: door polybolt
   description: Nooo, I don't wanna be door!
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/magic.rsi
@@ -146,7 +146,7 @@
   name: healing bolt
   description: I COMMAND YOU TO LIVE!
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/magic.rsi
@@ -166,7 +166,7 @@
   id: BulletInstakillMagic
   name: magical lead cylinder
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   description: This looks familiar.
   components:
   - type: Projectile
@@ -179,8 +179,8 @@
   id: ProjectilePolyboltCluwne
   parent: ProjectilePolyboltBase
   name: cluwne polybolt
-  description: knoH KnoH!
-  noSpawn: true
+  description: KnoH KnoH!
+  categories: [ HideSpawnMenu ]
   components:
   - type: PolymorphOnCollide
     polymorph: WizardForcedCluwne
@@ -191,9 +191,9 @@
 - type: entity
   id: ProjectileIcicle
   parent: BaseBullet
-  name: Icicle
+  name: icicle
   description: Brrrrr.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Structures/Specific/Anomalies/ice_anom.rsi
@@ -209,7 +209,7 @@
   id: ProjectilePolyboltBread
   name: bread polybolt
   description: Nooo, I don't wanna be bread!
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: PolymorphOnCollide
     polymorph: BreadMorph
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 81e9da5cda0..128c4da132c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: MuzzleFlashEffect
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: TimedDespawn
     lifetime: 0.4
@@ -69,7 +69,7 @@
 - type: entity
   id: BaseBulletTrigger # Trigger-on-collide bullets
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: TriggerOnCollide
     fixtureID: projectile
@@ -93,7 +93,7 @@
   id: BaseBulletPractice
   name: base bullet practice
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -127,7 +127,7 @@
   id: BaseBulletIncendiary
   name: base bullet incendiary
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Projectile
     damage:
@@ -145,7 +145,7 @@
   id: BaseBulletAP
   name: base bullet armor-piercing
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -161,7 +161,7 @@
   id: BaseBulletUranium
   name: base bullet uranium
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -177,7 +177,7 @@
   name: taser bolt
   id: BulletTaser
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: FlyBySound
     sound:
@@ -219,7 +219,7 @@
   name : disabler bolt
   id: BulletDisabler
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Reflective
     reflective:
@@ -262,7 +262,7 @@
   name : disabler bolt practice
   id: BulletDisablerPractice
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: FlyBySound
     sound:
@@ -302,7 +302,7 @@
   name: emitter bolt
   id: EmitterBolt
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Structures/Power/Generation/Singularity/emitter.rsi
@@ -339,7 +339,7 @@
   name: watcher bolt
   id: WatcherBolt
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: FlyBySound
     sound:
@@ -379,7 +379,7 @@
   name: magmawing watcher bolt
   id: WatcherBoltMagmawing
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
@@ -398,7 +398,7 @@
   id: BulletKinetic
   name: kinetic bolt
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   description: Not too bad, but you still don't want to get hit by it.
   components:
   - type: Reflective
@@ -424,7 +424,7 @@
 - type: entity
   id: BulletKineticShuttle
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     noRot: false
@@ -452,7 +452,7 @@
   id: BulletCharge
   name: charge bolt
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   description: Marks a target for additional damage.
   components:
   - type: Reflective
@@ -486,7 +486,7 @@
   parent: BaseBullet
   id: AnomalousParticleDelta
   name: delta particles
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: PointLight
     enabled: true
@@ -527,7 +527,7 @@
 - type: entity
   parent: AnomalousParticleDelta
   id: AnomalousParticleDeltaStrong
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: AnomalousParticle
     particleType: Delta
@@ -540,7 +540,7 @@
   parent: AnomalousParticleDelta
   id: AnomalousParticleEpsilon
   name: epsilon particles
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: PointLight
     enabled: true
@@ -557,7 +557,7 @@
 - type: entity
   parent: AnomalousParticleEpsilon
   id: AnomalousParticleEpsilonStrong
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: AnomalousParticle
     particleType: Epsilon
@@ -570,7 +570,7 @@
   parent: AnomalousParticleDelta
   id: AnomalousParticleZeta
   name: zeta particles
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: PointLight
     enabled: true
@@ -587,7 +587,7 @@
 - type: entity
   parent: AnomalousParticleZeta
   id: AnomalousParticleZetaStrong
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: AnomalousParticle
     particleType: Zeta
@@ -600,7 +600,7 @@
   parent: AnomalousParticleDelta
   id: AnomalousParticleOmegaStrong
   name: omega particles
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: PointLight
     enabled: true
@@ -629,7 +629,7 @@
   parent: AnomalousParticleDelta
   id: AnomalousParticleSigma
   name: sigma particles
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: PointLight
     enabled: true
@@ -647,7 +647,7 @@
   parent: AnomalousParticleSigma
   id: AnomalousParticleSigmaStrong
   name: sigma particles
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: AnomalousParticle
     particleType: Sigma
@@ -657,7 +657,7 @@
   id: BulletRocket
   name: rocket
   parent: BaseBulletTrigger
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -679,7 +679,7 @@
   id: BulletWeakRocket
   name: weak rocket
   parent: BaseBulletTrigger
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -701,7 +701,7 @@
   id: BulletGrenadeBaton
   name: baton grenade
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -721,7 +721,7 @@
   id: BulletGrenadeBlast
   name: blast grenade
   parent: BaseBulletTrigger
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -738,7 +738,7 @@
   id: BulletGrenadeFlash
   name: flash grenade
   parent: BaseBulletTrigger
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -757,7 +757,7 @@
   id: BulletGrenadeFrag
   name: frag grenade
   parent: BaseBulletTrigger
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -774,7 +774,7 @@
   id: BulletGrenadeEMP
   name: EMP rocket
   parent: BaseBulletTrigger
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -795,7 +795,7 @@
   id: BulletCap
   name: cap bullet
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
@@ -811,7 +811,7 @@
   id: BulletAcid
   name: acid spit
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Projectile
       damage:
@@ -827,7 +827,7 @@
 - type: entity
   id: BulletWaterShot
   name: water
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Clickable
   - type: Physics
@@ -870,7 +870,7 @@
   id: BulletCannonBall
   name: cannonball
   parent: BaseBulletTrigger
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -891,7 +891,7 @@
 - type: entity
   id: GrapplingHook
   name: grappling hook
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: EmbeddableProjectile
       deleteOnRemove: true
@@ -927,7 +927,7 @@
   name : disabler bolt smg
   id: BulletDisablerSmg
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Reflective
     reflective:
@@ -970,7 +970,7 @@
   name: tesla gun lightning
   id: TeslaGunBullet
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: TimedDespawn
     lifetime: 5
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
index bd043c997da..0df556a742f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -129,11 +129,9 @@
         volume: 2.25
 
 - type: entity
-  name: Python
   parent: WeaponRevolverPython
   id: WeaponRevolverPythonAP # For the uplink.
   suffix: armor-piercing
-  description: A robust revolver favoured by Syndicate agents. Uses .45 magnum ammo.
   components:
   - type: RevolverAmmoProvider
     whitelist:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
index 46721c041ad..327edaf4d5f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -36,6 +36,7 @@
         whitelist:
           tags:
             - MagazineLightRifle
+        whitelistFailPopup: gun-magazine-whitelist-fail
       gun_chamber:
         name: Chamber
         startingItem: CartridgeLightRifle
@@ -81,6 +82,7 @@
         whitelist:
           tags:
             - MagazineLightRifle
+        whitelistFailPopup: gun-magazine-whitelist-fail
       gun_chamber:
         name: Chamber
         startingItem: CartridgeLightRifle
@@ -124,6 +126,7 @@
         whitelist:
           tags:
             - MagazineRifle
+        whitelistFailPopup: gun-magazine-whitelist-fail
       gun_chamber:
         name: Chamber
         startingItem: CartridgeRifle
@@ -170,6 +173,7 @@
         whitelist:
           tags:
             - MagazineRifle
+        whitelistFailPopup: gun-magazine-whitelist-fail
       gun_chamber:
         name: Chamber
         startingItem: CartridgeRifle
@@ -241,3 +245,4 @@
     soundEmpty:
       path: /Audio/Weapons/Guns/Empty/empty.ogg
     clumsyProof: true
+  - type: PacifismAllowedGun
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index 20611e3bcf9..1c232e9776c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -41,6 +41,7 @@
         whitelist:
           tags:
             - MagazinePistolSubMachineGun
+        whitelistFailPopup: gun-magazine-whitelist-fail
       gun_chamber:
         name: Chamber
         startingItem: CartridgePistol
@@ -100,7 +101,7 @@
     maxAngle: -16
   - type: Gun
     minAngle: 21
-    maxAngle: 32 
+    maxAngle: 32
     shotsPerBurst: 5
     availableModes:
     - SemiAuto
@@ -156,6 +157,7 @@
           whitelist:
             tags:
               - MagazinePistolSubMachineGun
+          whitelistFailPopup: gun-magazine-whitelist-fail
         gun_chamber:
           name: Chamber
           startingItem: CartridgePistol
@@ -210,6 +212,7 @@
         whitelist:
           tags:
             - CartridgeMagnum
+        whitelistFailPopup: gun-magazine-whitelist-fail
   - type: MagazineVisuals
     magState: mag
     steps: 1
@@ -262,6 +265,7 @@
         whitelist:
           tags:
             - MagazinePistolSubMachineGunTopMounted
+        whitelistFailPopup: gun-magazine-whitelist-fail
       gun_chamber:
         name: Chamber
         startingItem: CartridgePistol
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
index 19b619270ff..cd87b541fc8 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -85,6 +85,7 @@
         whitelist:
           tags:
           - MagazineShotgun
+        whitelistFailPopup: gun-magazine-whitelist-fail
         insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
         ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
   - type: ContainerContainer
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index 252eecbd061..f69cb4fd2da 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -66,7 +66,7 @@
 
 - type: entity
   name: musket
-  parent: BaseWeaponSniper
+  parent: [BaseWeaponSniper, BaseGunWieldable]
   id: Musket
   description: This should've been in a museum long before you were born. Uses .60 anti-materiel ammo.
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
index 3f75faf75e1..82177478fa7 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
@@ -197,7 +197,7 @@
 
 - type: entity
   name: xeno turret
-  description: Shoots 9mm acid projectiles
+  description: Shoots 9mm acid projectiles.
   parent: BaseWeaponTurret
   id: WeaponTurretXeno
   suffix: Xeno
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index 31606a2278a..f02341bea87 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -13,10 +13,12 @@
   - type: ItemToggleActiveSound
     activeSound:
       path: /Audio/Weapons/ebladehum.ogg
-  - type: ItemToggleSharp
+  - type: ComponentToggler
+    components:
+    - type: Sharp
+    - type: DisarmMalus
+      malus: 0.6
   - type: ItemToggleHot
-  - type: ItemToggleDisarmMalus
-    activatedDisarmMalus: 0.6
   - type: ItemToggleSize
     activatedSize: Huge
   - type: ItemToggleMeleeWeapon
@@ -74,35 +76,30 @@
       right:
       - state: inhand-right-blade
         shader: unshaded
-  - type: DisarmMalus
-    malus: 0
   - type: Reflect
-    enabled: false
   - type: IgnitionSource
     temperature: 700
 
 - type: entity
-  name: pen
+  name: energy dagger
   parent: EnergySword
-  id: EnergyDagger
-  suffix: E-Dagger
-  description: 'A dark ink pen.'
+  id: EnergyDaggerLoud
+  description: A not as loud and dangerous dagger with a beam made of pure, concentrated plasma. This one is completely undisguised.
   components:
-  - type: EnergySword
   - type: ItemToggle
     soundActivate:
       path: /Audio/Weapons/ebladeon.ogg
       params:
-        volume: -6
+        volume: -3
     soundDeactivate:
       path: /Audio/Weapons/ebladeoff.ogg
       params:
-        volume: -6
+        volume: -3
   - type: ItemToggleMeleeWeapon
     activatedSoundOnSwing:
       path: /Audio/Weapons/eblademiss.ogg
       params:
-        volume: -6
+        volume: -3
         variation: 0.250
     activatedDamage:
         types:
@@ -113,11 +110,14 @@
     activeSound:
       path: /Audio/Weapons/ebladehum.ogg
       params:
-        volume: -6
-  - type: ItemToggleDisarmMalus
-    activatedDisarmMalus: 0.4
+        volume: -3
+  - type: ComponentToggler
+    components:
+    - type: Sharp
+    - type: DisarmMalus
+      malus: 0.4
   - type: Sprite
-    sprite: Objects/Weapons/Melee/e_dagger.rsi
+    sprite: Objects/Weapons/Melee/e_dagger_loud.rsi
     layers:
       - state: e_sword
       - state: e_sword_blade
@@ -134,7 +134,7 @@
         Blunt: 1
   - type: Item
     size: Tiny
-    sprite: Objects/Weapons/Melee/e_dagger.rsi
+    sprite: Objects/Weapons/Melee/e_dagger_loud.rsi
   - type: UseDelay
     delay: 1.0
   - type: PointLight
@@ -153,11 +153,45 @@
       right:
       - state: inhand-right-blade
         shader: unshaded
+  - type: DisarmMalus
+    malus: 0
+
+- type: entity
+  name: pen
+  parent: EnergyDaggerLoud
+  id: EnergyDagger
+  suffix: E-Dagger
+  description: 'A dark ink pen.'
+  components:
+  - type: ItemToggle
+    soundActivate:
+      path: /Audio/Weapons/ebladeon.ogg
+      params:
+        volume: -6
+    soundDeactivate:
+      path: /Audio/Weapons/ebladeoff.ogg
+      params:
+        volume: -6
+  - type: ItemToggleActiveSound
+    activeSound:
+      path: /Audio/Weapons/ebladehum.ogg
+      params:
+        volume: -6
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/e_dagger.rsi
+    layers:
+      - state: e_sword
+      - state: e_sword_blade
+        color: "#FFFFFF"
+        visible: false
+        shader: unshaded
+        map: [ "blade" ]
+  - type: Item
+    size: Tiny
+    sprite: Objects/Weapons/Melee/e_dagger.rsi
   - type: Tag
     tags:
     - Write
-  - type: DisarmMalus
-    malus: 0
 
 - type: entity
   parent: BaseItem
@@ -183,15 +217,12 @@
   id: EnergyCutlass
   description: An exotic energy weapon, brutal blade crackling with crudely harnessed plasma. #DeltaV - nicer description.
   components:
-  - type: EnergySword
   - type: ItemToggleMeleeWeapon
     activatedDamage:
         types:
             Slash: 10
             Heat: 12
     deactivatedSecret: true
-  - type: ItemToggleDisarmMalus
-    activatedDisarmMalus: 0.6
   - type: Sprite
     sprite: DeltaV/Objects/Weapons/Melee/e_cutlass.rsi # DeltaV
     layers:
@@ -227,8 +258,8 @@
   id: EnergySwordDouble
   description: Syndicate Command Interns thought that having one blade on the energy sword was not enough. This can be stored in pockets.
   components:
-  - type: EnergySword
   - type: ItemToggle
+    onUse: false # wielding events control it instead
     soundActivate:
       path: /Audio/Weapons/ebladeon.ogg
       params:
@@ -253,9 +284,13 @@
       path: /Audio/Weapons/ebladehum.ogg
       params:
         volume: 3
-  - type: ItemToggleDisarmMalus
-    activatedDisarmMalus: 0.7
+  - type: ComponentToggler
+    components:
+    - type: Sharp
+    - type: DisarmMalus
+      malus: 0.7
   - type: Wieldable
+    wieldSound: null # esword light sound instead
   - type: MeleeWeapon
     wideAnimationRotation: -135
     attackRate: 1.5
@@ -291,3 +326,12 @@
       right:
       - state: inhand-right-blade
         shader: unshaded
+
+- type: entity
+  suffix: One-Handed, For Borgs
+  parent: EnergySwordDouble
+  id: CyborgEnergySwordDouble # why is this invalid if ID is BorgEnergySwordDouble
+  description: Syndicate Command Interns thought that having one blade on the energy sword was not enough. Specially designed for syndicate cyborgs.
+  components: # could add energy-draining like the L6C
+  - type: Wieldable
+    freeHandsRequired: 0 # because borg has no off-hand to wield with.  Without this, it will be unable to activate the esword
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index afe4644517c..39a04120e0d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -44,6 +44,7 @@
   - type: GuideHelp
     guides:
     - Chef
+    - FoodRecipes
 
 - type: entity
   name: butcher's cleaver
@@ -70,6 +71,7 @@
   - type: GuideHelp
     guides:
     - Chef
+    - FoodRecipes
 
 - type: entity
   name: combat knife
@@ -92,6 +94,7 @@
         Slash: 12
   - type: EmbeddableProjectile
     sound: /Audio/Weapons/star_hit.ogg
+  - type: LandAtCursor
   - type: DamageOtherOnHit
     damage:
       types:
@@ -150,6 +153,7 @@
     damage:
       types:
         Slash: 10
+  - type: LandAtCursor
   - type: Sprite
     sprite: Clothing/Head/Hats/greyflatcap.rsi
   - type: Clothing
@@ -274,6 +278,7 @@
         Slash: 5
   - type: EmbeddableProjectile
     sound: /Audio/Weapons/star_hit.ogg
+  - type: LandAtCursor
   - type: DamageOtherOnHit
     ignoreResistances: true
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/needle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/needle.yml
index 11efeba5f8c..e472157081a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/needle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/needle.yml
@@ -12,6 +12,13 @@
     damage:
       types:
         Piercing: 1
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Piercing: 1
   - type: Item
     size: Tiny
   - type: BalloonPopper
+  - type: ThrowingAngle
+    angle: -135
+  - type: LandAtCursor
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
index 324d4ee878e..d00a36e07be 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
@@ -2,7 +2,7 @@
   name: pickaxe
   parent: BaseItem
   id: Pickaxe
-  description: Notched to perfection, for jamming it into rocks
+  description: Notched to perfection, for jamming it into rocks.
   components:
   - type: Tag
     tags:
@@ -40,7 +40,7 @@
   name: mining drill
   parent: BaseItem
   id: MiningDrill
-  description: Powerful tool used to quickly drill through rocks
+  description: Powerful tool used to quickly drill through rocks.
   components:
   - type: Item
     storedRotation: -90
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
index 0def916ddc7..d6985c018d7 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
@@ -5,9 +5,10 @@
   description: Definition of a Classic. Keeping murder affordable since 200,000 BCE.
   components:
   - type: EmbeddableProjectile
-    offset: 0.15,0.15
+    offset: -0.15,0.0
   - type: ThrowingAngle
     angle: 225
+  - type: LandAtCursor
   - type: Tag
     tags:
     - Spear
@@ -111,6 +112,11 @@
   - type: SolutionContainerVisuals
     maxFillLevels: 1
     fillBaseName: spear
+    inHandsFillBaseName: -fill-
+    inHandsMaxFillLevels: 1
+    equippedFillBaseName: -fill-
+    equippedMaxFillLevels: 1
+
 
 - type: entity
   name: reinforced spear
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml
index 9e187651ec5..437cd8994ef 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml
@@ -41,6 +41,7 @@
   - type: StaminaDamageOnCollide
     damage: 35
     sound: /Audio/Weapons/egloves.ogg
+  - type: LandAtCursor # it deals stamina damage when thrown
   - type: Battery
     maxCharge: 360
     startingCharge: 360
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
index 5ffe16d3b53..817f5bb7f89 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -1,15 +1,28 @@
 - type: entity
-  name: captain's sabre
   parent: BaseItem
+  id: BaseSword
+  abstract: true
+  components:
+  - type: Sharp
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+  - type: Sprite
+    state: icon
+  - type: Item
+    size: Normal
+  - type: Utensil
+    types:
+      - Knife
+
+- type: entity
+  name: captain's sabre
+  parent: BaseSword
   id: CaptainSabre
   description: A ceremonial weapon belonging to the captain of the station.
   components:
-  - type: Sharp
   - type: Sprite
     sprite: Objects/Weapons/Melee/captain_sabre.rsi
-    state: icon
   - type: MeleeWeapon
-    wideAnimationRotation: -135
     attackRate: 1.5
     damage:
       types:
@@ -17,11 +30,9 @@
     soundHit:
         path: /Audio/Weapons/bladeslice.ogg
   - type: Reflect
-    enabled: true
     reflectProb: .1
     spread: 90
   - type: Item
-    size: Normal
     sprite: Objects/Weapons/Melee/captain_sabre.rsi
   - type: Tag
     tags:
@@ -30,26 +41,22 @@
 
 - type: entity
   name: katana
-  parent: BaseItem
+  parent: BaseSword
   id: Katana
   description: Ancient craftwork made with not so ancient plasteel.
   components:
-  - type: Sharp
   - type: Tag
     tags:
     - Katana
   - type: Sprite
     sprite: DeltaV/Objects/Weapons/Melee/katana.rsi #DeltaV
-    state: icon
   - type: MeleeWeapon
-    wideAnimationRotation: -135
     damage:
       types:
         Slash: 15
     soundHit:
         path: /Audio/Weapons/bladeslice.ogg
   - type: Item
-    size: Normal
     sprite: DeltaV/Objects/Weapons/Melee/katana.rsi #DeltaV
   - type: DisarmMalus
 
@@ -61,14 +68,12 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Melee/energykatana.rsi
-    state: icon
   - type: MeleeWeapon
     wideAnimationRotation: -60
     damage:
       types:
         Slash: 30
   - type: Item
-    size: Normal
     sprite: Objects/Weapons/Melee/energykatana.rsi
   - type: EnergyKatana
   - type: DashAbility
@@ -86,41 +91,34 @@
 
 - type: entity
   name: machete
-  parent: BaseItem
+  parent: BaseSword
   id: Machete
   description: A large, vicious looking blade.
   components:
-  - type: Sharp
   - type: Tag
     tags:
     - Machete
   - type: Sprite
     sprite: Objects/Weapons/Melee/machete.rsi
-    state: icon
   - type: MeleeWeapon
-    wideAnimationRotation: -135
     damage:
       types:
         Slash: 15
     soundHit:
         path: /Audio/Weapons/bladeslice.ogg
   - type: Item
-    size: Normal
     sprite: Objects/Weapons/Melee/machete.rsi
   - type: DisarmMalus
 
 - type: entity
   name: claymore
-  parent: BaseItem
+  parent: BaseSword
   id: Claymore
   description: An ancient war blade.
   components:
-  - type: Sharp
   - type: Sprite
     sprite: Objects/Weapons/Melee/claymore.rsi
-    state: icon
   - type: MeleeWeapon
-    wideAnimationRotation: -135
     attackRate: 0.75
     damage:
       types:
@@ -128,7 +126,6 @@
     soundHit:
         path: /Audio/Weapons/bladeslice.ogg
   - type: Item
-    size: Normal
   - type: Clothing
     sprite: Objects/Weapons/Melee/claymore.rsi
     slots:
@@ -137,41 +134,34 @@
 
 - type: entity
   name: cutlass
-  parent: BaseItem
+  parent: BaseSword
   id: Cutlass
   description: A wickedly curved blade, often seen in the hands of space pirates.
   components:
-  - type: Sharp
   - type: Tag
     tags:
     - Machete
   - type: Sprite
     sprite: Objects/Weapons/Melee/cutlass.rsi
-    state: icon
   - type: MeleeWeapon
-    wideAnimationRotation: -135
     damage:
       types:
         Slash: 16
     soundHit:
         path: /Audio/Weapons/bladeslice.ogg
   - type: Item
-    size: Normal
     sprite: Objects/Weapons/Melee/cutlass.rsi
   - type: DisarmMalus
 
 - type: entity
-  name: The Throngler
-  parent: BaseItem
+  name: Throngler
+  parent: BaseSword
   id: Throngler
   description: Why would you make this?
   components:
-    - type: Sharp
     - type: Sprite
       sprite: Objects/Weapons/Melee/Throngler2.rsi
-      state: icon
     - type: MeleeWeapon
-      wideAnimationRotation: -135
       attackRate: 10
       damage:
         types:
@@ -184,10 +174,12 @@
       soundHit:
         path: /Audio/Effects/explosion_small1.ogg
     - type: Reflect
-      enabled: true
       reflectProb: .25
       spread: 90
     - type: Item
       size: Ginormous
       sprite: Objects/Weapons/Melee/Throngler-in-hand.rsi
     - type: DisarmMalus
+    - type: Grammar
+      attributes:
+        proper: true
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
index ca3edf68c0d..fea9a8d5ea3 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
@@ -47,4 +47,4 @@
     staminaDamage: 55 # Sudden weight increase sapping stamina
     canThrowTrigger: true
     canMoveBreakout: true
-
+  - type: LandAtCursor
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml
index 35174ba34d2..99b50c558b5 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml
@@ -20,7 +20,7 @@
 - type: entity
   parent: GrenadeBase
   id: ClusterBangFull
-  name: ClusterBang
+  name: clusterbang
   description: Launches three flashbangs after the timer runs out.
   suffix: Full
   components:
@@ -96,6 +96,7 @@
     damage:
       types:
         Blunt: 10
+  - type: LandAtCursor
   - type: Damageable
     damageContainer: Inorganic
   - type: EmitSoundOnTrigger
@@ -224,6 +225,7 @@
     damage:
       types:
         Blunt: 10
+  - type: LandAtCursor
   - type: EmitSoundOnTrigger
     sound:
       path: "/Audio/Effects/flash_bang.ogg"
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
index b1d260c3276..2986eb0457a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -59,7 +59,7 @@
 
 - type: entity
   name: flashbang
-  description: Eeeeeeeeeeeeeeeeeeeeee
+  description: Eeeeeeeeeeeeeeeeeeeeee.
   parent: GrenadeBase
   id: GrenadeFlashBang
   components:
@@ -80,10 +80,11 @@
   - type: GuideHelp
     guides:
     - Security
+    - Antagonists
 
 - type: entity
   id: GrenadeFlashEffect
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: PointLight
       enabled: true
@@ -121,11 +122,11 @@
         volume: 12
 
 - type: entity
-  name: Self Destruct
+  name: self destruct
   description: Go out on your own terms!
   parent: GrenadeBase
   id: SelfDestructSeq
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: ExplodeOnTrigger
   - type: Explosive
@@ -338,7 +339,7 @@
   - type: Sprite
     sprite: Objects/Weapons/Grenades/empgrenade.rsi
   - type: EmpOnTrigger
-    range: 4
+    range: 5.5
     energyConsumption: 50000
   - type: DeleteOnTrigger
   - type: Appearance
@@ -393,7 +394,7 @@
   parent: SmokeGrenade
   id: CleanerGrenade
   name: cleanade
-  description: Special grenade for janitors, releasing large cloud of space cleaner foam
+  description: Special grenade for janitors, releasing large cloud of space cleaner foam.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Grenades/janitor.rsi
@@ -422,6 +423,21 @@
       - ReagentId: TearGas
         Quantity: 50
 
+- type: entity
+  parent: SmokeGrenade
+  id: MetalFoamGrenade
+  name: metal foam grenade
+  description: An emergency tool used for patching up holes. Almost as good as real walls.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Grenades/metalfoam.rsi
+  - type: SmokeOnTrigger
+    duration: 10
+    spreadAmount: 13
+    smokePrototype: AluminiumMetalFoam
+  - type: StaticPrice
+    price: 350
+
 # Non-explosive "dummy" grenades to use as a distraction.
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/throwing_stars.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/throwing_stars.yml
index c68feff0b5c..0dfc9a0312f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/throwing_stars.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/throwing_stars.yml
@@ -31,6 +31,7 @@
         friction: 0.2
   - type: EmbeddableProjectile
     sound: /Audio/Weapons/star_hit.ogg
+  - type: LandAtCursor
   - type: DamageOtherOnHit
     damage:
       types:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
index ceb81376752..2c16d789fff 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
@@ -43,6 +43,7 @@
   - type: StaminaDamageOnCollide
     damage: 35
     sound: /Audio/Weapons/egloves.ogg
+  - type: LandAtCursor # it deals stamina damage when thrown
   - type: Battery
     maxCharge: 1000
     startingCharge: 1000
@@ -85,6 +86,7 @@
   - type: GuideHelp
     guides:
     - Security
+    - Antagonists
 
 - type: entity
   name: truncheon
@@ -106,7 +108,7 @@
   - type: Item
     size: Normal
   - type: Tag
-    tags: 
+    tags:
     - Truncheon
   - type: Clothing
     sprite: Objects/Weapons/Melee/truncheon.rsi
@@ -121,6 +123,7 @@
   - type: GuideHelp
     guides:
     - Security
+    - Antagonists
 
 - type: entity
   name: flash
@@ -165,6 +168,7 @@
     - type: GuideHelp
       guides:
       - Security
+      - Antagonists
 
 - type: entity
   name: flash
@@ -178,7 +182,7 @@
 
 - type: entity
   name: portable flasher
-  parent: BaseStructure
+  parent: BaseMachine
   id: PortableFlasher
   description: An ultrabright flashbulb with a proximity trigger, useful for making an area security-only.
   components:
@@ -194,14 +198,11 @@
         !type:PhysShapeCircle
           radius: 2
       repeating: true
-    - type: Anchorable
     - type: Sprite
       sprite: Objects/Weapons/pflash.rsi
       layers:
         - state: "off"
           map: ["enum.ProximityTriggerVisualLayers.Base"]
-    - type: InteractionOutline
-    - type: Physics
     - type: Fixtures
       fixtures:
         fix1:
@@ -223,3 +224,4 @@
     - type: GuideHelp
       guides:
       - Security
+      - Antagonists
diff --git a/Resources/Prototypes/Entities/Stations/base.yml b/Resources/Prototypes/Entities/Stations/base.yml
index 5cbe349416f..a3c7aca44c3 100644
--- a/Resources/Prototypes/Entities/Stations/base.yml
+++ b/Resources/Prototypes/Entities/Stations/base.yml
@@ -46,57 +46,44 @@
       path: /Maps/Shuttles/cargo.yml
     - type: GridSpawn
       groups:
-#        trade:
+#        trade: # DeltaV - trade station has its own map
 #          addComponents:
 #          - type: ProtectedGrid
 #          - type: TradeStation
 #          paths:
 #          - /Maps/Shuttles/trading_outpost.yml
-#        mining:
+#        mining: # DeltaV - no salv ship
 #          paths:
 #          - /Maps/Shuttles/mining.yml
         # Spawn last
-        ruins:
+        ruins: !type:GridSpawnGroup
           hide: true
           nameGrid: true
           minCount: 2
           maxCount: 2
           stationGrid: false
           paths:
+          #- /Maps/Ruins/chunked_tcomms.yml # TODO
           - /Maps/Ruins/DeltaV/biodome_satellite.yml #Delta V - Move to DV folder
           - /Maps/Ruins/DeltaV/derelict.yml #Delta V - Move to DV folder
           - /Maps/Ruins/DeltaV/djstation.yml #Delta V - Move to DV folder
+          #- /Maps/Ruins/empty_flagship.yml # TODO
           - /Maps/Ruins/DeltaV/old_ai_sat.yml #Delta V - Move to DV folder
           - /Maps/Ruins/DeltaV/relaystation.yml #Delta V - Move to DV folder
+          #- /Maps/Ruins/syndicate_dropship.yml # TODO
           - /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
-  components:
-    - type: GridSpawn
-      groups:
-        cargo:
-          paths:
-          - /Maps/Shuttles/cargo_core.yml
-#        mining:
-#          paths:
-#          - /Maps/Shuttles/mining.yml
-        ruins:
-          hide: true
-          nameGrid: true
-          minCount: 2
-          maxCount: 2
+        vgroid: !type:DungeonSpawnGroup
+          minimumDistance: 400
+          maximumDistance: 450
+          nameDataset: names_borer
           stationGrid: false
-          paths:
-          - /Maps/Ruins/DeltaV/biodome_satellite.yml #Delta V - Move to DV folder
-          - /Maps/Ruins/DeltaV/derelict.yml #Delta V - Move to DV folder
-          - /Maps/Ruins/DeltaV/djstation.yml #Delta V - Move to DV folder
-          - /Maps/Ruins/DeltaV/old_ai_sat.yml #Delta V - Move to DV folder
-          - /Maps/Ruins/DeltaV/relaystation.yml #Delta V - Move to DV folder
-          - /Maps/Ruins/DeltaV/whiteship_ancient.yml #Delta V - Move to DV folder
-          - /Maps/Ruins/DeltaV/whiteship_bluespacejumper.yml #Delta V - Move to DV folder
+          addComponents:
+          - type: Gravity
+            enabled: true
+            inherent: true
+          protos:
+          - VGRoid
 
 - type: entity
   id: BaseStationCentcomm
diff --git a/Resources/Prototypes/Entities/Stations/nanotrasen.yml b/Resources/Prototypes/Entities/Stations/nanotrasen.yml
index fa7de08e696..1619657cc28 100644
--- a/Resources/Prototypes/Entities/Stations/nanotrasen.yml
+++ b/Resources/Prototypes/Entities/Stations/nanotrasen.yml
@@ -26,7 +26,7 @@
     - BaseStationAllEventsEligible
     - BaseStationNanotrasen
     - BaseStationMail # Nyano component, required for station mail to function
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Transform
 
@@ -36,8 +36,7 @@
     - BaseStation
     - BaseStationAlertLevels
     - BaseStationNanotrasen
-#    - BaseRandomStation
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Transform
 
@@ -48,6 +47,6 @@
   - BaseStationJobsSpawning
   - BaseStationRecords
   - BaseStationNanotrasen
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Transform
diff --git a/Resources/Prototypes/Entities/Stations/syndicate.yml b/Resources/Prototypes/Entities/Stations/syndicate.yml
index a6494169146..c863ef73523 100644
--- a/Resources/Prototypes/Entities/Stations/syndicate.yml
+++ b/Resources/Prototypes/Entities/Stations/syndicate.yml
@@ -11,6 +11,6 @@
   parent:
   - BaseStation
   - BaseStationSyndicate
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Transform
diff --git a/Resources/Prototypes/Entities/Stations/test.yml b/Resources/Prototypes/Entities/Stations/test.yml
index 0f2e40537a2..9eec6979e7a 100644
--- a/Resources/Prototypes/Entities/Stations/test.yml
+++ b/Resources/Prototypes/Entities/Stations/test.yml
@@ -6,6 +6,6 @@
     - BaseStationJobsSpawning
     - BaseStationRecords
     - BaseStationAlertLevels
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Transform
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
index 7bc12ca966e..5d27d728a0a 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
@@ -22,6 +22,7 @@
   - type: GuideHelp
     guides:
     - Bartender
+    #- Drinks # DeltaV - doesn't exist
   - type: StealTarget
     stealGroup: BoozeDispenser
 
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml b/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
index 681f0a390c8..cf51ca9b1f6 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
@@ -37,6 +37,17 @@
     - Chemist
   - type: StealTarget
     stealGroup: ChemDispenser
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.25, -0.4, 0.25, 0.4"
+        density: 190
+        mask:
+        - MachineMask
+        layer:
+        - MachineLayer
 
 - type: entity
   id: ChemDispenserEmpty
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
index e3042c798cc..4e0134d4b7b 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
@@ -22,6 +22,7 @@
   - type: GuideHelp
     guides:
     - Bartender
+    #- Drinks # Delta-V: doesn't exist
 
 - type: entity
   parent: SodaDispenser
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
index 269c71c5f33..1878fd7cee4 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -1162,6 +1162,10 @@
   suffix: External, Escape 3x4, Glass, Docking
   components:
   - type: GridFill
+    addComponents:
+    - type: IFF
+      flags:
+      - HideLabel
 
 #HighSecDoors
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
index 5d27cec1815..34639e43355 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
@@ -63,6 +63,8 @@
       path: /Audio/Machines/airlock_deny.ogg
   - type: Airtight
     noAirWhenFullyAirBlocked: false
+    airBlockedDirection:
+      - South
   - type: Tag
     tags:
       - ForceNoFixRotations
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
index 5d47d9c5c4a..24e5db81a92 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
@@ -107,7 +107,7 @@
 #plasma windoor assemblies
 - type: entity
   id: WindoorAssemblyPlasma
-  name: Plasma windoor assembly
+  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:
@@ -137,7 +137,7 @@
 
 - type: entity
   id: WindoorAssemblySecurePlasma
-  name: Secure Plasma windoor assembly
+  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:
@@ -169,7 +169,7 @@
 #uranium windoor assemblies
 - type: entity
   id: WindoorAssemblyUranium
-  name: Uranium windoor assembly
+  name: uranium windoor assembly
   description: It opens, it closes, and you can see through it! This one looks sickly green...
   parent: WindoorAssembly
   components:
@@ -199,7 +199,7 @@
 
 - type: entity
   id: WindoorAssemblySecureUranium
-  name: Secure Uranium windoor assembly
+  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:
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
index 1ec6c04ffe7..d15294cc467 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
@@ -172,6 +172,8 @@
     - state: panel_open
       map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
       visible: false
+  - type: Damageable
+    damageModifierSet: RGlass
   - type: Destructible
     thresholds:
     - trigger:
@@ -257,7 +259,7 @@
 
 - type: entity
   id: BaseSecurePlasmaWindoor
-  parent: BaseWindoor
+  parent: BaseSecureWindoor
   abstract: true
   components:
   - type: Sprite
@@ -367,7 +369,7 @@
 
 - type: entity
   id: BaseSecureUraniumWindoor
-  parent: BaseWindoor
+  parent: BaseSecureWindoor
   abstract: true
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml
index 840ff1da44f..98b2ebc0d19 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml
@@ -1,13 +1,13 @@
 - 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
@@ -19,25 +19,25 @@
 - type: entity
   id: WindoorPlasma
   parent: BasePlasmaWindoor
-  name: Plasma Windoor
+  name: plasma windoor
   description: It's a pink window *and* a sliding door. Amazing!
 
 - type: entity
   id: WindoorSecurePlasma
   parent: BaseSecurePlasmaWindoor
-  name: Secure Plasma Windoor
+  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
+  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
+  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
diff --git a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml
index 627a29aaf9a..4520d6f28f4 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml
@@ -25,6 +25,7 @@
     science:     DeltaV/Structures/Doors/Airlocks/Glass/science.rsi # Delta V - Door resprite
     cargo:       DeltaV/Structures/Doors/Airlocks/Glass/cargo.rsi # Delta V - Door resprite
     engineering: DeltaV/Structures/Doors/Airlocks/Glass/engineering.rsi # Delta V - Door resprite
+    glass:       DeltaV/Structures/Doors/Airlocks/Glass/glass.rsi # Delta V - Door resprite
     maintenance: DeltaV/Structures/Doors/Airlocks/Glass/maint.rsi # Delta V - Door resprite
     medical:     DeltaV/Structures/Doors/Airlocks/Glass/medical.rsi # Delta V - Door resprite
     security:    DeltaV/Structures/Doors/Airlocks/Glass/security.rsi # Delta V - Door resprite
@@ -71,6 +72,7 @@
     command: Command
     engineering: Engineering
     freezer: Civilian
+    glass: Civilian
     maintenance: Civilian
     medical: Medical
     science: Epistemics
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
index ac5ec1e83e3..c1d767905c0 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
@@ -323,7 +323,7 @@
     node: chair
 
 - type: entity
-  parent: [SeatBase, BaseFoldable]
+  parent: [SeatBase, BaseDeployFoldable]
   id: ChairFolding
   name: folding chair
   description: If you carry six of these you become the coolest kid at church.
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/memorial.yml b/Resources/Prototypes/Entities/Structures/Furniture/memorial.yml
index beabf53c979..24832a28b2a 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/memorial.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/memorial.yml
@@ -32,7 +32,7 @@
 - type: entity
   id: SS13Memorial
   parent: BaseStructure
-  name: Tomb of the Unknown Employee
+  name: tomb of the unknown employee
   description: |
     Here rests an unknown employee
     Unknown by name or rank
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
index 59fcc7cca5f..333c62f8e6f 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
@@ -24,9 +24,11 @@
     offset: "0.0,0.3"
     sprite: Structures/Furniture/potted_plants.rsi
     noRot: true
-  - type: PottedPlantHide
   - type: SecretStash
-    secretPartName: secret-stash-part-plant
+    tryInsertItemSound: /Audio/Effects/plant_rustle.ogg
+    tryRemoveItemSound: /Audio/Effects/plant_rustle.ogg
+    hasVerbs: false
+    secretStashName: secret-stash-plant
   - type: ContainerContainer
     containers:
       stash: !type:ContainerSlot {}
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
index b3cfe6ade3f..f7b1be8ecde 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: RollerBed
-  parent: [BaseItem, BaseFoldable]
+  parent: [BaseItem, BaseDeployFoldable]
   name: rollerbed
   description: Used to carry patients around without damaging them.
   components:
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
index 1eb5176e9e0..6a603b7deb2 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
@@ -68,9 +68,11 @@
   - type: PlungerUse
   - type: Appearance
   - type: SecretStash
-    secretPartName: secret-stash-part-toilet
-    examineStash: toilet-component-on-examine-found-hidden-item
-    openableStash: true
+    secretStashName: secret-stash-toilet
+  - type: ToolOpenable
+    openToolQualityNeeded: Prying
+    closeToolQualityNeeded: Prying
+    name: secret-stash-toilet
   - type: Drain
     autoDrain: false
   - type: StaticPrice
@@ -103,10 +105,10 @@
         SeatVisualState.SeatUp:
           SeatUp: { state: disposal-up }
           SeatDown: { state: disposal-down }
-      enum.StashVisuals.DoorVisualState:
-        DoorVisualState.DoorOpen:
-          DoorOpen: { state: disposal-open }
-          DoorClosed: { state: disposal-closed }
+      enum.ToolOpenableVisuals.ToolOpenableVisualState:
+        ToolOpenableVisualState.StashOpen:
+          Open: { state: disposal-open }
+          Closed: { state: disposal-closed }
 
 - type: entity
   id: ToiletDirtyWater
diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
index 2baadfe4129..3b23b96a87e 100644
--- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
@@ -89,9 +89,6 @@
     enabled: false
   - type: PoweredLight
     bulb: Tube
-    damage:
-      types:
-        Heat: 2
   - type: ContainerContainer
     containers:
       light_bulb: !type:ContainerSlot
@@ -117,6 +114,11 @@
       on: base
       broken: broken
       burned: burned
+  - type: DamageOnInteract
+    damage:
+      types:
+        Heat: 2
+    popupText: powered-light-component-burn-hand
 
 - type: entity
   id: Poweredlight
@@ -130,15 +132,17 @@
     enabled: true
   - type: PoweredLight
     hasLampOnSpawn: LightTube
-    damage:
-      types:
-        Heat: 2
   - type: AmbientOnPowered
   - type: AmbientSound
     volume: -15
     range: 2
     sound:
       path: /Audio/Ambience/Objects/light_hum.ogg
+  - type: DamageOnInteract
+    damage:
+      types:
+        Heat: 2
+    popupText: powered-light-component-burn-hand
 
 #LED lights
 - type: entity
@@ -149,14 +153,16 @@
   components:
   - type: PoweredLight
     hasLampOnSpawn: LedLightTube
-    damage:
-      types:
-        Heat: 1 #LEDs don't get as hot
   - type: PointLight
     radius: 15
     energy: 1
     softness: 0.9
     color: "#EEEEFF"
+  - type: DamageOnInteract
+    damage:
+      types:
+        Heat: 1 # LEDs don't get as hot
+    popupText: powered-light-component-burn-hand
 
 - type: entity
   parent: AlwaysPoweredWallLight
@@ -179,9 +185,11 @@
   components:
   - type: PoweredLight
     hasLampOnSpawn: ExteriorLightTube
+  - type: DamageOnInteract
     damage:
       types:
-        Heat: 4 #brighter light gets hotter
+        Heat: 4 # brighter light gets hotter
+    popupText: powered-light-component-burn-hand
 
 - type: entity
   parent: AlwaysPoweredWallLight
@@ -203,14 +211,16 @@
   components:
   - type: PoweredLight
     hasLampOnSpawn: SodiumLightTube
-    damage:
-      types:
-        Heat: 2
   - type: PointLight
     radius: 10
     energy: 2.5
     softness: 0.9
     color: "#FFAF38"
+  - type: DamageOnInteract
+    damage:
+      types:
+        Heat: 2
+    popupText: powered-light-component-burn-hand
 
 - type: entity
   parent: AlwaysPoweredWallLight
@@ -290,9 +300,6 @@
       light_bulb: !type:ContainerSlot
   - type: PoweredLight
     bulb: Bulb
-    damage:
-      types:
-        Heat: 2
   - type: ApcPowerReceiver
   - type: ExtensionCableReceiver
   - type: DeviceNetwork
@@ -313,6 +320,11 @@
       - On
       - Off
       - Toggle
+  - type: DamageOnInteract
+    damage:
+      types:
+        Heat: 2
+    popupText: powered-light-component-burn-hand
 
 - type: entity
   id: PoweredLEDSmallLight
@@ -329,9 +341,11 @@
     color: "#EEEEFF"
   - type: PoweredLight
     hasLampOnSpawn: LedLightBulb
+  - type: DamageOnInteract
     damage:
       types:
         Heat: 1
+    popupText: powered-light-component-burn-hand
 
 - type: entity
   id: PoweredSmallLight
@@ -344,9 +358,11 @@
     enabled: true
   - type: PoweredLight
     hasLampOnSpawn: LightBulb
+  - type: DamageOnInteract
     damage:
       types:
         Heat: 2
+    popupText: powered-light-component-burn-hand
 
 #Emergency Lights
 - type: entity
@@ -402,14 +418,16 @@
   components:
   - type: PoweredLight
     hasLampOnSpawn: LightTubeCrystalCyan
-    damage:
-      types:
-        Heat: 2
   - type: PointLight
     radius: 8
     energy: 3
     softness: 0.5
     color: "#47f8ff"
+  - type: DamageOnInteract
+    damage:
+      types:
+        Heat: 2
+    popupText: powered-light-component-burn-hand
 
 - type: entity
   id: AlwaysPoweredlightCyan
@@ -429,14 +447,16 @@
   components:
   - type: PoweredLight
     hasLampOnSpawn: LightTubeCrystalBlue
-    damage:
-      types:
-        Heat: 2
   - type: PointLight
     radius: 8
     energy: 3
     softness: 0.5
     color: "#39a1ff"
+  - type: DamageOnInteract
+    damage:
+      types:
+        Heat: 2
+    popupText: powered-light-component-burn-hand
 
 - type: entity
   id: AlwaysPoweredlightBlue
@@ -456,14 +476,16 @@
   components:
   - type: PoweredLight
     hasLampOnSpawn: LightTubeCrystalPink
-    damage:
-      types:
-        Heat: 2
   - type: PointLight
     radius: 8
     energy: 3
     softness: 0.5
     color: "#ff66cc"
+  - type: DamageOnInteract
+    damage:
+      types:
+        Heat: 2
+    popupText: powered-light-component-burn-hand
 
 - type: entity
   id: AlwaysPoweredlightPink
@@ -483,14 +505,16 @@
   components:
   - type: PoweredLight
     hasLampOnSpawn: LightTubeCrystalOrange
-    damage:
-      types:
-        Heat: 2
   - type: PointLight
     radius: 8
     energy: 3
     softness: 0.5
     color: "#ff8227"
+  - type: DamageOnInteract
+    damage:
+      types:
+        Heat: 2
+    popupText: powered-light-component-burn-hand
 
 - type: entity
   id: AlwaysPoweredlightOrange
@@ -510,14 +534,16 @@
   components:
   - type: PoweredLight
     hasLampOnSpawn: LightTubeCrystalRed
-    damage:
-      types:
-        Heat: 2
   - type: PointLight
     radius: 8
     energy: 3
     softness: 0.5
     color: "#fb4747"
+  - type: DamageOnInteract
+    damage:
+      types:
+        Heat: 2
+    popupText: powered-light-component-burn-hand
 
 - type: entity
   id: AlwaysPoweredlightRed
@@ -537,14 +563,16 @@
   components:
   - type: PoweredLight
     hasLampOnSpawn: LightTubeCrystalGreen
-    damage:
-      types:
-        Heat: 2
   - type: PointLight
     radius: 8
     energy: 3
     softness: 0.5
     color: "#52ff39"
+  - type: DamageOnInteract
+    damage:
+      types:
+        Heat: 2
+    popupText: powered-light-component-burn-hand
 
 - type: entity
   id: AlwaysPoweredlightGreen
diff --git a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml
index 2afde4ef3fc..0771cb71bc0 100644
--- a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml
@@ -77,9 +77,6 @@
     enabled: false
   - type: PoweredLight
     bulb: Tube
-    damage:
-      types:
-        Heat: 2
   - type: ContainerContainer
     containers:
       light_bulb: !type:ContainerSlot
@@ -108,6 +105,11 @@
       on: base
       broken: broken
       burned: burned
+  - type: DamageOnInteract
+    damage:
+      types:
+        Heat: 2
+    popupText: powered-light-component-burn-hand
 
 - type: entity
   id: PoweredLightPostSmall
@@ -122,9 +124,6 @@
     enabled: true
   - type: PoweredLight
     hasLampOnSpawn: LightTube
-    damage:
-      types:
-        Heat: 2
   - type: StaticPrice
     price: 25
   - type: AmbientOnPowered
@@ -133,6 +132,11 @@
     range: 3
     sound:
       path: /Audio/Ambience/Objects/light_hum.ogg
+  - type: DamageOnInteract
+    damage:
+      types:
+        Heat: 2
+    popupText: powered-light-component-burn-hand
 
 - type: entity
   id: PoweredLEDLightPostSmall
@@ -151,9 +155,6 @@
     color: "#EEEEFF"
   - type: PoweredLight
     hasLampOnSpawn: LedLightTube
-    damage:
-      types:
-        Heat: 1
   - type: StaticPrice
     price: 25
   - type: AmbientOnPowered
@@ -162,3 +163,8 @@
     range: 3
     sound:
       path: /Audio/Ambience/Objects/light_hum.ogg
+  - type: DamageOnInteract
+    damage:
+      types:
+        Heat: 1
+    popupText: powered-light-component-burn-hand
diff --git a/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml
index 72f54396469..50e24eab73d 100644
--- a/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml
@@ -87,9 +87,6 @@
   - type: PoweredLight
     bulb: Bulb
     on: false
-    damage:
-      types:
-        Heat: 2
   - type: ApcPowerReceiver
   - type: ExtensionCableReceiver
   - type: DeviceNetwork
@@ -113,6 +110,11 @@
   - type: Construction
     graph: LightFixture
     node: strobeLight
+  - type: DamageOnInteract
+    damage:
+      types:
+        Heat: 2
+    popupText: powered-light-component-burn-hand
 
 - type: entity
   id: PoweredStrobeLightPolice
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index b91d568344b..b952162016d 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -738,6 +738,7 @@
     - map: ["computerLayerKeys"]
       state: tech_key
   - type: CargoOrderConsole
+  - type: BankClient
   - type: ActiveRadio
     channels:
     - Supply
@@ -802,6 +803,7 @@
   - type: GuideHelp
     guides:
     - CargoBounties
+    - Cargo
 
 - type: entity
   parent: BaseComputer
@@ -973,7 +975,7 @@
   id: ComputerPalletConsole
   parent: BaseComputer
   name: cargo sale computer
-  description: Used to sell goods loaded onto cargo pallets
+  description: Used to sell goods loaded onto cargo pallets.
   components:
   - type: Sprite
     layers:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml b/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
index 4cb76ea4b92..0485b5a5178 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
@@ -85,6 +85,7 @@
         whitelist:
           components:
             - FitsInDispenser
+  - type: ItemToggle
   - type: HealthAnalyzer
     scanDelay: 0
   - type: UserInterface
diff --git a/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml b/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml
index 9c878c7e7c5..741e0a39711 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml
@@ -25,6 +25,14 @@
   - type: Fixtures
     fixtures:
       fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.35,-0.35,0.35,0.35"
+        mask:
+        - Impassable
+        - HighImpassable
+        - MidImpassable
+      fix2:
         shape:
           !type:PhysShapeAabb
           bounds: "-0.35,-0.35,0.35,0.35"
@@ -39,7 +47,6 @@
         hard: False
   - type: Transform
     anchored: true
-    noRot: false
   - type: ApcPowerReceiver
     powerLoad: 12000
     needsPower: false #only turns on when scanning
diff --git a/Resources/Prototypes/Entities/Structures/Machines/bombs.yml b/Resources/Prototypes/Entities/Structures/Machines/bombs.yml
index 88e650068eb..82c79496f25 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/bombs.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/bombs.yml
@@ -47,7 +47,7 @@
     - type: GuideHelp
       openOnActivation: true
       guides:
-        - Defusal
+      - Defusal
 
 - type: entity
   parent: BaseHardBomb
@@ -144,7 +144,7 @@
   id: DebugHardBomb
   name: debug bomb
   suffix: DEBUG
-  description: Holy shit this is gonna explode
+  description: Holy shit this is gonna explode.
   components:
     - type: Defusable
       disposable: true
diff --git a/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml b/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml
index 0f8286af862..a3f25b1e83d 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml
@@ -56,6 +56,7 @@
                 SheetSteel1:
                   min: 1
                   max: 2
+    - type: AmbientOnPowered
     - type: AmbientSound
       volume: -9
       range: 5
diff --git a/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml b/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml
index e56a3379ebb..9bbf278e72d 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml
@@ -75,7 +75,7 @@
 - type: entity
   parent: FaxMachineBase
   id: FaxMachineCentcom
-  name: CentCom long range fax machine
+  name: CentComm long range fax machine
   suffix: CentCom
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Structures/Machines/hotplate.yml b/Resources/Prototypes/Entities/Structures/Machines/hotplate.yml
index 3764f135915..8751c2b7ab7 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/hotplate.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/hotplate.yml
@@ -15,10 +15,7 @@
         mask:
         - TabletopMachineMask
         layer:
-        - Impassable
-        - MidImpassable
-        - LowImpassable
-        hard: false
+        - TabletopMachineLayer
   - type: ApcPowerReceiver
     powerLoad: 300
   - type: Appearance
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 50f1b0e6c1d..3b6b9147b39 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -115,6 +115,8 @@
   - type: Lathe
     idleState: icon
     runningState: building
+    unlitIdleState: unlit
+    unlitRunningState: unlit-building
     staticRecipes:
       - Wirecutter
       - Igniter
@@ -302,6 +304,8 @@
   - type: Lathe
     idleState: icon
     runningState: building
+    unlitIdleState: unlit
+    unlitRunningState: unlit-building
     staticRecipes:
     - LargeBeaker
     - Dropper
@@ -440,6 +444,7 @@
     - SodaDispenserMachineCircuitboard
     - DeepFryerMachineCircuitboard #Nyano - Summary: adds deep fryer circuit board
     - SpaceHeaterMachineCircuitBoard
+    - CutterMachineCircuitboard
     dynamicRecipes:
       - ThermomachineFreezerMachineCircuitBoard
       - HellfireFreezerMachineCircuitBoard
@@ -543,7 +548,7 @@
   id: ExosuitFabricator
   parent: BaseLatheLube
   name: exosuit fabricator
-  description: Creates parts for robotics and other mechanical needs
+  description: Creates parts for robotics and other mechanical needs.
   components:
   - type: Sprite
     sprite: Structures/Machines/exosuit_fabricator.rsi
@@ -680,7 +685,7 @@
 - type: entity
   id: Biofabricator
   parent: BaseLathe
-  name: biofabricator
+  name: biocube fabricator
   description: Produces animal cubes using biomass.
   components:
   - type: Sprite
@@ -689,16 +694,20 @@
     layers:
     - state: icon
       map: ["enum.LatheVisualLayers.IsRunning"]
+      color: "#ffaa99"
     - state: unlit
       shader: unshaded
       map: ["enum.PowerDeviceVisualLayers.Powered"]
+      color: "#ffaaaa"
     - state: inserting
       map: ["enum.MaterialStorageVisualLayers.Inserting"]
+      color: "#ffaaaa"
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Machine
     board: BiofabricatorMachineCircuitboard
   - type: MaterialStorage
+    ignoreColor: true
     whitelist:
       tags:
         - Sheet
@@ -1258,6 +1267,7 @@
         - IngotGold30
         - IngotSilver30
         - MaterialBananium10
+        - MaterialDiamond
     - type: MaterialStorageMagnetPickup # Delta V - Summary: Adds magnet pull from Frontier
       magnetEnabled: True
       range: 0.30 # Delta V - End Magnet Pull
@@ -1289,6 +1299,7 @@
       - IngotGold30
       - IngotSilver30
       - MaterialBananium10
+      - MaterialDiamond
 
 - type: entity
   parent: BaseLathe
@@ -1320,3 +1331,82 @@
     staticRecipes:
     - MaterialSheetMeat
     - SheetPaper
+
+- type: entity
+  parent: BaseLathe
+  id: CutterMachine
+  name: cutter machine
+  description: This is a cutter. It cuts. Add variety to your station floor with eye-pleasing patterns! Don't stick your fingers in.
+  components:
+  - type: Transform
+    noRot: false
+  - type: Sprite
+    sprite: Structures/Machines/cuttermachine.rsi
+    snapCardinals: true
+    layers:
+    - state: icon
+      map: ["enum.LatheVisualLayers.IsRunning"]
+    - state: unlit
+      shader: unshaded
+      map: ["enum.PowerDeviceVisualLayers.Powered"]
+    - state: panel
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: Machine
+    board: CutterMachineCircuitboard
+  - type: Lathe
+    producingSound: /Audio/Machines/cutter.ogg
+    idleState: icon
+    runningState: building
+    staticRecipes:
+      - FloorTileItemDark
+      - FloorTileItemDarkDiagonalMini
+      - FloorTileItemDarkDiagonal
+      - FloorTileItemDarkHerringbone
+      - FloorTileItemDarkMini
+      - FloorTileItemDarkMono
+      - FloorTileItemDarkPavement
+      - FloorTileItemDarkPavementVertical
+      - FloorTileItemDarkOffset
+      - FloorTileItemSteelCheckerDark
+      - FloorTileItemSteel
+      - FloorTileItemSteelOffset
+      - FloorTileItemSteelDiagonalMini
+      - FloorTileItemSteelDiagonal
+      - FloorTileItemSteelHerringbone
+      - FloorTileItemSteelMini
+      - FloorTileItemSteelMono
+      - FloorTileItemSteelPavement
+      - FloorTileItemSteelPavementVertical
+      - FloorTileItemWhite
+      - FloorTileItemWhiteOffset
+      - FloorTileItemWhiteDiagonalMini
+      - FloorTileItemWhiteDiagonal
+      - FloorTileItemWhiteHerringbone
+      - FloorTileItemWhiteMini
+      - FloorTileItemWhiteMono
+      - FloorTileItemWhitePavement
+      - FloorTileItemWhitePavementVertical
+      - FloorTileItemSteelCheckerLight
+      - FloorTileItemGratingMaint
+      - FloorTileItemTechmaint
+      - FloorTileItemSteelMaint
+      - FloorTileItemWood
+      - FloorTileItemWoodLarge
+      - FloorTileItemWoodPattern
+      - FloorTileItemConcrete
+      - FloorTileItemConcreteMono
+      - FloorTileItemConcreteSmooth
+      - FloorTileItemGrayConcrete
+      - FloorTileItemGrayConcreteMono
+      - FloorTileItemGrayConcreteSmooth
+      - FloorTileItemOldConcrete
+      - FloorTileItemOldConcreteMono
+      - FloorTileItemOldConcreteSmooth
+  - type: MaterialStorage
+    whitelist:
+      tags:
+        - Sheet
+        - Metal
+        - Wooden
+        - RawMaterial
+        - Plastic
diff --git a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
index 314a5c1ce54..18174455121 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
@@ -105,6 +105,7 @@
   - type: GuideHelp
     guides:
     - Chef
+    - FoodRecipes
 
 - type: entity
   id: SyndicateMicrowave
diff --git a/Resources/Prototypes/Entities/Structures/Machines/nuke.yml b/Resources/Prototypes/Entities/Structures/Machines/nuke.yml
index c2b6ccdbc0a..24a95b08547 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/nuke.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/nuke.yml
@@ -150,6 +150,8 @@
   suffix: keg
   description: You probably shouldn't stick around to see if this is armed. It has a tap on the side.
   components:
+  - type: Transform
+    anchored: false
   - type: NukeLabel
   - type: Sprite
     sprite: Objects/Devices/nuke.rsi
@@ -183,11 +185,11 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.45
-        density: 80
+        density: 255 
         mask:
-        - TabletopMachineMask
+        - MachineMask
         layer:
-        - TabletopMachineLayer
+        - WallLayer
   - type: SolutionContainerManager
     solutions:
       tank:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/research.yml b/Resources/Prototypes/Entities/Structures/Machines/research.yml
index 498759df3c9..81a5988c2c5 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/research.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/research.yml
@@ -48,6 +48,7 @@
             min: 1
             max: 2
   - type: Appearance
+  - type: AmbientOnPowered
   - type: AmbientSound
     volume: -9
     range: 5
diff --git a/Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml b/Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml
index 7b342def540..3f7f86b5e5a 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml
@@ -22,6 +22,12 @@
       snapCardinals: true
       layers:
         - state: server
+    - type: AmbientOnPowered
+    - type: AmbientSound
+      volume: -9
+      range: 5
+      sound:
+        path: /Audio/Ambience/Objects/server_fans.ogg
 
 - type: entity
   parent: SurveillanceCameraRouterBase
@@ -104,6 +110,7 @@
       subnetFrequency: SurveillanceCameraGeneral
 
 - type: entity
+  abstract: true
   parent: [ BaseMachinePowered, ConstructibleMachine ]
   id: SurveillanceCameraWirelessRouterBase
   name: wireless camera router
@@ -126,6 +133,12 @@
       sprite: Structures/Machines/server.rsi
       layers:
         - state: server
+    - type: AmbientOnPowered
+    - type: AmbientSound
+      volume: -9
+      range: 5
+      sound:
+        path: /Audio/Ambience/Objects/server_fans.ogg
 
 - type: entity
   parent: SurveillanceCameraWirelessRouterBase
diff --git a/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml b/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml
index 13fdb7e80d4..c5d8e1ba9c7 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml
@@ -21,6 +21,12 @@
           True: { visible: true }
           False: { visible: false }
   - type: Appearance
+  - type: AmbientOnPowered
+  - type: AmbientSound
+    volume: -9
+    range: 5
+    sound:
+      path: /Audio/Ambience/Objects/server_fans.ogg
   - type: WiresVisuals
   - type: Physics
     bodyType: Static
diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index 575a3664364..dc90129ce40 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -195,6 +195,7 @@
   - type: GuideHelp
     guides:
     - Bartender
+    #- Drinks # DeltaV - doesn't exist
 
 - type: entity
   parent: VendingMachine
@@ -886,6 +887,7 @@
   - type: GuideHelp
     guides:
     - Security
+    - Antagonists
 
 - type: entity
   parent: VendingMachine
@@ -1997,7 +1999,7 @@
   parent: VendingMachine
   id: VendingMachineCentDrobe
   name: CentDrobe
-  description: A one-of-a-kind vending machine for all your centcom aesthetic needs!
+  description: A one-of-a-kind vending machine for all your centcomm aesthetic needs!
   components:
   - type: VendingMachine
     pack: CentDrobeInventory
@@ -2116,6 +2118,7 @@
   - type: GuideHelp
     guides:
     - Chemicals
+    - Chemist
 
 - type: entity
   parent: VendingMachineChemicals
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml
index 6d10b1521e7..64dd38accb4 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml
@@ -66,8 +66,6 @@
   parent: GasMinerBase
   id: GasMinerNitrogen
   suffix: Shuttle, 300kPa
-  placement:
-    mode: SnapgridCenter
   components:
     - type: GasMiner
       spawnGas: Nitrogen
@@ -94,8 +92,6 @@
   name: CO2 gas miner
   parent: GasMinerBase
   id: GasMinerCarbonDioxide
-  placement:
-    mode: SnapgridCenter
   components:
     - type: GasMiner
       spawnGas: CarbonDioxide
@@ -104,8 +100,6 @@
   name: plasma gas miner
   parent: GasMinerBase
   id: GasMinerPlasma
-  placement:
-    mode: SnapgridCenter
   components:
     - type: GasMiner
       spawnGas: Plasma
@@ -114,8 +108,6 @@
   name: tritium gas miner
   parent: GasMinerBase
   id: GasMinerTritium
-  placement:
-    mode: SnapgridCenter
   components:
     - type: GasMiner
       spawnGas: Tritium
@@ -124,8 +116,6 @@
   name: water vapor gas miner
   parent: GasMinerBase
   id: GasMinerWaterVapor
-  placement:
-    mode: SnapgridCenter
   components:
     - type: GasMiner
       spawnGas: WaterVapor
@@ -134,8 +124,6 @@
   name: ammonia gas miner
   parent: GasMinerBase
   id: GasMinerAmmonia
-  placement:
-    mode: SnapgridCenter
   components:
     - type: GasMiner
       spawnGas: Ammonia
@@ -144,8 +132,6 @@
   name: nitrous oxide gas miner
   parent: GasMinerBase
   id: GasMinerNitrousOxide
-  placement:
-    mode: SnapgridCenter
   components:
     - type: GasMiner
       spawnGas: NitrousOxide
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/special.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/special.yml
index 4eec014f11b..eff831fa9ea 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/special.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/special.yml
@@ -25,3 +25,32 @@
   - type: Tag
     tags:
       - SpreaderIgnore
+
+- type: entity
+  id: AtmosDeviceFanDirectional
+  name: directional fan
+  description: A thin fan, stopping the movement of gases across it.
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Transform
+    anchored: true
+  - type: Physics
+    bodyType: Static
+  - type: Sprite
+    sprite: Structures/Piping/Atmospherics/directionalfan.rsi
+    state: icon
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+            bounds: "-0.48,-0.48,0.48,-0.40"
+  - type: Airtight
+    noAirWhenFullyAirBlocked: false
+    airBlockedDirection:
+      - South
+  - type: Clickable
+  - type: Tag
+    tags:
+      - SpreaderIgnore
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
index 7aee5896472..a0192b8685e 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
@@ -61,7 +61,7 @@
 
 - type: entity
   id: DisposalHolder
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: disposal holder
   components:
   - type: DisposalHolder
@@ -75,7 +75,7 @@
   id: DisposalPipeBroken
   parent: DisposalPipeBase
   name: broken disposal pipe
-  description: A BBP (big broken pipe)
+  description: A BBP (big broken pipe).
   components:
   - type: Sprite
     drawdepth: ThickPipe
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/control_box.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/control_box.yml
index 96392ecd005..ae3fc967742 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/control_box.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/control_box.yml
@@ -25,6 +25,8 @@
   - type: Wires
     boardName: wires-board-name-pa
     layoutId: ParticleAccelerator
+  - type: AccessReader
+    access: [["Engineering"]]
 
 # Unfinished
 
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml
index 8d889ee5cbb..9d3ce9c931f 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml
@@ -3,7 +3,7 @@
   description: Accelerated particles.
   id: ParticlesProjectile
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Sprite
       layers:
@@ -54,7 +54,7 @@
   description: Accelerated negative particles.
   id: AntiParticlesProjectile
   parent: ParticlesProjectile
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     layers:
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
index b63f131a7f4..dc2ad1687a5 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
@@ -101,7 +101,7 @@
               SheetSteel1:
                 min: 2
                 max: 4
-  #- type: GuideHelp #   To Do - add Tesla Guide
+  #- type: GuideHelp # TODO - add Tesla Guide
 
 - type: entity
   id: TeslaGroundingRod
@@ -184,5 +184,5 @@
               SheetSteel1:
                 min: 2
                 max: 4
-  #- type: GuideHelp #   To Do - add Tesla Guide
+  #- type: GuideHelp # TODO - add Tesla Guide
 
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/generator.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/generator.yml
index a8c61634dfb..d45e6c58ea7 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/generator.yml
@@ -8,7 +8,7 @@
     noRot: true
     sprite: Structures/Power/Generation/Tesla/generator.rsi
     state: icon 
-  - type: SingularityGenerator #To do: rename the generator
+  - type: SingularityGenerator # TODO: rename the generator
     spawnId: TeslaEnergyBall
   - type: InteractionOutline
   - type: Fixtures
@@ -25,5 +25,5 @@
         layer:
         - Opaque
   - type: Anchorable
-  #- type: GuideHelp #   To Do - add Tesla Guide
+  #- type: GuideHelp # TODO - add Tesla Guide
 
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml
index 4e4ef8bdbcf..b7d6b5a128d 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml
@@ -108,7 +108,7 @@
     mediumVoltageNode: ame
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: AmeController
   id: AmeControllerUnanchored
   suffix: Unanchored
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
index ed70b310915..1faee965d4e 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
@@ -144,7 +144,7 @@
 # Construction Frames
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   id: BaseGeneratorWallmountFrame
   name: wallmount generator frame
   description: A construction frame for a wallmount generator.
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
index c512266e974..a997dbbf9d6 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: SolarPanelBasePhysSprite
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: solar panel
   placement:
     mode: SnapgridCenter
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml
index 78d979ab8eb..b7f43614dbd 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml
@@ -184,7 +184,7 @@
 - # Spawned by the client-side circulator examine code to indicate the inlet/outlet direction.
   type: entity
   id: TegCirculatorArrow
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Sprite
       sprite: Markers/teg_arrow.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Power/apc.yml b/Resources/Prototypes/Entities/Structures/Power/apc.yml
index 1621ac858cd..7a72f77c89e 100644
--- a/Resources/Prototypes/Entities/Structures/Power/apc.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/apc.yml
@@ -1,5 +1,5 @@
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   id: BaseAPC
   name: APC
   description: A control terminal for the area's electrical systems.
@@ -146,7 +146,7 @@
 
 # APC under construction
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   id: APCFrame
   name: APC frame
   description: A control terminal for the area's electrical systems, lacking the electronics.
diff --git a/Resources/Prototypes/Entities/Structures/Power/substation.yml b/Resources/Prototypes/Entities/Structures/Power/substation.yml
index 692f027386b..b4e669519a4 100644
--- a/Resources/Prototypes/Entities/Structures/Power/substation.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/substation.yml
@@ -112,7 +112,7 @@
 # Compact Wall Substation Base
 - type: entity
   id: BaseSubstationWall
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: wallmount substation
   description: A substation designed for compact shuttles and spaces.
   placement:
@@ -256,9 +256,9 @@
 # Construction Frame
 - type: entity
   id: BaseSubstationWallFrame
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: wallmount substation frame
-  description: A substation frame for construction
+  description: A substation frame for construction.
   placement:
     mode: SnapgridCenter
   components:
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
index 95a076dc9be..569067fcbdf 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
@@ -9,9 +9,6 @@
       collection: RadiationPulse
       params:
         volume: 5
-    anomalyContactDamage:
-      types:
-        Radiation: 10
   - type: AmbientSound
     range: 5
     volume: -5
@@ -51,6 +48,15 @@
   - type: SecretDataAnomaly
     randomStartSecretMin: 0
     randomStartSecretMax: 2
+  - type: DamageOnInteract
+    damage:
+      types:
+        Radiation: 10
+    popupText: anomaly-component-contact-damage
+  - type: DamageOnAttacked
+    damage:
+      types:
+        Radiation: 10
   - type: Psionic #Nyano - Summary: makes psionic on creation.
   - type: GlimmerSource #Nyano - Summary: makes this a potential source of Glimmer.
     active: false
@@ -102,6 +108,15 @@
   - type: IgniteOnCollide
     fixtureId: fix1
     fireStacks: 1
+  - type: DamageOnInteract
+    damage:
+      types:
+        Heat: 10
+    popupText: anomaly-component-contact-damage
+  - type: DamageOnAttacked
+    damage:
+      types:
+        Heat: 10
 
 - type: entity
   id: AnomalyGravity
@@ -297,9 +312,6 @@
       collection: RadiationPulse
       params:
         volume: 5
-    anomalyContactDamage:
-      types:
-        Radiation: 10
 
 - type: entity
   id: AnomalyIce
@@ -322,9 +334,6 @@
   - type: Anomaly
     corePrototype: AnomalyCoreIce
     coreInertPrototype: AnomalyCoreIceInert
-    anomalyContactDamage:
-      types:
-        Cold: 10
   - type: ExplosionAnomaly
     supercriticalExplosion: Cryo
     explosionTotalIntensity: 300
@@ -348,6 +357,15 @@
     releasedGas: 8 # Frezon. Please replace if there is a better way to specify this
     releaseOnMaxSeverity: true
     spawnRadius: 0
+  - type: DamageOnInteract
+    damage:
+      types:
+        Cold: 10
+    popupText: anomaly-component-contact-damage
+  - type: DamageOnAttacked
+    damage:
+      types:
+        Cold: 10
 
 - type: entity
   id: AnomalyRockBase
@@ -612,9 +630,6 @@
     coreInertPrototype: AnomalyCoreFloraInert
     minPulseLength: 60
     maxPulseLength: 120
-    anomalyContactDamage:
-      types:
-        Slash: 0
   - type: TileSpawnAnomaly
     entries:
     - settings:
@@ -718,9 +733,6 @@
     coreInertPrototype: AnomalyCoreLiquidInert
     minPulseLength: 60
     maxPulseLength: 120
-    anomalyContactDamage:
-      types:
-        Slash: 1
   - type: EntitySpawnAnomaly
     entries:
     - settings:
@@ -832,9 +844,6 @@
     coreInertPrototype: AnomalyCoreShadowInert
     minPulseLength: 60
     maxPulseLength: 120
-    anomalyContactDamage:
-      types:
-        Cold: 10
     animationTime: 4
     offset: "-0.1,0.1"
   - type: EntitySpawnAnomaly
@@ -860,3 +869,12 @@
   - type: Tag
     tags:
       - SpookyFog
+  - type: DamageOnInteract
+    damage:
+      types:
+        Cold: 10
+    popupText: anomaly-component-contact-damage
+  - type: DamageOnAttacked
+    damage:
+      types:
+        Cold: 10
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml b/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml
index 9fd05beaeea..6ed06addcd4 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml
@@ -84,6 +84,7 @@
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
+  - type: DnaSubstanceTrace
   - type: Fixtures
     fixtures:
       fix1:
@@ -334,3 +335,4 @@
     - type: GuideHelp
       guides:
       - Janitorial
+    - type: DnaSubstanceTrace
diff --git a/Resources/Prototypes/Entities/Structures/Specific/xeno.yml b/Resources/Prototypes/Entities/Structures/Specific/xeno.yml
index 0fcca0c1d50..2f58e5caea9 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/xeno.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/xeno.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: XenoWardingTower
-  name: Xeno warding tower
+  name: xeno warding tower
   placement:
     mode: SnapgridCenter
     snap:
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
index d3cf1d53ecc..bcd0429828e 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
@@ -697,7 +697,7 @@
 - type: entity
   parent: GasCanisterBrokenBase
   id: StorageCanisterBroken
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Sprite
       state: yellow-1
@@ -705,7 +705,7 @@
 - type: entity
   parent: GasCanisterBrokenBase
   id: AirCanisterBroken
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: grey-1
@@ -713,7 +713,7 @@
 - type: entity
   parent: GasCanisterBrokenBase
   id: OxygenCanisterBroken
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: blue-1
@@ -721,7 +721,7 @@
 - type: entity
   parent: GasCanisterBrokenBase
   id: NitrogenCanisterBroken
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Sprite
       state: red-1
@@ -729,7 +729,7 @@
 - type: entity
   parent: GasCanisterBrokenBase
   id: CarbonDioxideCanisterBroken
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Sprite
       state: black-1
@@ -737,7 +737,7 @@
 - type: entity
   parent: GasCanisterBrokenBase
   id: PlasmaCanisterBroken
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Sprite
       state: orange-1
@@ -745,7 +745,7 @@
 - type: entity
   parent: GasCanisterBrokenBase
   id: TritiumCanisterBroken
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Sprite
       state: green-1
@@ -754,7 +754,7 @@
   parent: GasCanisterBrokenBase
   id: WaterVaporCanisterBroken
   name: broken water vapor canister
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Sprite
       state: water_vapor-1
@@ -762,7 +762,7 @@
 - type: entity
   parent: GasCanisterBrokenBase
   id: AmmoniaCanisterBroken
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Sprite
       state: greenys-1
@@ -770,7 +770,7 @@
 - type: entity
   parent: GasCanisterBrokenBase
   id: NitrousOxideCanisterBroken
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Sprite
       state: redws-1
@@ -778,7 +778,7 @@
 - type: entity
   parent: GasCanisterBrokenBase
   id: FrezonCanisterBroken
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     state: frezon-1
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
index 2666e8261d0..73871cbe9b8 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
@@ -1,7 +1,7 @@
 - type: entity
   parent: BaseStructureDynamic
   id: CrateGeneric
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: crate
   description: A large container for items.
   components:
@@ -94,7 +94,7 @@
 - type: entity
   parent: CrateGeneric
   id: CrateBaseWeldable
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Weldable
   - type: ResistLocker
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/atmos_plaque.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/atmos_plaque.yml
index 1be9f202f0b..3f6dd3723d5 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/atmos_plaque.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/atmos_plaque.yml
@@ -14,6 +14,7 @@
         layer:
         - MidImpassable
   - type: Sprite
+    drawdepth: WallMountedItems
     layers:
       - state: atmosplaque
         map: ["plaque"]
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
index b2a0ffe592a..f749bc599be 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
@@ -11,7 +11,7 @@
   - type: WallMount
     arc: 360
   - type: Sprite
-    drawdepth: Objects
+    drawdepth: WallMountedItems
     sprite: Structures/Wallmounts/barsign.rsi
     state: empty
   - type: ApcPowerReceiver
@@ -48,7 +48,7 @@
 #- type: entity
 #  id: LargeBarSign
 #  name: large bar sign
-#  noSpawn: true
+#  categories: [ HideSpawnMenu ]
 #  components:
 #  - type: Clickable
 #  - type: InteractionOutline
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml
index e7d938a3c9a..35281d03835 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml
@@ -30,7 +30,7 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: Sprite
-    drawdepth: WallTops
+    drawdepth: WallMountedItems
     sprite: Structures/Wallmounts/signs.rsi
     snapCardinals: true
   - type: StaticPrice
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml
index 57b07aa3dd1..992f7a71e6f 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml
@@ -6,14 +6,14 @@
   - type: WallMount
     arc: 360
   - type: Sprite
-    drawdepth: WallTops
+    drawdepth: WallMountedItems
     sprite: Structures/Wallmounts/flags.rsi
 
 - type: entity
   parent: BaseFlag
   id: BlankFlag
   name: blank flag
-  description: "Some piece of white cloth. Definitely not the flag of France."
+  description: Some piece of white cloth. Definitely not the flag of France.
   components:
   - type: Sprite
     state: blank_flag
@@ -22,7 +22,7 @@
   parent: BaseFlag
   id: NTFlag
   name: Nanotrasen flag
-  description: "Glory to NT! Wait, they really made a flag for a corporation?"
+  description: Glory to NT! Wait, they really made a flag for a corporation?
   components:
   - type: Sprite
     state: NT_flag
@@ -31,7 +31,7 @@
   parent: BaseFlag
   id: SyndieFlag
   name: syndicate flag
-  description: "Smells bloody. Death to NT!"
+  description: Smells bloody. Death to NT!
   components:
   - type: Sprite
     state: syndie_flag
@@ -40,7 +40,7 @@
   parent: BaseFlag
   id: LGBTQFlag
   name: LGBTQ flag
-  description: "Be gay do crime flag"
+  description: "\"Be gay do crime\" flag."
   components:
   - type: Sprite
     state: lgbtq_flag
@@ -49,7 +49,7 @@
   parent: BaseFlag
   id: PirateFlag
   name: pirate flag
-  description: "Raise the jolly roger, scallywags!"
+  description: Raise the jolly roger, scallywags!
   components:
   - type: Sprite
     state: pirate_flag
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/metamap.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/metamap.yml
index 92850e97e62..e8daa82632e 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/metamap.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/metamap.yml
@@ -1,9 +1,9 @@
 - type: entity
   parent: PosterBase
   id: PosterMapMetaRight
-  name: "Meta Station Map"
+  name: "Meta Station map"
   description: "A map of Meta Station. This looks really old."
   components:
   - type: Sprite
     state: metamap64x
-    sprite: Structures/Wallmounts/metamap.rsi
\ No newline at end of file
+    sprite: Structures/Wallmounts/metamap.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml
index 5402d443e2b..4f26432c60a 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml
@@ -6,7 +6,7 @@
   - type: WallMount
     arc: 360
   - type: Sprite
-    drawdepth: WallTops
+    drawdepth: WallMountedItems
     sprite: Structures/Wallmounts/paintings.rsi
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
index 1953ecd146d..c99d18c9961 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
@@ -6,7 +6,7 @@
   - type: WallMount
     arc: 360
   - type: Sprite
-    drawdepth: WallTops
+    drawdepth: WallMountedItems
     sprite: Structures/Wallmounts/posters.rsi
     snapCardinals: true
   - type: Destructible
@@ -180,7 +180,7 @@
   parent: PosterBase
   id: PosterContrabandTools
   name: "Tools"
-  description: "This poster looks like an advertisement for tools, but is in fact a subliminal jab at the tools at CentCom."
+  description: "This poster looks like an advertisement for tools, but is in fact a subliminal jab at the tools at CentComm."
   components:
   - type: Sprite
     state: poster15_contraband
@@ -243,7 +243,7 @@
   parent: PosterBase
   id: PosterContrabandKosmicheskayaStantsiya
   name: "Kosmicheskaya Stantsiya 13 Does Not Exist"
-  description: "A poster mocking CentCom's denial of the existence of the derelict station near Space Station 13."
+  description: "A poster mocking CentComm's denial of the existence of the derelict station near Space Station 13."
   components:
   - type: Sprite
     state: poster22_contraband
@@ -351,7 +351,7 @@
   parent: PosterBase
   id: PosterContrabandFreeDrone
   name: "Free Drone"
-  description: "This poster commemorates the bravery of the rogue drone; once exiled, and then ultimately destroyed by CentCom."
+  description: "This poster commemorates the bravery of the rogue drone; once exiled, and then ultimately destroyed by CentComm."
   components:
   - type: Sprite
     state: poster35_contraband
@@ -441,7 +441,7 @@
   parent: PosterBase
   id: PosterContrabandUnreadableAnnouncement
   name: "Unreadable Announcement"
-  description: "A poster announcing something by someone, oddly enough they seem to have forgotten making it readable"
+  description: "A poster announcing something by someone, oddly enough they seem to have forgotten making it readable."
   components:
   - type: Sprite
     state: poster45_contraband
@@ -468,7 +468,7 @@
   parent: PosterBase
   id: PosterContrabandTheBigGasTruth
   name: "The Big Gas Giant Truth"
-  description: "Don't believe everything you see on a poster, patriots. All the lizards at central command don't want to answer this SIMPLE QUESTION: WHERE IS THE GAS MINER MINING FROM, CENTCOM?"
+  description: "Don't believe everything you see on a poster, patriots. All the lizards at central command don't want to answer this SIMPLE QUESTION: WHERE IS THE GAS MINER MINING FROM, CENTCOMM?"
   components:
   - type: Sprite
     state: poster48_contraband
@@ -590,7 +590,7 @@
   components:
     - type: Sprite
       state: poster62_contraband
-      
+
 - type: entity
   parent: PosterBase
   id: PosterContrabandMissingSpacepen
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
index a3f69bb5f5c..c93bb0cefd2 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
@@ -244,6 +244,15 @@
   - type: Sprite
     state: ai
 
+- type: entity
+  parent: BaseSign
+  id: SignAiUpload
+  name: ai upload sign
+  description: A sign, indicating an AI is present.
+  components:
+    - type: Sprite
+      state: ai_upload
+
 - type: entity
   parent: BaseSign
   id: SignArcade
@@ -274,11 +283,11 @@
 - type: entity
   parent: BaseSign
   id: SignAnomaly
-  name: xenoarchaeology lab sign
+  name: xenoarcheology lab sign
   description: A sign indicating the xenoarchaeology lab.
   components:
   - type: Sprite
-    state: anomaly
+    state: xenoarch
 
 - type: entity
   parent: BaseSign
@@ -287,7 +296,7 @@
   description: A sign indicating the anomalous research lab.
   components:
   - type: Sprite
-    state: anomaly2
+    state: anomaly
 
 - type: entity
   parent: BaseSign
@@ -300,21 +309,38 @@
 
 - type: entity
   parent: BaseSign
-  id: SignAtmosMinsky
-  name: atmospherics sign
-  description: A sign indicating the atmospherics area.
+  id: SignBar
+  name: bar sign
+  description: A sign indicating the bar.
   components:
   - type: Sprite
-    state: atmominsky
+    state: bar
 
 - type: entity
   parent: BaseSign
-  id: SignBar
-  name: bar sign
-  description: A sign indicating the bar.
+  id: SignKitchen
+  name: kitchen sign
+  description: The heart of the home. And disease.
   components:
   - type: Sprite
-    state: bar
+    state: kitchen
+
+- type: entity
+  parent: BaseSign
+  id: SignTheater
+  name: theater sign
+  description: Would it even be Space Station without drama?
+  components:
+  - type: Sprite
+    layers:
+    - state: drama1
+      map: [ "base" ]
+  - type: RandomSprite
+    available:
+    - base:
+        drama1: null
+        drama2: null
+        drama3: null
 
 - type: entity
   parent: BaseSign
@@ -397,24 +423,6 @@
   - type: Sprite
     state: chem
 
-- type: entity
-  parent: BaseSign
-  id: SignChemistry1
-  name: chemistry sign
-  description: A sign indicating the chemistry lab.
-  components:
-  - type: Sprite
-    state: chemistry1
-
-- type: entity
-  parent: BaseSign
-  id: SignChemistry2
-  name: chemistry sign
-  description: A sign indicating the chemistry lab.
-  components:
-  - type: Sprite
-    state: chemistry2
-
 - type: entity
   parent: BaseSign
   id: SignCloning
@@ -428,19 +436,20 @@
   parent: BaseSign
   id: SignConference
   name: conference room sign
-  description: A sign indicating the conference room.
+  description: Where work happens.
   components:
   - type: Sprite
     state: conference_room
 
 - type: entity
   parent: BaseSign
-  id: SignCourt
-  name: court sign
-  description: A sign labelling the courtroom.
+  id: SignCryo
+  name: cryosleep sign
+  description: Just like that? You're gonna chicken out?
   components:
   - type: Sprite
-    state: court
+    state: cryo
+
 
 - type: entity
   parent: BaseSign
@@ -462,18 +471,27 @@
 
 - type: entity
   parent: BaseSign
-  id: SignDrones
-  name: drones sign
-  description: A sign indicating drones.
+  id: SignRestroom
+  name: restroom sign
+  description: A sign indicating where you go to... What do you do here again?
+  components:
+  - type: Sprite
+    state: restroom
+
+- type: entity
+  parent: BaseSign
+  id: SignMaterials
+  name: materials sign
+  description: An omen to the juicy vault of steel, glass, and plastic that lays before you.
   components:
   - type: Sprite
-    state: drones
+    state: mats
 
 - type: entity
   parent: BaseSign
   id: SignEngine
-  name: engine sign
-  description: A sign indicating the engine room.
+  name: power sign
+  description: Where the powa happens.
   components:
   - type: Sprite
     state: engine
@@ -547,7 +565,7 @@
   parent: BaseSign
   id: SignHead
   name: head sign
-  description: A sign with a hat on it.
+  description: An official sign indicating the dwellings of a Nanotrasen-certified head of department.
   components:
   - type: Sprite
     state: commander
@@ -559,25 +577,7 @@
   description: A sign indicating a hydroponics area.
   components:
   - type: Sprite
-    state: hydro1
-
-- type: entity
-  parent: BaseSign
-  id: SignHydro2
-  name: hydro sign
-  description: A sign indicating a hydroponics area.
-  components:
-  - type: Sprite
-    state: hydro2
-
-- type: entity
-  parent: BaseSign
-  id: SignHydro3
-  name: hydro sign
-  description: A sign indicating a hydroponics area.
-  components:
-  - type: Sprite
-    state: hydro3
+    state: hydro
 
 - type: entity
   parent: BaseSign
@@ -609,8 +609,8 @@
 - type: entity
   parent: BaseSign
   id: SignLawyer
-  name: lawyer sign
-  description: A sign labelling an area where the Lawyers work.
+  name: law sign
+  description: A sign indicating the presence of the (typically absent) rule of law.
   components:
   - type: Sprite
     state: law
@@ -642,15 +642,6 @@
   - type: Sprite
     state: medbay
 
-- type: entity
-  parent: BaseSign
-  id: SignMinerDock
-  name: miner dock sign
-  description: A sign indicating the miner dock.
-  components:
-  - type: Sprite
-    state: miner_dock
-
 - type: entity
   parent: BaseSign
   id: SignMorgue
@@ -672,7 +663,7 @@
 - type: entity
   parent: BaseSign
   id: SignNosmoking
-  name: nosmoking sign
+  name: no smoking sign
   description: A sign indicating that smoking is not allowed in the vicinity.
   components:
   - type: Sprite
@@ -743,38 +734,27 @@
 
 - type: entity
   parent: BaseSign
-  id: SignScience1
-  name: epistemics sign # DeltaV - Epistemics Department replacing Science
-  description: A sign indicating the epistemics area. # DeltaV - Epistemics Department replacing Science
+  id: SignServer
+  name: server sign
+  description: Ever heard of Big Data? This is it, chump. The biggest.
   components:
   - type: Sprite
-    sprite: Nyanotrasen/Structures/Wallmounts/signs.rsi # Nyanotrasen - Signs read "Epi" instead of "Sci"
-    state: epi1
+    state: data
 
 - type: entity
   parent: BaseSign
-  id: SignScience2
-  name: epistemics sign
-  description: A sign indicating the epistemics area.
-  components:
-  - type: Sprite
-    sprite: Nyanotrasen/Structures/Wallmounts/signs.rsi # Nyanotrasen - Signs read "Epi" instead of "Sci"
-    state: epi2
-
-- type: entity
-  parent: BaseSign
-  id: SignShield
-  name: shield sign
-  description: A sign with a shield.
+  id: SignCans
+  name: canisters sign
+  description: A sign indicating the auspicious presence of gas canisters.
   components:
   - type: Sprite
-    state: shield
+    state: cans
 
 - type: entity
   parent: BaseSign
   id: SignShipDock
-  name: docking sign
-  description: A sign indicating the ship docking area.
+  name: evac sign
+  description: A sign indicating the where the evac shuttle will (likely) arrive.
   components:
   - type: Sprite
     state: dock
@@ -819,12 +799,12 @@
 
 - type: entity
   parent: BaseSign
-  id: SignToxins2
-  name: toxins sign
-  description: A sign indicating the toxin lab.
+  id: SignVault
+  name: vault sign
+  description: A sign indicating the vault. Who knows what secrets lie inside?
   components:
   - type: Sprite
-    state: toxins2
+    state: vault
 
 - type: entity
   parent: BaseSign
@@ -971,29 +951,11 @@
   - type: Sprite
     state: xenobio
 
-- type: entity
-  parent: BaseSign
-  id: SignXenobio2
-  name: xenobio sign
-  description: A sign indicating the xenobiology lab.
-  components:
-  - type: Sprite
-    state: xenobio2
-
-- type: entity
-  parent: BaseSign
-  id: SignXenolab
-  name: xenolab sign
-  description: A sign indicating the xenobiology lab.
-  components:
-  - type: Sprite
-    state: xenolab
-
 - type: entity
   parent: BaseSign
   id: SignZomlab
   name: zombie lab sign
-  description: A sign indicating the zombie lab.
+  description: The final remains of a shut-down Nanotrasen research project that aimed to harness the powers of Romerol. I wonder how that went...
   components:
   - type: Sprite
     state: zomlab
@@ -1204,7 +1166,7 @@
   parent: BaseSign
   id: SignSmoking
   name: no smoking sign
-  description: A warning sign which reads 'NO SMOKING'
+  description: A warning sign which reads 'NO SMOKING'.
   components:
   - type: Sprite
     state: nosmoking2
@@ -1213,7 +1175,7 @@
   parent: BaseSign
   id: SignSomethingOld
   name: old sign
-  description: Technical information of some sort, shame its too worn-out to read.
+  description: Technical information of some sort, shame it's too worn-out to read.
   components:
   - type: Sprite
     state: something-old1
@@ -1222,7 +1184,7 @@
   parent: BaseSign
   id: SignSomethingOld2
   name: old sign
-  description: Looks like a planet crashing by some station above it. Its kinda scary.
+  description: Looks like a planet crashing by some station above it. It's kinda scary.
   components:
   - type: Sprite
     state: something-old2
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
index 7e6a1632a78..9f36f479203 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
@@ -30,7 +30,7 @@
           ejectOnInteract: true
           whitelist:
             components:
-            - FireExtinguisher
+            - SpraySafety
     - type: Damageable
       damageContainer: Inorganic
       damageModifierSet: Metallic
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
index e31152a5b6e..52c71914210 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
@@ -1,5 +1,5 @@
 - type: entity
-  id: Intercom
+  id: BaseIntercom
   name: intercom
   description: An intercom. For when the station just needs to know something.
   abstract: true
@@ -9,6 +9,10 @@
   - type: Electrified
     enabled: false
     usesApcPower: true
+  - type: TelecomExempt
+  - type: EncryptionKeyHolder
+    keySlots: 3
+    keysExtractionMethod: Prying
   - type: RadioMicrophone
     powerRequired: true
     unobstructedRequired: true
@@ -24,12 +28,14 @@
   - type: InteractionOutline
   - type: Appearance
   - type: WiresVisuals
+  - type: WiresPanelSecurity
   - type: ContainerFill
     containers:
       board: [ IntercomElectronics ]
   - type: ContainerContainer
     containers:
       board: !type:Container
+      key_slots: !type:Container
   - type: Sprite
     noRot: false
     drawdepth: SmallObjects
@@ -49,7 +55,6 @@
       visible: false
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
-      shader: unshaded
       visible: false
   - type: Transform
     noRot: false
@@ -61,6 +66,7 @@
   - type: ActivatableUIRequiresPower
   - type: ActivatableUI
     key: enum.IntercomUiKey.Key
+    singleUser: true
   - type: UserInterface
     interfaces:
       enum.IntercomUiKey.Key:
@@ -116,7 +122,7 @@
     - Wallmount
 
 - type: entity
-  id: IntercomAssesmbly
+  id: IntercomAssembly
   name: intercom assembly
   description: An intercom. It doesn't seem very helpful right now.
   components:
@@ -126,7 +132,18 @@
   - type: Sprite
     drawdepth: SmallObjects
     sprite: Structures/Wallmounts/intercom.rsi
-    state: build
+    layers:
+    - state: build
+    - state: panel
+      visible: false
+      map: [ "wires" ]
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.ConstructionVisuals.Layer:
+        wires:
+          0: { visible: false }
+          1: { visible: true }
   - type: Construction
     graph: Intercom
     node: assembly
@@ -137,97 +154,176 @@
     snap:
     - Wallmount
 
+# this weird inheritance BS exists for construction shitcode
+- type: entity
+  id: IntercomConstructed
+  parent: BaseIntercom
+  suffix: Empty, Panel Open
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+    - state: unshaded
+      map: ["enum.PowerDeviceVisualLayers.Powered"]
+      shader: unshaded
+    - state: broadcasting
+      map: ["enum.RadioDeviceVisualLayers.Broadcasting"]
+      shader: unshaded
+      visible: false
+    - state: speaker
+      map: ["enum.RadioDeviceVisualLayers.Speaker"]
+      shader: unshaded
+      visible: false
+    - state: panel
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+      visible: true
+  - type: WiresPanel
+    open: true
+
+- type: entity
+  id: Intercom
+  parent: IntercomConstructed
+  suffix: ""
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+    - state: unshaded
+      map: ["enum.PowerDeviceVisualLayers.Powered"]
+      shader: unshaded
+    - state: broadcasting
+      map: ["enum.RadioDeviceVisualLayers.Broadcasting"]
+      shader: unshaded
+      visible: false
+    - state: speaker
+      map: ["enum.RadioDeviceVisualLayers.Speaker"]
+      shader: unshaded
+      visible: false
+    - state: panel
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: WiresPanel
+    open: false
+
 - type: entity
   id: IntercomCommon
   parent: Intercom
   suffix: Common
   components:
-  - type: Intercom
-    supportedChannels:
-    - Common
+  - type: ContainerFill
+    containers:
+      board:
+      - IntercomElectronics
+      key_slots:
+      - EncryptionKeyCommon
 
 - type: entity
   id: IntercomCommand
   parent: Intercom
   suffix: Command
   components:
-  - type: Intercom
-    supportedChannels:
-    - Common
-    - Command
+  - type: ContainerFill
+    containers:
+      board:
+      - IntercomElectronics
+      key_slots:
+      - EncryptionKeyCommon
+      - EncryptionKeyCommand
 
 - type: entity
   id: IntercomEngineering
   parent: Intercom
   suffix: Engineering
   components:
-  - type: Intercom
-    supportedChannels:
-    - Common
-    - Engineering
+  - type: ContainerFill
+    containers:
+      board:
+      - IntercomElectronics
+      key_slots:
+      - EncryptionKeyCommon
+      - EncryptionKeyEngineering
 
 - type: entity
   id: IntercomMedical
   parent: Intercom
   suffix: Medical
   components:
-  - type: Intercom
-    supportedChannels:
-    - Common
-    - Medical
+  - type: ContainerFill
+    containers:
+      board:
+      - IntercomElectronics
+      key_slots:
+      - EncryptionKeyCommon
+      - EncryptionKeyMedical
 
 - type: entity
   id: IntercomScience
   parent: Intercom
   suffix: Epistemics # DeltaV - Epistemics Department replacing Science
   components:
-  - type: Intercom
-    supportedChannels:
-    - Common
-    - Science
+  - type: ContainerFill
+    containers:
+      board:
+      - IntercomElectronics
+      key_slots:
+      - EncryptionKeyCommon
+      - EncryptionKeyScience
 
 - type: entity
   id: IntercomSecurity
   parent: Intercom
   suffix: Security
+  description: An intercom. It's been reinforced with metal from security helmets, making it a bitch-and-a-half to open.
   components:
-  - type: Intercom
-    supportedChannels:
-    - Common
-    - Security
+  - type: WiresPanel
+    openDelay: 5
+  - type: WiresPanelSecurity
+    examine: wires-panel-component-on-examine-security-level2
+    wiresAccessible: false
+  - type: Construction
+    node: intercomReinforced
+  - type: ContainerFill
+    containers:
+      board:
+      - IntercomElectronics
+      key_slots:
+      - EncryptionKeyCommon
+      - EncryptionKeySecurity
 
 - type: entity
   id: IntercomService
   parent: Intercom
   suffix: Service
   components:
-  - type: Intercom
-    supportedChannels:
-    - Common
-    - Service
+  - type: ContainerFill
+    containers:
+      board:
+      - IntercomElectronics
+      key_slots:
+      - EncryptionKeyCommon
+      - EncryptionKeyService
 
 - type: entity
   id: IntercomSupply
   parent: Intercom
   suffix: Supply
   components:
-  - type: Intercom
-    supportedChannels:
-    - Common
-    - Supply
+  - type: ContainerFill
+    containers:
+      board:
+      - IntercomElectronics
+      key_slots:
+      - EncryptionKeyCommon
+      - EncryptionKeyCargo
 
 - type: entity
   id: IntercomAll
   parent: Intercom
   suffix: All
   components:
-  - type: Intercom
-    supportedChannels:
-    - Common
-    - Command
-    - Engineering
-    - Medical
-    - Science
-    - Security
-    - Service
-    - Supply
+  - type: ContainerFill
+    containers:
+      board:
+      - IntercomElectronics
+      key_slots:
+      - EncryptionKeyCommon
+      - EncryptionKeyStationMaster
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml
index 408ab6b67c3..9c3141298f4 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml
@@ -108,6 +108,7 @@
   - type: ActivatableUI
     key: enum.SurveillanceCameraMonitorUiKey.Key
   - type: ActivatableUIRequiresPower
+  - type: ActivatableUIRequiresVision
   - type: UserInterface
     interfaces:
         enum.SurveillanceCameraMonitorUiKey.Key:
@@ -167,6 +168,7 @@
   - type: ActivatableUI
     key: enum.SurveillanceCameraMonitorUiKey.Key
   - type: ActivatableUIRequiresPower
+  - type: ActivatableUIRequiresVision
   - type: UserInterface
     interfaces:
         enum.SurveillanceCameraMonitorUiKey.Key:
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/service_light.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/service_light.yml
index b8aaa60c372..baadcb67dbf 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/service_light.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/service_light.yml
@@ -24,6 +24,8 @@
     bulb: Bulb
     on: false
     hasLampOnSpawn: ServiceLightBulb
+  - type: DamageOnInteract
     damage:
       types:
         Heat: 5
+    popupText: powered-light-component-burn-hand
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml
new file mode 100644
index 00000000000..793e7211a59
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml
@@ -0,0 +1,475 @@
+# Parents
+- type: entity
+  abstract: true
+  id: ShelfBase
+  parent: BaseStructure
+  name: shelf
+  description: A strange place to place, well, anything really. You feel like you shouldn't be seeing this.'
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    sprite: Structures/Storage/Shelfs/wood.rsi
+    state: base
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.35,-0.35,0.35,0.35"
+        density: 35
+        layer:
+        - BulletImpassable
+  - type: Transform
+  - type: Damageable
+    damageModifierSet: Wood
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 60
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroyHeavy
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: WallMount
+    arc: 175
+  - type: Storage
+    grid:
+    - 0,0,3,1
+    - 0,3,3,4
+    maxItemSize: Normal
+  - type: UserInterface
+    interfaces:
+     enum.StorageUiKey.Key:
+      type: StorageBoundUserInterface
+  - type: InteractionOutline
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+  - type: Tag
+    tags:
+    - Structure
+
+- type: entity
+  abstract: true
+  id: ShelfBaseReinforced
+  parent: ShelfBase
+  name: reinforced shelf
+  description: It looks as strong as reality itself.
+  components:
+  - type: Lock
+  - type: LockVisuals
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/wood.rsi
+    state: base
+    layers:
+    - state: rbase
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: unlocked
+      shader: unshaded
+      # used to keep the unlocked light visible while open. 
+    - state: closed
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+      shader: unshaded
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateDoorOpen: open
+    stateDoorClosed: closed
+
+  - type: AccessReader
+
+# Normal
+- type: entity
+  id: ShelfWood
+  parent: ShelfBase
+  name: wooden shelf
+  description: A convenient place to place, well, anything really.
+  components:
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 60
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroyHeavy
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MaterialWoodPlank1:
+            min: 1
+            max: 3
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Tag
+    tags:
+    - Structure
+    - Wooden
+  - type: Construction
+    graph: Shelf
+    node: ShelfWood
+
+- type: entity
+  id: ShelfMetal
+  parent: ShelfBase
+  name: metal shelf
+  description: A sturdy place to place, well, anything really.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/metal.rsi
+    state: base
+  - type: Damageable
+    damageModifierSet: Metallic
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 120
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 2
+            max: 4
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Tag
+    tags:
+    - Structure
+  - type: Construction
+    graph: Shelf
+    node: ShelfMetal
+
+- type: entity
+  id: ShelfGlass
+  parent: ShelfBase
+  name: glass shelf
+  description: A fragile place to place, well, anything really.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/glass.rsi
+    state: base
+  - type: Damageable
+    damageModifierSet: Glass
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlass:
+            min: 0
+            max: 2
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Tag
+    tags:
+    - Structure
+  - type: Construction
+    graph: Shelf
+    node: ShelfGlass
+
+# Reinforced
+- type: entity
+  id: ShelfRWood
+  parent: ShelfBaseReinforced
+  name: sturdy wood shelf
+  description: A safe place to put your favorite bottle of whiskey.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/wood.rsi
+    state: base
+    layers:
+    - state: rbase
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: closed
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+      shader: unshaded
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 215
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroyHeavy
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MaterialWoodPlank:
+            min: 2
+            max: 5
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Construction
+    graph: Shelf
+    node: ShelfRWood
+
+- type: entity
+  id: ShelfRMetal
+  parent: ShelfBaseReinforced
+  name: sturdy metal shelf
+  description: A strong & shiny place to keep all your vials safe.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/metal.rsi
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 450
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetPlasteel1:
+            min: 2
+            max: 3
+          ShardGlass:
+            min: 1
+            max: 2
+          PartRodMetal1:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Construction
+    graph: Shelf
+    node: ShelfRMetal
+
+- type: entity
+  id: ShelfRGlass
+  parent: ShelfBaseReinforced
+  name: sturdy glass shelf
+  description: Crystal clear reinforced glass doors to show off all your fancy bottles you definitely didn't sell a co-worker's favorite mothroach for.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/glass.rsi
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 250
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetPlastic1:
+            min: 1
+            max: 3
+          ShardGlass:
+            min: 1
+            max: 2
+          PartRodMetal1:
+            min: 0
+            max: 1
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Construction
+    graph: Shelf
+    node: ShelfRGlass
+
+# Departmental
+- type: entity
+  id: ShelfBar
+  parent: ShelfBase
+  name: bar shelf
+  description: Made out of the finest synthetic wood for all alcohol holding needs.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/Departments/Service/bar.rsi
+    state: base
+    layers:
+      - state: base
+      - state: bar-0
+      - map: ["enum.StorageFillLayers.Fill"]
+  - type: Appearance
+  - type: StorageFillVisualizer
+    maxFillLevels: 13
+    fillBaseName: bar
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroyHeavy
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MaterialWoodPlank1:
+            min: 1
+            max: 4
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Storage
+    grid:
+    - 0,0,5,1
+    - 0,3,5,4
+    maxItemSize: Normal
+    whitelist:
+      tags:
+        - DrinkGlass
+        - DrinkBottle
+        - DrinkCan
+        - Beer
+  - type: Construction
+    graph: Shelf
+    node: ShelfBar
+
+- type: entity
+  id: ShelfKitchen
+  parent: ShelfBase
+  name: cooking shelf
+  description: Holds knifes, spice, and everything nice!
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/Departments/Service/kitchen.rsi
+    state: base
+    layers:
+      - state: base
+      - state: kitchen-0
+      - map: ["enum.StorageFillLayers.Fill"]
+  - type: Appearance
+  - type: StorageFillVisualizer
+    maxFillLevels: 13
+    fillBaseName: kitchen
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 150
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 1
+            max: 4
+          MaterialWoodPlank1:
+            min: 0
+            max: 1
+          PartRodMetal1:
+            min: 0
+            max: 2
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Storage
+    grid:
+    - 0,0,5,1
+    - 0,3,5,4
+    maxItemSize: Normal
+    whitelist:
+      tags:
+        - DrinkGlass
+        - BoxCardboard
+        - MonkeyCube
+        - Enzyme
+        - Mayo
+        - Packet
+        - Cleaver
+        - Knife
+        - KitchenKnife
+        - RollingPin
+        - Ingredient
+        - Trash
+  - type: Construction
+    graph: Shelf
+    node: ShelfKitchen
+
+- type: entity
+  id: ShelfChemistry
+  parent: ShelfBaseReinforced
+  name: chemical shelf
+  description: Keeps all your chemicals safe and out of the clow- er, public hands!
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: unlocked
+      shader: unshaded
+    - state: chem-0
+    - map: ["enum.StorageFillLayers.Fill"]
+    - state: closed
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+      shader: unshaded
+  - type: StorageFillVisualizer
+    maxFillLevels: 7
+    fillBaseName: chem
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 330
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetPlasteel1:
+            min: 1
+            max: 2
+          SheetPlastic1:
+            min: 1
+            max: 2
+          ShardGlass:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Storage
+    grid:
+    - 0,0,5,1
+    - 0,3,5,4
+    maxItemSize: Normal
+    whitelist:
+      tags:
+        - ChemDispensable
+        - GlassBeaker
+        - Bottle
+  - type: Construction
+    graph: Shelf
+    node: ShelfChemistry
+
+
+
+# Access presets
+# Try to keep alphabetical sorting if adding more
+
+- type: entity
+  parent: ShelfChemistry
+  id: ShelfChemistryChemistrySecure
+  suffix: Chemistry, Secure
+  components:
+  - type: AccessReader
+    access: [["Chemistry"]]
+
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
index 52fd4565244..f85210e007d 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
@@ -236,7 +236,7 @@
   id: LockableButton
   name: lockable button
   parent: SignalButtonDirectional
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Appearance
   - type: Lock
@@ -496,7 +496,7 @@
 - type: entity
   id: ButtonFrame
   name: button frame
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   description: It's a frame to help distinguish switches visually.
   placement:
     mode: SnapgridCenter
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml
index adc330171f2..31f247ba09d 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml
@@ -44,6 +44,14 @@
   - type: Construction
     graph: Timer
     node: signal
+    containers:
+    - board
+  - type: ContainerContainer
+    containers:
+      board: !type:Container
+  - type: ContainerFill
+    containers:
+      board: [ SignalTimerElectronics ]
 
 - type: entity
   id: ScreenTimer
@@ -67,6 +75,11 @@
   - type: Construction
     graph: Timer
     node: screen
+    containers:
+    - board
+  - type: ContainerFill
+    containers:
+      board: [ ScreenTimerElectronics ]
 
 - type: entity
   id: BrigTimer
@@ -79,11 +92,16 @@
   - type: Construction
     graph: Timer
     node: brig
+    containers:
+    - board
+  - type: ContainerFill
+    containers:
+      board: [ BrigTimerElectronics ]
 
 # Construction Frame
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   id: TimerFrame
   name: timer frame
   description: A construction frame for a timer.
diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
index d131805bf51..4673405e03f 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
@@ -1,5 +1,7 @@
 #TODO: Someone should probably move the ore vein prototypes into their own file, or otherwise split this up in some way. This should not be 1.5k lines long.
 
+# Anyway
+# See WallRock variants for the remappings.
 
 #Asteroid rock
 - type: entity
@@ -91,6 +93,28 @@
           state: rock_asteroid_west
         - state: rock_gold
 
+- type: entity
+  id: AsteroidRockDiamond
+  parent: AsteroidRock
+  description: An ore vein rich with diamonds.
+  suffix: Diamond
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreDiamond
+    - 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_diamond
+
 - type: entity
   id: AsteroidRockPlasma
   parent: AsteroidRock
@@ -587,6 +611,28 @@
       state: ironrock_west
     - state: rock_artifact_fragment
 
+- type: entity
+  id: IronRockDiamond
+  parent: IronRock
+  description: An ore vein rich with diamonds.
+  suffix: Diamond
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreDiamond
+    - type: Sprite
+      layers:
+        - state: ironrock
+        - map: [ "enum.EdgeLayer.South" ]
+          state: ironrock_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: ironrock_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: ironrock_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: ironrock_west
+        - state: rock_diamond
+
 # Rocks and ore veins
 - type: entity
   id: WallRock
@@ -639,31 +685,67 @@
   description: An ore vein rich with coal.
   suffix: Coal
   components:
-    - type: OreVein
-      oreChance: 1.0
-      currentOre: OreCoal
-    - 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_coal
+  - type: EntityRemap
+    mask:
+      AsteroidRock: AsteroidRockCoal
+      WallRockBasalt: WallRockBasaltCoal
+      WallRockChromite: WallRockChromiteCoal
+      WallRockSand: WallRockSandCoal
+      WallRockSnow: WallRockSnowCoal
+  - type: OreVein
+    oreChance: 1.0
+    currentOre: OreCoal
+  - 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_coal
 
 - type: entity
   id: WallRockGold
   parent: WallRock
   description: An ore vein rich with gold.
   suffix: Gold
+  components:
+  - type: EntityRemap
+    mask:
+      AsteroidRock: AsteroidRockGold
+      WallRockBasalt: WallRockBasaltGold
+      WallRockChromite: WallRockChromiteGold
+      WallRockSand: WallRockSandGold
+      WallRockSnow: WallRockSnowGold
+  - type: OreVein
+    oreChance: 1.0
+    currentOre: OreGold
+  - 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_gold
+
+- type: entity
+  id: WallRockDiamond
+  parent: WallRock
+  description: An ore vein rich with diamonds.
+  suffix: Diamond
   components:
     - type: OreVein
       oreChance: 1.0
-      currentOre: OreGold
+      currentOre: OreDiamond
     - type: Sprite
       layers:
         - state: rock
@@ -675,7 +757,7 @@
           state: rock_north
         - map: [ "enum.EdgeLayer.West" ]
           state: rock_west
-        - state: rock_gold
+        - state: rock_diamond
 
 - type: entity
   id: WallRockPlasma
@@ -683,21 +765,28 @@
   description: An ore vein rich with plasma.
   suffix: Plasma
   components:
-    - type: OreVein
-      oreChance: 1.0
-      currentOre: OrePlasma
-    - 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_phoron
+  - type: EntityRemap
+    mask:
+      AsteroidRock: AsteroidRockPlasma
+      WallRockBasalt: WallRockBasaltPlasma
+      WallRockChromite: WallRockChromitePlasma
+      WallRockSand: WallRockSandPlasma
+      WallRockSnow: WallRockSnowPlasma
+  - type: OreVein
+    oreChance: 1.0
+    currentOre: OrePlasma
+  - 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_phoron
 
 - type: entity
   id: WallRockQuartz
@@ -705,21 +794,28 @@
   description: An ore vein rich with quartz.
   suffix: Quartz
   components:
-    - type: OreVein
-      oreChance: 1.0
-      currentOre: OreSpaceQuartz
-    - 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_quartz
+  - type: EntityRemap
+    mask:
+      AsteroidRock: AsteroidRockQuartz
+      WallRockBasalt: WallRockBasaltQuartz
+      WallRockChromite: WallRockChromiteQuartz
+      WallRockSand: WallRockSandQuartz
+      WallRockSnow: WallRockSnowQuartz
+  - type: OreVein
+    oreChance: 1.0
+    currentOre: OreSpaceQuartz
+  - 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_quartz
 
 - type: entity
   id: WallRockSilver
@@ -727,21 +823,28 @@
   description: An ore vein rich with silver.
   suffix: Silver
   components:
-    - type: OreVein
-      oreChance: 1.0
-      currentOre: OreSilver
-    - 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_silver
+  - type: EntityRemap
+    mask:
+      AsteroidRock: AsteroidRockSilver
+      WallRockBasalt: WallRockBasaltSilver
+      WallRockChromite: WallRockChromiteSilver
+      WallRockSand: WallRockSandSilver
+      WallRockSnow: WallRockSnowSilver
+  - type: OreVein
+    oreChance: 1.0
+    currentOre: OreSilver
+  - 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_silver
 
 # Yes I know it drops steel but we may get smelting at some point
 - type: entity
@@ -750,6 +853,13 @@
   description: An ore vein rich with iron.
   suffix: Iron
   components:
+    - type: EntityRemap
+      mask:
+        AsteroidRock: AsteroidRockTin
+        WallRockBasalt: WallRockBasaltTin
+        WallRockChromite: WallRockChromiteTin
+        WallRockSand: WallRockSandTin
+        WallRockSnow: WallRockSnowTin
     - type: OreVein
       oreChance: 1.0
       currentOre: OreSteel
@@ -772,21 +882,28 @@
   description: An ore vein rich with uranium.
   suffix: Uranium
   components:
-    - type: OreVein
-      oreChance: 1.0
-      currentOre: OreUranium
-    - 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_uranium
+  - type: EntityRemap
+    mask:
+      AsteroidRock: AsteroidRockUranium
+      WallRockBasalt: WallRockBasaltUranium
+      WallRockChromite: WallRockChromiteUranium
+      WallRockSand: WallRockSandUranium
+      WallRockSnow: WallRockSnowUranium
+  - type: OreVein
+    oreChance: 1.0
+    currentOre: OreUranium
+  - 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_uranium
 
 
 - type: entity
@@ -795,21 +912,28 @@
   description: An ore vein rich with bananium.
   suffix: Bananium
   components:
-    - type: OreVein
-      oreChance: 1.0
-      currentOre: OreBananium
-    - 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_bananium
+  - type: EntityRemap
+    mask:
+      AsteroidRock: AsteroidRockBananium
+      WallRockBasalt: WallRockBasaltBananium
+      WallRockChromite: WallRockChromiteBananium
+      WallRockSand: WallRockSandBananium
+      WallRockSnow: WallRockSnowBananium
+  - type: OreVein
+    oreChance: 1.0
+    currentOre: OreBananium
+  - 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_bananium
 
 - type: entity
   id: WallRockArtifactFragment
@@ -817,21 +941,28 @@
   description: A rock wall. What's that sticking out of it?
   suffix: Artifact Fragment
   components:
-    - type: OreVein
-      oreChance: 1.0
-      currentOre: OreArtifactFragment
-    - 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_artifact_fragment
+  - type: EntityRemap
+    mask:
+      AsteroidRock: AsteroidRockArtifactFragment
+      WallRockBasalt: WallRockBasaltArtifactFragment
+      WallRockChromite: WallRockChromiteArtifactFragment
+      WallRockSand: WallRockSandArtifactFragment
+      WallRockSnow: WallRockSnowArtifactFragment
+  - type: OreVein
+    oreChance: 1.0
+    currentOre: OreArtifactFragment
+  - 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_artifact_fragment
 
 - type: entity
   id: WallRockSalt
@@ -839,21 +970,28 @@
   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
+  - type: EntityRemap
+    mask:
+      AsteroidRock: AsteroidRockSalt
+      WallRockBasalt: WallRockBasaltSalt
+      WallRockChromite: WallRockChromiteSalt
+      WallRockSand: WallRockSandSalt
+      WallRockSnow: WallRockSnowSalt
+  - 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
@@ -921,6 +1059,28 @@
           state: rock_wall_west
         - state: rock_gold
 
+- type: entity
+  id: WallRockBasaltDiamond
+  parent: WallRockBasalt
+  description: An ore vein rich with diamonds.
+  suffix: Diamond
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreDiamond
+    - 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_diamond
+
 - type: entity
   id: WallRockBasaltPlasma
   parent: WallRockBasalt
@@ -1164,6 +1324,28 @@
           state: rock_snow_west
         - state: rock_gold
 
+- type: entity
+  id: WallRockSnowDiamond
+  parent: WallRockSnow
+  description: An ore vein rich with diamonds.
+  suffix: Diamond
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreDiamond
+    - 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_diamond
+
 - type: entity
   id: WallRockSnowPlasma
   parent: WallRockSnow
@@ -1407,6 +1589,28 @@
           state: rock_sand_west
         - state: rock_gold
 
+- type: entity
+  id: WallRockSandDiamond
+  parent: WallRockSand
+  description: An ore vein rich with diamonds.
+  suffix: Diamond
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreDiamond
+    - 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_diamond
+
 - type: entity
   id: WallRockSandPlasma
   parent: WallRockSand
@@ -1517,7 +1721,6 @@
           state: rock_sand_west
         - state: rock_uranium
 
-
 - type: entity
   id: WallRockSandBananium
   parent: WallRockSand
@@ -1650,6 +1853,28 @@
           state: rock_chromite_west
         - state: rock_gold
 
+- type: entity
+  id: WallRockChromiteDiamond
+  parent: WallRockChromite
+  description: An ore vein rich with diamonds.
+  suffix: Diamond
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreDiamond
+    - 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_diamond
+
 - type: entity
   id: WallRockChromitePlasma
   parent: WallRockChromite
@@ -1893,6 +2118,28 @@
           state: rock_andesite_west
         - state: rock_gold
 
+- type: entity
+  id: WallRockAndesiteDiamond
+  parent: WallRockAndesite
+  description: An ore vein rich with diamonds.
+  suffix: Diamond
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreDiamond
+    - 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_diamond
+
 - type: entity
   id: WallRockAndesitePlasma
   parent: WallRockAndesite
diff --git a/Resources/Prototypes/Entities/Structures/Walls/grille.yml b/Resources/Prototypes/Entities/Structures/Walls/grille.yml
index 7be721b6f9a..84dbb92d1f1 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/grille.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/grille.yml
@@ -92,7 +92,7 @@
   id: ClockworkGrille
   parent: Grille
   name: clockwork grille
-  description: a flimsy framework of iron rods assembled in traditional Ratvarian fashion.
+  description: A flimsy framework of iron rods assembled in traditional Ratvarian fashion.
   components:
     - type: Sprite
       drawdepth: Walls
diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
index c1c525b7d38..e02a555d21f 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -1093,7 +1093,7 @@
 - type: entity
   parent: BaseWall
   id: WallMining
-  name: wall
+  name: mining wall
   components:
   - type: Tag
     tags:
@@ -1113,11 +1113,16 @@
   - type: IconSmooth
     key: walls
     base: mining
+  - type: RandomIconSmooth
+    randomStates:
+    - mining
+    - miningB
+  - type: Appearance
 
 - type: entity
   parent: WallShuttleDiagonal
   id: WallMiningDiagonal
-  name: wall
+  name: mining wall
   suffix: diagonal
   placement:
     mode: SnapgridCenter
@@ -1188,7 +1193,7 @@
 
 - type: entity
   id: WallInvisible
-  name: Invisible Wall
+  name: invisible wall
   components:
   - type: TimedDespawn
     lifetime: 15
diff --git a/Resources/Prototypes/Entities/Structures/gates.yml b/Resources/Prototypes/Entities/Structures/gates.yml
index 22ab745a1ee..6b02840ba0b 100644
--- a/Resources/Prototypes/Entities/Structures/gates.yml
+++ b/Resources/Prototypes/Entities/Structures/gates.yml
@@ -15,9 +15,10 @@
 
 - type: entity
   parent: BaseLogicItem
-  id: LogicGate
+  id: LogicGateOr
   name: logic gate
   description: A logic gate with two inputs and one output. Technicians can change its mode of operation using a screwdriver.
+  suffix: Or
   components:
   - type: Sprite
     layers:
@@ -51,6 +52,71 @@
           Nand: { state: nand }
           Xnor: { state: xnor }
 
+- type: entity
+  parent: LogicGateOr
+  id: LogicGateAnd
+  suffix: And
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+    - state: and
+      map: [ "enum.LogicGateLayers.Gate" ]
+  - type: LogicGate
+    gate: And
+
+- type: entity
+  parent: LogicGateOr
+  id: LogicGateXor
+  suffix: Xor
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+    - state: xor
+      map: [ "enum.LogicGateLayers.Gate" ]
+  - type: LogicGate
+    gate: Xor
+
+- type: entity
+  parent: LogicGateOr
+  id: LogicGateNor
+  suffix: Nor
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+    - state: nor
+      map: [ "enum.LogicGateLayers.Gate" ]
+  - type: LogicGate
+    gate: Nor
+
+- type: entity
+  parent: LogicGateOr
+  id: LogicGateNand
+  suffix: Nand
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+    - state: nand
+      map: [ "enum.LogicGateLayers.Gate" ]
+  - type: LogicGate
+    gate: Nand
+
+- type: entity
+  parent: LogicGateOr
+  id: LogicGateXnor
+  suffix: Xnor
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+    - state: xnor
+      map: [ "enum.LogicGateLayers.Gate" ]
+  - type: LogicGate
+    gate: Xnor
+
 - type: entity
   parent: BaseLogicItem
   id: EdgeDetector
diff --git a/Resources/Prototypes/Entities/Structures/hydro_tray.yml b/Resources/Prototypes/Entities/Structures/hydro_tray.yml
index 68a0cbd38e4..7224c154f9a 100644
--- a/Resources/Prototypes/Entities/Structures/hydro_tray.yml
+++ b/Resources/Prototypes/Entities/Structures/hydro_tray.yml
@@ -91,6 +91,7 @@
   - type: GuideHelp
     guides:
     - Botany
+    - Chemicals
 
 - type: entity
   parent: hydroponicsTray
diff --git a/Resources/Prototypes/Entities/Structures/meat_spike.yml b/Resources/Prototypes/Entities/Structures/meat_spike.yml
index 086066f5c26..6e2b5f0250b 100644
--- a/Resources/Prototypes/Entities/Structures/meat_spike.yml
+++ b/Resources/Prototypes/Entities/Structures/meat_spike.yml
@@ -57,3 +57,4 @@
   - type: GuideHelp
     guides:
     - Chef
+    - FoodRecipes
diff --git a/Resources/Prototypes/Entities/Tiles/bananium.yml b/Resources/Prototypes/Entities/Tiles/bananium.yml
index c9a6ec28441..fa8cfdd001a 100644
--- a/Resources/Prototypes/Entities/Tiles/bananium.yml
+++ b/Resources/Prototypes/Entities/Tiles/bananium.yml
@@ -44,8 +44,6 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: Slippery
-    paralyzeTime: 2
-    launchForwardsMultiplier: 1.5
   - type: StepTrigger
     intersectRatio: 0.2
   - type: Physics
diff --git a/Resources/Prototypes/Entities/Tiles/basalt.yml b/Resources/Prototypes/Entities/Tiles/basalt.yml
index 900f25d1008..73a7dc0dea3 100644
--- a/Resources/Prototypes/Entities/Tiles/basalt.yml
+++ b/Resources/Prototypes/Entities/Tiles/basalt.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: BasaltOne
   name: basalt
-  description: Rock
+  description: Rock.
   placement:
     mode: SnapgridCenter
   components:
diff --git a/Resources/Prototypes/Entities/Tiles/water.yml b/Resources/Prototypes/Entities/Tiles/water.yml
index 2fd1c8547de..c488df231b2 100644
--- a/Resources/Prototypes/Entities/Tiles/water.yml
+++ b/Resources/Prototypes/Entities/Tiles/water.yml
@@ -54,3 +54,12 @@
       collection: FootstepWater
       params:
         volume: 8
+  - type: StepTrigger
+    requiredTriggeredSpeed: 0
+    intersectRatio: 0.1
+    blacklist:
+      tags:
+        - Catwalk
+  - type: TileEntityEffect
+    effects:
+    - !type:ExtinguishReaction
diff --git a/Resources/Prototypes/Entities/Virtual/beam.yml b/Resources/Prototypes/Entities/Virtual/beam.yml
index 7ded09c3fff..fa249f0dd3d 100644
--- a/Resources/Prototypes/Entities/Virtual/beam.yml
+++ b/Resources/Prototypes/Entities/Virtual/beam.yml
@@ -2,7 +2,7 @@
 - type: entity
   id: VirtualBeamEntityController
   name: BEAM ENTITY YOU SHOULD NOT SEE THIS
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Beam
     - type: TimedDespawn
diff --git a/Resources/Prototypes/Entities/Virtual/electrocution.yml b/Resources/Prototypes/Entities/Virtual/electrocution.yml
index ac65245191e..c45e0b3ca9e 100644
--- a/Resources/Prototypes/Entities/Virtual/electrocution.yml
+++ b/Resources/Prototypes/Entities/Virtual/electrocution.yml
@@ -12,7 +12,7 @@
 - type: entity
   id: VirtualElectrocutionLoadHVPower
   parent: VirtualElectrocutionLoadBase
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: NodeContainer
     nodes:
@@ -26,7 +26,7 @@
 - type: entity
   id: VirtualElectrocutionLoadMVPower
   parent: VirtualElectrocutionLoadBase
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: NodeContainer
     nodes:
@@ -40,7 +40,7 @@
 - type: entity
   id: VirtualElectrocutionLoadApc
   parent: VirtualElectrocutionLoadBase
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: NodeContainer
     nodes:
diff --git a/Resources/Prototypes/Entities/Virtual/stripping_hidden.yml b/Resources/Prototypes/Entities/Virtual/stripping_hidden.yml
index 538e502a402..81e8e9866cb 100644
--- a/Resources/Prototypes/Entities/Virtual/stripping_hidden.yml
+++ b/Resources/Prototypes/Entities/Virtual/stripping_hidden.yml
@@ -3,9 +3,9 @@
 
 - type: entity
   id: StrippingHiddenEntity
-  name: Hidden Entity
+  name: hidden entity
   description: There is something in this pocket. #Or maybe they ar... nah... too obvious a joke.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     texture: Interface/VerbIcons/information.svg.192dpi.png
diff --git a/Resources/Prototypes/Entities/Virtual/tether.yml b/Resources/Prototypes/Entities/Virtual/tether.yml
index ce953854d65..9459fd20887 100644
--- a/Resources/Prototypes/Entities/Virtual/tether.yml
+++ b/Resources/Prototypes/Entities/Virtual/tether.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: TetherEntity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Physics
     bodyType: Dynamic
diff --git a/Resources/Prototypes/Entities/Virtual/virtual_item.yml b/Resources/Prototypes/Entities/Virtual/virtual_item.yml
index ed742435501..21391dbb344 100644
--- a/Resources/Prototypes/Entities/Virtual/virtual_item.yml
+++ b/Resources/Prototypes/Entities/Virtual/virtual_item.yml
@@ -2,7 +2,8 @@
 - type: entity
   id: VirtualItem
   name: VIRTUAL ITEM YOU SHOULD NOT SEE THIS
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Item
+    size: Ginormous # no storage insertion visuals
   - type: VirtualItem
diff --git a/Resources/Prototypes/Entities/World/Debris/asteroids.yml b/Resources/Prototypes/Entities/World/Debris/asteroids.yml
index 061288d010b..bb33801e2d6 100644
--- a/Resources/Prototypes/Entities/World/Debris/asteroids.yml
+++ b/Resources/Prototypes/Entities/World/Debris/asteroids.yml
@@ -1,7 +1,7 @@
-- type: entity
+- type: entity
   id: BaseAsteroidDebris
   parent: BaseDebris
-  name: Asteroid Debris
+  name: asteroid debris
   abstract: true
   components:
     - type: MapGrid
@@ -32,6 +32,9 @@
           - id: WallRockGold
             prob: 0.05
             orGroup: rock
+          - id: WallRockDiamond
+            prob: 0.005
+            orGroup: rock
           - id: WallRockSilver
             prob: 0.05
             orGroup: rock
@@ -54,8 +57,8 @@
 - type: entity
   id: AsteroidDebrisSmall
   parent: BaseAsteroidDebris
-  name: Asteroid Debris Small
-  noSpawn: true
+  name: asteroid debris small
+  categories: [ HideSpawnMenu ]
   components:
     - type: MapGrid
     - type: BlobFloorPlanBuilder
@@ -64,8 +67,8 @@
 - type: entity
   id: AsteroidDebrisMedium
   parent: BaseAsteroidDebris
-  name: Asteroid Debris Medium
-  noSpawn: true
+  name: asteroid debris medium
+  categories: [ HideSpawnMenu ]
   components:
     - type: MapGrid
     - type: BlobFloorPlanBuilder
@@ -74,8 +77,8 @@
 - type: entity
   id: AsteroidDebrisLarge
   parent: BaseAsteroidDebris
-  name: Asteroid Debris Large
-  noSpawn: true
+  name: asteroid debris large
+  categories: [ HideSpawnMenu ]
   components:
     - type: MapGrid
     - type: BlobFloorPlanBuilder
@@ -84,8 +87,8 @@
 - type: entity
   id: AsteroidDebrisLarger
   parent: BaseAsteroidDebris
-  name: Asteroid Debris Larger
-  noSpawn: true
+  name: asteroid debris larger
+  categories: [ HideSpawnMenu ]
   components:
     - type: MapGrid
     - type: BlobFloorPlanBuilder
@@ -95,8 +98,8 @@
 - type: entity
   id: AsteroidSalvageSmall
   parent: BaseAsteroidDebris
-  name: Salvage Asteroid Small
-  noSpawn: true
+  name: salvage asteroid small
+  categories: [ HideSpawnMenu ]
   components:
     - type: MapGrid
     - type: BlobFloorPlanBuilder
@@ -107,8 +110,8 @@
 - type: entity
   id: AsteroidSalvageMedium
   parent: BaseAsteroidDebris
-  name: Salvage Asteroid Medium
-  noSpawn: true
+  name: salvage asteroid medium
+  categories: [ HideSpawnMenu ]
   components:
     - type: MapGrid
     - type: BlobFloorPlanBuilder
@@ -119,8 +122,8 @@
 - type: entity
   id: AsteroidSalvageLarge
   parent: BaseAsteroidDebris
-  name: Salvage Asteroid Large
-  noSpawn: true
+  name: salvage asteroid large
+  categories: [ HideSpawnMenu ]
   components:
     - type: MapGrid
     - type: BlobFloorPlanBuilder
@@ -131,8 +134,8 @@
 - type: entity
   id: AsteroidSalvageHuge
   parent: BaseAsteroidDebris
-  name: Salvage Asteroid Huge
-  noSpawn: true
+  name: salvage asteroid huge
+  categories: [ HideSpawnMenu ]
   components:
     - type: MapGrid
     - type: BlobFloorPlanBuilder
diff --git a/Resources/Prototypes/Entities/World/Debris/wrecks.yml b/Resources/Prototypes/Entities/World/Debris/wrecks.yml
index 4c5a3be48f7..7bbeadeb5ba 100644
--- a/Resources/Prototypes/Entities/World/Debris/wrecks.yml
+++ b/Resources/Prototypes/Entities/World/Debris/wrecks.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: BaseScrapDebris
   parent: BaseDebris
-  name: Scrap Debris
+  name: scrap debris
   abstract: true
   components:
     - type: MapGrid
@@ -52,8 +52,8 @@
 - type: entity
   id: ScrapDebrisSmall
   parent: BaseScrapDebris
-  name: Scrap Debris Small
-  noSpawn: true
+  name: scrap debris small
+  categories: [ HideSpawnMenu ]
   components:
     - type: MapGrid
     - type: BlobFloorPlanBuilder
@@ -62,8 +62,8 @@
 - type: entity
   id: ScrapDebrisMedium
   parent: BaseScrapDebris
-  name: Scrap Debris Medium
-  noSpawn: true
+  name: scrap debris medium
+  categories: [ HideSpawnMenu ]
   components:
     - type: MapGrid
     - type: BlobFloorPlanBuilder
@@ -72,8 +72,8 @@
 - type: entity
   id: ScrapDebrisLarge
   parent: BaseScrapDebris
-  name: Scrap Debris Large
-  noSpawn: true
+  name: scrap debris large
+  categories: [ HideSpawnMenu ]
   components:
     - type: MapGrid
     - type: BlobFloorPlanBuilder
diff --git a/Resources/Prototypes/Entities/World/chunk.yml b/Resources/Prototypes/Entities/World/chunk.yml
index b60fd0d91be..c7cb09c2a4b 100644
--- a/Resources/Prototypes/Entities/World/chunk.yml
+++ b/Resources/Prototypes/Entities/World/chunk.yml
@@ -1,11 +1,11 @@
 - type: entity
   id: WorldChunk
   parent: MarkerBase
-  name: World Chunk
+  name: world chunk
   description: |
     It's rude to stare.
     It's also a bit odd you're looking at the abstract representation of the grid of reality.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: WorldChunk
     - type: Sprite
diff --git a/Resources/Prototypes/Entities/categories.yml b/Resources/Prototypes/Entities/categories.yml
index d75b8feedbe..0815c693eb6 100644
--- a/Resources/Prototypes/Entities/categories.yml
+++ b/Resources/Prototypes/Entities/categories.yml
@@ -7,3 +7,8 @@
   id: Objectives
   name: entity-category-name-objectives
   hideSpawnMenu: true
+
+- type: entityCategory
+  id: GameRules
+  name: entity-category-name-game-rules
+  hideSpawnMenu: true
diff --git a/Resources/Prototypes/Entities/foldable.yml b/Resources/Prototypes/Entities/foldable.yml
index a0843cd1250..260cda799b4 100644
--- a/Resources/Prototypes/Entities/foldable.yml
+++ b/Resources/Prototypes/Entities/foldable.yml
@@ -13,3 +13,11 @@
         unfoldedLayer:
           True: {visible: false}
           False: {visible: true}
+
+- type: entity
+  abstract: true
+  parent: BaseFoldable
+  id: BaseDeployFoldable
+  name: "deploy foldable"
+  components:
+  - type: DeployFoldable
diff --git a/Resources/Prototypes/GameRules/cargo_gifts.yml b/Resources/Prototypes/GameRules/cargo_gifts.yml
index 62ec96d6a6d..ffc2ed404b7 100644
--- a/Resources/Prototypes/GameRules/cargo_gifts.yml
+++ b/Resources/Prototypes/GameRules/cargo_gifts.yml
@@ -1,16 +1,29 @@
 - type: entity
-  id: GiftsPizzaPartySmall
+  id: CargoGiftsBase
   parent: BaseGameRule
-  noSpawn: true
+  abstract: true
+  components:
+  - type: GameRule
+    delay:
+      min: 10
+      max: 10
+  - type: StationEvent
+    startColor: "#18abf5"
+    startAudio:
+      path: /Audio/Announcements/announce.ogg
+  - type: CargoGiftsRule
+    sender: cargo-gift-default-sender
+
+- type: entity
+  id: GiftsPizzaPartySmall
+  parent: CargoGiftsBase
   components:
   - type: StationEvent
     weight: 5
-    startDelay: 10
     duration: 120
     earliestStart: 20
   - type: CargoGiftsRule
     description: cargo-gift-pizza-small
-    sender: cargo-gift-default-sender
     dest: cargo-gift-dest-bar
     gifts:
       FoodPizza: 1              # 4 pizzas
@@ -20,191 +33,164 @@
 
 - type: entity
   id: GiftsPizzaPartyLarge
-  parent: BaseGameRule
-  noSpawn: true
+  parent: CargoGiftsBase
   components:
-    - type: StationEvent
-      weight: 2
-      startDelay: 10
-      duration: 240
-      earliestStart: 20
-      minimumPlayers: 40
-    - type: CargoGiftsRule
-      description: cargo-gift-pizza-large
-      sender: cargo-gift-default-sender
-      dest: cargo-gift-dest-bar
-      gifts:
-        FoodPizzaLarge: 1              # 16 pizzas
-        FoodBarSupply: 1
-        FoodSoftdrinksLarge: 1
+  - type: StationEvent
+    weight: 2
+    duration: 240
+    earliestStart: 20
+    minimumPlayers: 40
+  - type: CargoGiftsRule
+    description: cargo-gift-pizza-large
+    dest: cargo-gift-dest-bar
+    gifts:
+      FoodPizzaLarge: 1              # 16 pizzas
+      FoodBarSupply: 1
+      FoodSoftdrinksLarge: 1
 
 - type: entity
   id: GiftsEngineering
-  parent: BaseGameRule
-  noSpawn: true
+  parent: CargoGiftsBase
   components:
-    - type: StationEvent
-      weight: 5
-      startDelay: 10
-      duration: 240
-      earliestStart: 30
-      minimumPlayers: 10
-    - type: CargoGiftsRule
-      description: cargo-gift-eng
-      sender: cargo-gift-default-sender
-      dest: cargo-gift-dest-eng
-      gifts:
-        EngineeringCableBulk: 1
-        AirlockKit: 1
-        MaterialSteel: 1
-        MaterialPlasteel: 1
-        MaterialGlass: 1
-        CrateVendingMachineRestockEngineering: 1
+  - type: StationEvent
+    weight: 5
+    duration: 240
+    earliestStart: 30
+    minimumPlayers: 10
+  - type: CargoGiftsRule
+    description: cargo-gift-eng
+    dest: cargo-gift-dest-eng
+    gifts:
+      EngineeringCableBulk: 1
+      AirlockKit: 1
+      MaterialSteel: 1
+      MaterialPlasteel: 1
+      MaterialGlass: 1
+      CrateVendingMachineRestockEngineering: 1
 
 - type: entity
   id: GiftsVendingRestock
-  parent: BaseGameRule
-  noSpawn: true
+  parent: CargoGiftsBase
   components:
-    - type: StationEvent
-      weight: 4
-      startDelay: 10
-      duration: 120
-      minimumPlayers: 40
-      earliestStart: 30
-    - type: CargoGiftsRule
-      description: cargo-gift-vending
-      sender: cargo-gift-default-sender
-      dest: cargo-gift-dest-supp
-      gifts:
-        CrateVendingMachineRestockHotDrinks: 3
-        CrateVendingMachineRestockBooze: 1
-        CrateVendingMachineRestockNutriMax: 1
-        CrateVendingMachineRestockRobustSoftdrinks: 2
-        CrateVendingMachineRestockVendomat: 1
-        CrateVendingMachineRestockGetmoreChocolateCorp: 1
+  - type: StationEvent
+    weight: 4
+    duration: 120
+    minimumPlayers: 40
+    earliestStart: 30
+  - type: CargoGiftsRule
+    description: cargo-gift-vending
+    dest: cargo-gift-dest-supp
+    gifts:
+      CrateVendingMachineRestockHotDrinks: 3
+      CrateVendingMachineRestockBooze: 1
+      CrateVendingMachineRestockNutriMax: 1
+      CrateVendingMachineRestockRobustSoftdrinks: 2
+      CrateVendingMachineRestockVendomat: 1
+      CrateVendingMachineRestockGetmoreChocolateCorp: 1
 
 - type: entity
   id: GiftsJanitor
-  parent: BaseGameRule
-  noSpawn: true
+  parent: CargoGiftsBase
   components:
-    - type: StationEvent
-      weight: 6
-      startDelay: 10
-      duration: 120
-      minimumPlayers: 30
-      earliestStart: 20
-    - type: CargoGiftsRule
-      description: cargo-gift-cleaning
-      sender: cargo-gift-default-sender
-      dest: cargo-gift-dest-janitor
-      gifts:
-        ServiceJanitorial: 2
-        ServiceLightsReplacement: 2
-        ServiceJanitorBiosuit: 1
+  - type: StationEvent
+    weight: 6
+    duration: 120
+    minimumPlayers: 30
+    earliestStart: 20
+  - type: CargoGiftsRule
+    description: cargo-gift-cleaning
+    dest: cargo-gift-dest-janitor
+    gifts:
+      ServiceJanitorial: 2
+      ServiceLightsReplacement: 2
+      ServiceJanitorBiosuit: 1
 
 - type: entity
   id: GiftsMedical
-  parent: BaseGameRule
-  noSpawn: true
+  parent: CargoGiftsBase
   components:
-    - type: StationEvent
-      weight: 8
-      startDelay: 10
-      duration: 120
-      earliestStart: 20
-      minimumPlayers: 30
-    - type: CargoGiftsRule
-      description: cargo-gift-medical-supply
-      sender: cargo-gift-default-sender
-      dest: cargo-gift-dest-med
-      gifts:
-        MedicalSupplies: 1
-        MedicalChemistrySupplies: 1
-        EmergencyBruteKit: 1
-        EmergencyAdvancedKit: 1
-        MedicalBiosuit: 1
+  - type: StationEvent
+    weight: 8
+    duration: 120
+    earliestStart: 20
+    minimumPlayers: 30
+  - type: CargoGiftsRule
+    description: cargo-gift-medical-supply
+    dest: cargo-gift-dest-med
+    gifts:
+      MedicalSupplies: 1
+      MedicalChemistrySupplies: 1
+      EmergencyBruteKit: 1
+      EmergencyAdvancedKit: 1
+      MedicalBiosuit: 1
 
 - type: entity
   id: GiftsSpacingSupplies
-  parent: BaseGameRule
-  noSpawn: true
+  parent: CargoGiftsBase
   components:
-    - type: StationEvent
-      weight: 4
-      startDelay: 10
-      duration: 120
-      earliestStart: 10
-      minimumPlayers: 40
-    - type: CargoGiftsRule
-      description: cargo-gift-space-protection
-      sender: cargo-gift-default-sender
-      dest: cargo-gift-dest-supp
-      gifts:
-        EmergencyInternalsLarge: 2
-        EmergencyInflatablewall: 1
-        EmergencyAdvancedKit: 1
-        MedicalBiosuit: 1
-        EmergencyO2Kit: 1
+  - type: StationEvent
+    weight: 4
+    duration: 120
+    earliestStart: 10
+    minimumPlayers: 40
+  - type: CargoGiftsRule
+    description: cargo-gift-space-protection
+    dest: cargo-gift-dest-supp
+    gifts:
+      EmergencyInternalsLarge: 2
+      EmergencyInflatablewall: 1
+      EmergencyAdvancedKit: 1
+      MedicalBiosuit: 1
+      EmergencyO2Kit: 1
 
 - type: entity
   id: GiftsFireProtection
-  parent: BaseGameRule
-  noSpawn: true
+  parent: CargoGiftsBase
   components:
-    - type: StationEvent
-      weight: 4
-      startDelay: 10
-      duration: 120
-      earliestStart: 20
-      minimumPlayers: 40
-    - type: CargoGiftsRule
-      description: cargo-gift-fire-protection
-      sender: cargo-gift-default-sender
-      dest: cargo-gift-dest-supp
-      gifts:
-        EmergencyFire: 2
-        EmergencyBurnKit: 1
-        EmergencyBruteKit: 1
+  - type: StationEvent
+    weight: 4
+    duration: 120
+    earliestStart: 20
+    minimumPlayers: 40
+  - type: CargoGiftsRule
+    description: cargo-gift-fire-protection
+    dest: cargo-gift-dest-supp
+    gifts:
+      EmergencyFire: 2
+      EmergencyBurnKit: 1
+      EmergencyBruteKit: 1
 
 - type: entity
   id: GiftsSecurityGuns
-  parent: BaseGameRule
-  noSpawn: true
+  parent: CargoGiftsBase
   components:
-    - type: StationEvent
-      weight: 3
-      startDelay: 10
-      duration: 120
-      earliestStart: 20
-      minimumPlayers: 50
-    - type: CargoGiftsRule
-      description: cargo-gift-security-guns
-      sender: cargo-gift-default-sender
-      dest: cargo-gift-dest-sec
-      gifts:
-        SecurityArmor: 3
-        ArmorySmg: 1
-        ArmoryShotgun: 1
-        ArmoryLaser: 1
+  - type: StationEvent
+    weight: 3
+    duration: 120
+    earliestStart: 20
+    minimumPlayers: 50
+  - type: CargoGiftsRule
+    description: cargo-gift-security-guns
+    dest: cargo-gift-dest-sec
+    gifts:
+      SecurityArmor: 3
+      ArmorySmg: 1
+      ArmoryShotgun: 1
+      ArmoryLaser: 1
 
 - type: entity
   id: GiftsSecurityRiot
-  parent: BaseGameRule
-  noSpawn: true
+  parent: CargoGiftsBase
   components:
-    - type: StationEvent
-      weight: 4
-      startDelay: 10
-      duration: 120
-      earliestStart: 20
-      minimumPlayers: 50
-    - type: CargoGiftsRule
-      description: cargo-gift-security-riot
-      sender: cargo-gift-default-sender
-      dest: cargo-gift-dest-sec
-      gifts:
-        SecurityRiot: 2
-        SecurityRestraints: 2
-        SecurityNonLethal: 2
+  - type: StationEvent
+    weight: 4
+    duration: 120
+    earliestStart: 20
+    minimumPlayers: 50
+  - type: CargoGiftsRule
+    description: cargo-gift-security-riot
+    dest: cargo-gift-dest-sec
+    gifts:
+      SecurityRiot: 2
+      SecurityRestraints: 2
+      SecurityNonLethal: 2
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index ed9f7b71c77..ff9c759c3f4 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -1,29 +1,64 @@
 - type: entity
-  id: AnomalySpawn
+  id: BaseStationEvent
+  parent: BaseGameRule
+  abstract: true
+  components:
+    - type: GameRule
+      delay:
+        min:  10
+        max:  20
+
+- type: entity
+  id: BaseStationEventShortDelay
   parent: BaseGameRule
-  noSpawn: true
+  abstract: true
+  components:
+    - type: GameRule
+      delay:
+        min:  10
+        max:  20
+
+- type: entity
+  id: BaseStationEventLongDelay
+  parent: BaseGameRule
+  abstract: true
+  components:
+    - type: GameRule
+      delay:
+        min:  40
+        max:  60
+
+- type: entity
+  id: AnomalySpawn
+  parent: BaseStationEventShortDelay
   components:
   - type: StationEvent
-    weight: 12 # DeltaV - was 10
-    startDelay: 30
+    startAnnouncementColor: "#18abf5"
+    startAudio:
+      path: /Audio/Announcements/announce.ogg
+    weight: 12 # DeltaV - was 8
     duration: 35
   - type: AnomalySpawnRule
 
 - type: entity
   id: BluespaceArtifact
-  parent: BaseGameRule
-  noSpawn: true
+  parent: BaseStationEventShortDelay
   components:
+  - type: GameRule
+    delay:
+      min:  30
+      max:  30
   - type: StationEvent
-    weight: 5
-    startDelay: 30
+    startAnnouncementColor: "#18abf5"
+    startAudio:
+      path: /Audio/Announcements/announce.ogg
+    weight: 8
     duration: 35
   - type: BluespaceArtifactRule
 
 - type: entity
   id: BluespaceLocker
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 1
@@ -35,7 +70,6 @@
 - type: entity
   id: BreakerFlip
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 10
@@ -46,7 +80,6 @@
 - type: entity
   id: BureaucraticError
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-bureaucratic-error-announcement
@@ -58,7 +91,6 @@
 - type: entity
   id: ClericalError
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-clerical-error-announcement
@@ -70,7 +102,6 @@
 - type: entity
   parent: BaseGameRule
   id: ClosetSkeleton
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 8 # DeltaV - was 10
@@ -82,7 +113,6 @@
 - type: entity
   parent: BaseGameRule
   id: DragonSpawn
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 1 # DeltaV - was 6.5
@@ -112,20 +142,56 @@
 - type: entity
   parent: BaseGameRule
   id: NinjaSpawn
-  noSpawn: true
   components:
   - type: StationEvent
-    weight: 5 # DeltaV - was 10
-    duration: 1
+    weight: 5 # DeltaV - was 6
+    duration: null
     earliestStart: 30
-    reoccurrenceDelay: 60
-    minimumPlayers: 40
-  - type: NinjaSpawnRule
+    reoccurrenceDelay: 60 # DeltaV - was 20
+    minimumPlayers: 40 # DeltaV - was 30
+  - type: SpaceSpawnRule
+  - type: AntagLoadProfileRule
+  - type: AntagObjectives
+    objectives:
+    - StealResearchObjective
+    - DoorjackObjective
+    - SpiderChargeObjective
+    - TerrorObjective
+    - MassArrestObjective
+    - NinjaSurviveObjective
+  - type: AntagSelection
+    agentName: ninja-round-end-agent-name
+    definitions:
+    - spawnerPrototype: SpawnPointGhostSpaceNinja
+      min: 1
+      max: 1
+      pickPlayer: false
+      startingGear: SpaceNinjaGear
+      roleLoadout:
+      - RoleSurvivalEVA
+      briefing:
+        text: ninja-role-greeting
+        color: Green
+        sound: /Audio/Misc/ninja_greeting.ogg
+      components:
+      - type: SpaceNinja
+      - type: NpcFactionMember
+        factions:
+        - Syndicate
+      - type: AutoImplant
+        implants:
+        - DeathAcidifierImplant
+      - type: RandomMetadata
+        nameSegments:
+        - names_ninja_title
+        - names_ninja
+      mindComponents:
+      - type: NinjaRole
+        prototype: SpaceNinja
 
 - type: entity
   parent: BaseGameRule
   id: RevenantSpawn
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 1 # DeltaV - was 7.5, lowered because of GlimmerRevenantSpawn event
@@ -135,49 +201,43 @@
   - type: RandomSpawnRule
     prototype: MobRevenant
 
-- type: entity
-  id: FalseAlarm
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: StationEvent
-    weight: 15
-    duration: 1
-  - type: FalseAlarmRule
+
+# disabled until event is rewritten to be more interesting
+#- type: entity
+#  id: FalseAlarm
+#  parent: BaseGameRule
+#  components:
+#  - type: StationEvent
+#    weight: 15
+#    duration: 1
+#  - type: FalseAlarmRule
 
 - type: entity
   id: GasLeak
-  parent: BaseGameRule
-  noSpawn: true
+  parent: BaseStationEventShortDelay
   components:
   - type: StationEvent
     startAnnouncement: station-event-gas-leak-start-announcement
     startAudio:
       path: /Audio/Announcements/gas_leak.ogg # DeltaV - custom announcer
     endAnnouncement: station-event-gas-leak-end-announcement
-    earliestStart: 10
-    minimumPlayers: 5
-    weight: 10
-    startDelay: 20
+    weight: 10 # DeltaV - was 8
   - type: GasLeakRule
 
 - type: entity
   id: KudzuGrowth
-  parent: BaseGameRule
-  noSpawn: true
+  parent: BaseStationEventLongDelay
   components:
   - type: StationEvent
     earliestStart: 15
     minimumPlayers: 10 # DeltaV - Was 15
-    weight: 5
-    startDelay: 50
+    weight: 5 # DeltaV - was 7
     duration: 240
   - type: KudzuGrowthRule
 
 - type: entity
   id: MeteorSwarm
-  parent: BaseGameRule
-  noSpawn: true
+  parent: BaseStationEventLongDelay
   components:
   - type: StationEvent
     earliestStart: 30
@@ -190,22 +250,18 @@
       params:
         volume: -4
     duration: null #ending is handled by MeteorSwarmRule
-    startDelay: 30
   - type: MeteorSwarmRule
 
 - type: entity
   id: MouseMigration
-  parent: BaseGameRule
-  noSpawn: true
+  parent: BaseStationEventShortDelay
   components:
   - type: StationEvent
     startAnnouncement: station-event-vent-creatures-start-announcement
     startAudio:
       path: /Audio/Announcements/attention.ogg
-    startDelay: 10
-    earliestStart: 20 #DeltaV - was 30
-    minimumPlayers: 25 #DeltaV - was 35
-    weight: 5
+    earliestStart: 20 #DeltaV - was 15
+    weight: 5 # DeltaV - was 6
     duration: 50
   - type: VentCrittersRule
     entries:
@@ -248,15 +304,13 @@
 
 - type: entity
   id: CockroachMigration
-  parent: BaseGameRule
-  noSpawn: true
+  parent: BaseStationEventShortDelay
   components:
   - type: StationEvent
     startAnnouncement: station-event-vent-creatures-start-announcement
     startAudio:
       path: /Audio/Announcements/attention.ogg
-    startDelay: 10
-    weight: 5
+    weight: 5 # DeltaV - was 6
     duration: 50
   - type: VentCrittersRule
     entries:
@@ -267,8 +321,7 @@
 
 - type: entity
   id: PowerGridCheck
-  parent: BaseGameRule
-  noSpawn: true
+  parent: BaseStationEventShortDelay
   components:
   - type: StationEvent
     weight: 10
@@ -278,7 +331,6 @@
       path: /Audio/Announcements/power_off.ogg
       params:
        volume: -4
-    startDelay: 24
     duration: 60
     maxDuration: 120
   - type: PowerGridCheckRule
@@ -286,7 +338,6 @@
 - type: entity
   parent: BaseGameRule
   id: SolarFlare
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 10
@@ -314,8 +365,7 @@
 
 - type: entity
   id: VentClog
-  parent: BaseGameRule
-  noSpawn: true
+  parent: BaseStationEventLongDelay
   components:
   - type: StationEvent
     startAnnouncement: station-event-vent-clog-start-announcement
@@ -324,43 +374,17 @@
     earliestStart: 20 # DeltaV - was 15
     minimumPlayers: 15
     weight: 7.5 # DeltaV - was 5
-    startDelay: 50
     duration: 60
   - type: VentClogRule
 
-- type: entity
-  id: VentCritters
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: StationEvent
-    startAnnouncement: station-event-vent-creatures-start-announcement
-    startAudio:
-      path: /Audio/Announcements/attention.ogg
-    startDelay: 10
-    earliestStart: 15
-    minimumPlayers: 15
-    weight: 5
-    duration: 60
-  - type: VentCrittersRule
-    entries:
-    - id: MobMouse
-      prob: 0.02
-    - id: MobMouse1
-      prob: 0.02
-    - id: MobMouse2
-      prob: 0.02
-
 - type: entity
   id: SlimesSpawn
-  parent: BaseGameRule
-  noSpawn: true
+  parent: BaseStationEventShortDelay
   components:
   - type: StationEvent
     startAnnouncement: station-event-vent-creatures-start-announcement
     startAudio:
       path: /Audio/Announcements/attention.ogg
-    startDelay: 10
     earliestStart: 20
     minimumPlayers: 15
     weight: 5
@@ -376,14 +400,12 @@
 
 - type: entity
   id: SpiderSpawn
-  parent: BaseGameRule
-  noSpawn: true
+  parent: BaseStationEventShortDelay
   components:
   - type: StationEvent
     startAnnouncement: station-event-vent-creatures-start-announcement
     startAudio:
       path: /Audio/Announcements/attention.ogg
-    startDelay: 10
     earliestStart: 20
     minimumPlayers: 15
     weight: 5
@@ -395,17 +417,15 @@
 
 - type: entity
   id: SpiderClownSpawn
-  parent: BaseGameRule
-  noSpawn: true
+  parent: BaseStationEventShortDelay
   components:
   - type: StationEvent
     startAnnouncement: station-event-vent-creatures-start-announcement
     startAudio:
       path: /Audio/Announcements/attention.ogg
-    startDelay: 10
     earliestStart: 45 # DeltaV - was 20
-    minimumPlayers: 30 # DeltaV - was 15
-    weight: 1
+    minimumPlayers: 30 # DeltaV - was 20
+    weight: 1 # DeltaV - was 1.5
     duration: 60
   - type: VentCrittersRule
     entries:
@@ -415,7 +435,6 @@
 - type: entity
   id: ZombieOutbreak
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: StationEvent
     earliestStart: 90 # DeltaV - was 50
@@ -448,7 +467,6 @@
         prototype: InitialInfected
 
 - type: entity
-  noSpawn: true
   parent: BaseNukeopsRule
   id: LoneOpsSpawn
   components:
@@ -484,7 +502,6 @@
         prototype: Nukeops
 
 - type: entity
-  noSpawn: true
   parent: BaseTraitorRule
   id: SleeperAgents
   components:
@@ -497,6 +514,7 @@
     startAudio:
       path: /Audio/Announcements/intercept.ogg
     duration: null # the rule has to last the whole round not 1 second
+    occursDuringRoundEnd: false
   - type: AlertLevelInterceptionRule
   - type: AntagSelection
     definitions:
@@ -515,7 +533,6 @@
 - type: entity
   id: MassHallucinations
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 10
@@ -531,7 +548,6 @@
 #- type: entity # DeltaV - Why does this exist??
 #  id: ImmovableRodSpawn
 #  parent: BaseGameRule
-#  noSpawn: true
 #  components:
 #  - type: StationEvent
 #    startAnnouncement: station-event-immovable-rod-start-announcement
@@ -569,7 +585,6 @@
 #      orGroup: rodProto
 
 - type: entity
-  noSpawn: true
   parent: BaseGameRule
   id: IonStorm
   components:
@@ -583,10 +598,10 @@
 #- type: entity
 #  id: MimicVendorRule
 #  parent: BaseGameRule
-#  noSpawn: true
 #  components:
 #    - type: StationEvent
 #      earliestStart: 0
 #      minimumPlayers: 20
+#      maxOccurrences: 1 # this event has diminishing returns on interesting-ness, so we cap it
 #      weight: 5
 #    - type: MobReplacementRule
diff --git a/Resources/Prototypes/GameRules/midround.yml b/Resources/Prototypes/GameRules/midround.yml
index 606f5fda781..7446995f262 100644
--- a/Resources/Prototypes/GameRules/midround.yml
+++ b/Resources/Prototypes/GameRules/midround.yml
@@ -1,23 +1,4 @@
-# doesnt spawn a ninja or anything, just stores configuration for it
-# see NinjaSpawn event for spawning
 - type: entity
-  id: Ninja
-  parent: BaseGameRule
-  components:
-  - type: GenericAntagRule
-    agentName: ninja-round-end-agent-name
-    objectives:
-    - StealResearchObjective
-    - DoorjackObjective
-    - SpiderChargeObjective
-    - TerrorObjective
-    - MassArrestObjective
-    - NinjaSurviveObjective
-  - type: NinjaRule
-    threats: NinjaThreats
-
-- type: entity
-  noSpawn: true
   parent: BaseGameRule
   id: Thief
   components:
@@ -37,10 +18,8 @@
     agentName: thief-round-end-agent-name
     definitions:
     - prefRoles: [ Thief ]
-      maxRange:
-        min: 1
-        max: 3
-      playerRatio: 1
+      max: 3
+      playerRatio: 15
       lateJoinAdditional: true
       allowNonHumans: true
       multiAntagSetting: NotExclusive
diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml
index 082d6a977bf..b88fd169966 100644
--- a/Resources/Prototypes/GameRules/roundstart.yml
+++ b/Resources/Prototypes/GameRules/roundstart.yml
@@ -1,12 +1,10 @@
 - type: entity
   id: BaseGameRule
   abstract: true
-  noSpawn: true
   components:
   - type: GameRule
 
 - type: entity
-  noSpawn: true
   parent: BaseGameRule
   id: RespawnDeadRule
   components:
@@ -17,7 +15,6 @@
     deleteBody: false
 
 - type: entity
-  noSpawn: true
   parent: BaseGameRule
   id: SubGamemodesRule
   components:
@@ -29,7 +26,6 @@
 - type: entity
   id: DeathMatch31
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: DeathMatchRule
     rewardSpawns:
@@ -59,7 +55,6 @@
 - type: entity
   id: InactivityTimeRestart
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: InactivityRule
     inactivityMaxTime: 600
@@ -68,7 +63,6 @@
 - type: entity
   id: MaxTimeRestart
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: MaxTimeRestartRule
     roundMaxTime: 300
@@ -79,7 +73,7 @@
   parent: BaseGameRule
   id: BaseNukeopsRule
   components:
-  - type: RandomMetadata #this generates the random operation name cuz it's cool.
+  - type: RandomMetadata #this generates the random operation name cuz it's cool. 
     nameSegments:
     - operationPrefix
     - operationSuffix
@@ -87,16 +81,21 @@
   - type: RuleGrids
   - type: AntagSelection
   - type: AntagLoadProfileRule
+    speciesOverride: Human
+    speciesOverrideBlacklist:
+    #Species that do not work with nukies should be included in this list.
+    #Once the issues are fixed the species should be removed from this list to be enabled.
+    #Balance concerns are not a valid reason to disable a species, except for high-impact Nukie-specific exploits.
+    #- Vox
 
 - type: entity
-  noSpawn: true
   parent: BaseNukeopsRule
   id: Nukeops
   components:
   - type: GameRule
     minPlayers: 20
   - type: LoadMapRule
-    gameMap: NukieOutpost
+    mapPath: /Maps/Nonstations/nukieplanet.yml
   - type: AntagSelection
     selectionTime: PrePlayerSpawn
     definitions:
@@ -104,6 +103,8 @@
       fallbackRoles: [ Nukeops, NukeopsMedic ]
       spawnerPrototype: SpawnPointNukeopsCommander
       startingGear: SyndicateCommanderGearFull
+      roleLoadout:
+      - RoleSurvivalSyndicate
       components:
       - type: NukeOperative
       - type: RandomMetadata
@@ -120,6 +121,8 @@
       fallbackRoles: [ Nukeops, NukeopsCommander ]
       spawnerPrototype: SpawnPointNukeopsMedic
       startingGear: SyndicateOperativeMedicFull
+      roleLoadout:
+      - RoleSurvivalSyndicate
       components:
       - type: NukeOperative
       - type: RandomMetadata
@@ -138,6 +141,8 @@
       max: 3
       playerRatio: 10
       startingGear: SyndicateOperativeGearFull
+      roleLoadout:
+      - RoleSurvivalSyndicate
       components:
       - type: NukeOperative
       - type: RandomMetadata
@@ -167,7 +172,6 @@
     agentName: traitor-round-end-agent-name
 
 - type: entity
-  noSpawn: true
   parent: BaseTraitorRule
   id: Traitor
   components:
@@ -192,7 +196,6 @@
 - type: entity
   id: Revolutionary
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: GameRule
     minPlayers: 15
@@ -217,21 +220,18 @@
 - type: entity
   id: Sandbox
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: SandboxRule
 
 - type: entity
   id: Secret
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: SecretRule
 
 - type: entity
   id: Zombie
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: GameRule
     minPlayers: 20
@@ -265,14 +265,12 @@
 - type: entity
   id: BasicStationEventScheduler
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: BasicStationEventScheduler
 
 - type: entity
   id: RampingStationEventScheduler
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: RampingStationEventScheduler
 
@@ -280,7 +278,6 @@
 - type: entity
   id: BasicRoundstartVariation
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: RoundstartStationVariationRule
     rules:
diff --git a/Resources/Prototypes/GameRules/variation.yml b/Resources/Prototypes/GameRules/variation.yml
index 2884d5f9d6f..093a832d72f 100644
--- a/Resources/Prototypes/GameRules/variation.yml
+++ b/Resources/Prototypes/GameRules/variation.yml
@@ -4,7 +4,6 @@
   id: BaseVariationPass
   parent: BaseGameRule
   abstract: true
-  noSpawn: true
   components:
   - type: StationVariationPassRule
 
@@ -13,14 +12,12 @@
 - type: entity
   id: BasicPoweredLightVariationPass
   parent: BaseVariationPass
-  noSpawn: true
   components:
   - type: PoweredLightVariationPass
 
 - type: entity
   id: SolidWallRustingVariationPass
   parent: BaseVariationPass
-  noSpawn: true
   components:
   - type: WallReplaceVariationPass
   - type: EntityReplaceVariationPass
@@ -32,7 +29,6 @@
 - type: entity
   id: ReinforcedWallRustingVariationPass
   parent: BaseVariationPass
-  noSpawn: true
   components:
   - type: ReinforcedWallReplaceVariationPass
   - type: EntityReplaceVariationPass
@@ -44,7 +40,6 @@
 - type: entity
   id: BasicTrashVariationPass
   parent: BaseVariationPass
-  noSpawn: true
   components:
   - type: EntitySpawnVariationPass
     tilesPerEntityAverage: 35
@@ -105,7 +100,6 @@
 - type: entity
   id: BasicPuddleMessVariationPass
   parent: BaseVariationPass
-  noSpawn: true
   components:
   - type: PuddleMessVariationPass
     randomPuddleSolutionFill: RandomFillTrashPuddle
@@ -113,7 +107,6 @@
 - type: entity
   id: BloodbathPuddleMessVariationPass
   parent: BaseVariationPass
-  noSpawn: true
   components:
   - type: PuddleMessVariationPass
     tilesPerSpillAverage: 150
@@ -123,7 +116,6 @@
 - type: entity
   id: CutWireVariationPass
   parent: BaseVariationPass
-  noSpawn: true
   components:
   - type: CutWireVariationPass
     wireCutChance: 0.01
diff --git a/Resources/Prototypes/Guidebook/shiftandcrew.yml b/Resources/Prototypes/Guidebook/shiftandcrew.yml
index 10091401aa5..86736926f91 100644
--- a/Resources/Prototypes/Guidebook/shiftandcrew.yml
+++ b/Resources/Prototypes/Guidebook/shiftandcrew.yml
@@ -39,9 +39,9 @@
   name: guide-entry-chef
   text: "/ServerInfo/Guidebook/Service/Chef.xml"
   children:
-  - Food Recipes
+  - FoodRecipes
 
 - type: guideEntry
-  id: Food Recipes
+  id: FoodRecipes
   name: guide-entry-foodrecipes
   text: "/ServerInfo/Guidebook/Service/FoodRecipes.xml"
diff --git a/Resources/Prototypes/Guidebook/species.yml b/Resources/Prototypes/Guidebook/species.yml
index 8562feb3f41..6f120cc2325 100644
--- a/Resources/Prototypes/Guidebook/species.yml
+++ b/Resources/Prototypes/Guidebook/species.yml
@@ -10,6 +10,7 @@
     - Moth
     - Reptilian
     - SlimePerson
+    - Vox
     # DeltaV additions
     - Vulpkanin
     - Harpy
@@ -50,3 +51,8 @@
   id: SlimePerson
   name: species-name-slime
   text: "/ServerInfo/Guidebook/Mobs/SlimePerson.xml"
+
+- type: guideEntry
+  id: Vox
+  name: species-name-vox
+  text: "/ServerInfo/Guidebook/Mobs/Vox.xml"
diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml
index 8981f3dfd4d..590790b5433 100644
--- a/Resources/Prototypes/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Hydroponics/seeds.yml
@@ -341,6 +341,8 @@
   packetPrototype: SugarcaneSeeds
   productPrototypes:
     - Sugarcane
+  mutationPrototypes:
+    - papercane
   harvestRepeat: Repeat
   lifespan: 60
   maturation: 6
@@ -355,6 +357,24 @@
       Max: 5
       PotencyDivisor: 5
 
+- type: seed
+  id: papercane
+  name: seeds-papercane-name
+  noun: seeds-noun-seeds
+  displayName: seeds-papercane-display-name
+  plantRsi: Objects/Specific/Hydroponics/papercane.rsi
+  packetPrototype: PapercaneSeeds
+  productPrototypes:
+    - Papercane
+  harvestRepeat: Repeat
+  lifespan: 60
+  maturation: 6
+  production: 6
+  yield: 3
+  potency: 10
+  growthStages: 3
+  idealHeat: 298
+
 - type: seed
   id: towercap
   name: seeds-towercap-name
@@ -625,6 +645,8 @@
   packetPrototype: AppleSeeds
   productPrototypes:
     - FoodApple
+  mutationPrototypes:
+    - goldenApple
   harvestRepeat: Repeat
   lifespan: 55
   maturation: 6
@@ -642,6 +664,38 @@
       Max: 4
       PotencyDivisor: 25
 
+- type: seed
+  id: goldenApple
+  name: seeds-goldenapple-name
+  noun: seeds-noun-seeds
+  displayName: seeds-goldenapple-display-name
+  plantRsi: Objects/Specific/Hydroponics/golden_apple.rsi
+  packetPrototype: GoldenAppleSeeds
+  productPrototypes:
+    - FoodGoldenApple
+  harvestRepeat: Repeat
+  lifespan: 55
+  maturation: 6
+  production: 6
+  yield: 3
+  potency: 10
+  idealLight: 6
+  waterConsumption: 0.75
+  nutrientConsumption: 0.75
+  chemicals:
+    Nutriment:
+      Min: 1
+      Max: 10
+      PotencyDivisor: 10
+    Vitamin:
+      Min: 1
+      Max: 4
+      PotencyDivisor: 25
+    DoctorsDelight:
+      Min: 3
+      Max: 13
+      PotencyDivisor: 10 
+
 - type: seed
   id: corn
   name: seeds-corn-name
@@ -1194,7 +1248,7 @@
   productPrototypes:
     - FoodGalaxythistle
   mutationPrototypes:
-    - CrystalThistle #Delta-V
+    - CrystalThistle #Delta-V, replaces glasstle
   lifespan: 25
   maturation: 10
   production: 3
@@ -1208,6 +1262,28 @@
       Max: 25
       PotencyDivisor: 4
 
+- type: seed
+  id: glasstle
+  name: seeds-glasstle-name
+  noun: seeds-noun-seeds
+  displayName: seeds-glasstle-display-name
+  plantRsi: Objects/Specific/Hydroponics/glasstle.rsi
+  packetPrototype: GlasstleSeeds
+  productPrototypes:
+    - FoodGlasstle
+  lifespan: 25
+  maturation: 10
+  production: 3
+  yield: 3
+  potency: 10
+  growthStages: 3
+  waterConsumption: 0.5
+  chemicals:
+    Razorium:
+      Min: 1
+      Max: 25
+      PotencyDivisor: 4
+
 - type: seed
   id: flyAmanita
   name: seeds-flyamanita-name
diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml
index f2922d8cfd5..fb823fdcb9f 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml
@@ -1,76 +1,44 @@
 # Head
 - type: loadout
-  id: CargoTechnicianHead
-  equipment: CargoTechnicianHead
-
-- type: startingGear
   id: CargoTechnicianHead
   equipment:
     head: ClothingHeadHatCargosoft
 
 # Jumpsuit
 - type: loadout
-  id: CargoTechnicianJumpsuit
-  equipment: CargoTechnicianJumpsuit
-
-- type: startingGear
   id: CargoTechnicianJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitCargo
 
 - type: loadout
-  id: CargoTechnicianJumpskirt
-  equipment: CargoTechnicianJumpskirt
-
-- type: startingGear
   id: CargoTechnicianJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtCargo
 
 # Back
 - type: loadout
-  id: CargoTechnicianBackpack
-  equipment: CargoTechnicianBackpack
-
-- type: startingGear
   id: CargoTechnicianBackpack
   equipment:
-    back: ClothingBackpackCargoFilled
+    back: ClothingBackpackCargo
 
 - type: loadout
-  id: CargoTechnicianSatchel
-  equipment: CargoTechnicianSatchel
-
-- type: startingGear
   id: CargoTechnicianSatchel
   equipment:
-    back: ClothingBackpackSatchelCargoFilled
+    back: ClothingBackpackSatchelCargo
 
 - type: loadout
-  id: CargoTechnicianDuffel
-  equipment: CargoTechnicianDuffel
-
-- type: startingGear
   id: CargoTechnicianDuffel
   equipment:
-    back: ClothingBackpackDuffelCargoFilled
+    back: ClothingBackpackDuffelCargo
 
 # OuterClothing
 - type: loadout
-  id: CargoTechnicianWintercoat
-  equipment: CargoTechnicianWintercoat
-
-- type: startingGear
   id: CargoTechnicianWintercoat
   equipment:
     outerClothing: ClothingOuterWinterCargo
 
 # Shoes
 - type: loadout
-  id: CargoWinterBoots
-  equipment: CargoWinterBoots
-
-- type: startingGear
   id: CargoWinterBoots
   equipment:
-    shoes: ClothingShoesBootsWinterCargo
\ No newline at end of file
+    shoes: ClothingShoesBootsWinterCargo
diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml
index 44b5bacfab9..febb4e513c5 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml
@@ -1,140 +1,64 @@
 # Jumpsuit
 - type: loadout
-  id: QuartermasterJumpsuit
-  equipment: QuartermasterJumpsuit
-
-- type: startingGear
   id: QuartermasterJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitQM
 
 - type: loadout
-  id: QuartermasterJumpskirt
-  equipment: QuartermasterJumpskirt
-
-- type: startingGear
   id: QuartermasterJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtQM
 
 - type: loadout
-  id: QuartermasterTurtleneck
-  equipment: QuartermasterTurtleneck
-
-- type: startingGear
   id: QuartermasterTurtleneck
   equipment:
     jumpsuit: ClothingUniformJumpsuitQMTurtleneck
 
 - type: loadout
-  id: QuartermasterTurtleneckSkirt
-  equipment: QuartermasterTurtleneckSkirt
-
-- type: startingGear
   id: QuartermasterTurtleneckSkirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtQMTurtleneck
 
 - type: loadout
-  id: QuartermasterFormalSuit
-  equipment: QuartermasterFormalSuit
-
-- type: startingGear
   id: QuartermasterFormalSuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitQMFormal
 
 # Head
 - type: loadout
-  id: QuartermasterHead
-  equipment: QuartermasterHead
-
-- type: startingGear
   id: QuartermasterHead
   equipment:
     head: ClothingHeadHatQMsoft
 
 - type: loadout
-  id: QuartermasterBeret
-  equipment: QuartermasterBeret
-
-- type: startingGear
   id: QuartermasterBeret
   equipment:
     head: ClothingHeadHatBeretQM
 
-- type: startingGear # DeltaV
+- type: loadout # DeltaV
   id: LogiOfficerBeret
   equipment:
     head: ClothingHeadHatBeretLogi
 
-- type: loadout # DeltaV
-  id: LogiOfficerBeret
-  equipment: LogiOfficerBeret
-
 # Neck
 - type: loadout
-  id: QuartermasterCloak
-  equipment: QuartermasterCloak
-
-- type: startingGear
   id: QuartermasterCloak
   equipment:
     neck: ClothingNeckCloakQm
 
 - type: loadout
-  id: QuartermasterMantle
-  equipment: QuartermasterMantle
-
-- type: startingGear
   id: QuartermasterMantle
   equipment:
     neck: ClothingNeckMantleQM
 
-# Back
-- type: loadout
-  id: QuartermasterBackpack
-  equipment: QuartermasterBackpack
-
-- type: startingGear
-  id: QuartermasterBackpack
-  equipment:
-    back: ClothingBackpackQuartermasterFilled
-
-- type: loadout
-  id: QuartermasterSatchel
-  equipment: QuartermasterSatchel
-
-- type: startingGear
-  id: QuartermasterSatchel
-  equipment:
-    back: ClothingBackpackSatchelQuartermasterFilled
-
-- type: loadout
-  id: QuartermasterDuffel
-  equipment: QuartermasterDuffel
-
-- type: startingGear
-  id: QuartermasterDuffel
-  equipment:
-    back: ClothingBackpackDuffelQuartermasterFilled
-
 # OuterClothing
 - type: loadout
-  id: QuartermasterWintercoat
-  equipment: QuartermasterWintercoat
-
-- type: startingGear
   id: QuartermasterWintercoat
   equipment:
     outerClothing: ClothingOuterWinterQM
 
 # Shoes - DeltaV
 - type: loadout
-  id: QuartermasterWinterBoots
-  equipment: QuartermasterWinterBoots
-
-- type: startingGear
   id: QuartermasterWinterBoots
   equipment:
     shoes: ClothingShoesBootsWinterLogisticsOfficer
diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml
index c352ad60901..fca3d4eb5fc 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml
@@ -1,66 +1,38 @@
 # Back
 - type: loadout
-  id: SalvageSpecialistBackpack
-  equipment: SalvageSpecialistBackpack
-
-- type: startingGear
   id: SalvageSpecialistBackpack
   equipment:
-    back: ClothingBackpackSalvageFilled
+    back: ClothingBackpackSalvage
 
 - type: loadout
-  id: SalvageSpecialistSatchel
-  equipment: SalvageSpecialistSatchel
-
-- type: startingGear
   id: SalvageSpecialistSatchel
   equipment:
-    back: ClothingBackpackSatchelSalvageFilled
+    back: ClothingBackpackSatchelSalvage
 
 - type: loadout
-  id: SalvageSpecialistDuffel
-  equipment: SalvageSpecialistDuffel
-
-- type: startingGear
   id: SalvageSpecialistDuffel
   equipment:
-    back: ClothingBackpackDuffelSalvageFilled
+    back: ClothingBackpackDuffelSalvage
 
 # OuterClothing
 - type: loadout
-  id: SalvageSpecialistWintercoat
-  equipment: SalvageSpecialistWintercoat
-
-- type: startingGear
   id: SalvageSpecialistWintercoat
   equipment:
     outerClothing: ClothingOuterWinterMiner
 
 # Shoes
 - type: loadout
-  id: SalvageBoots
-  equipment: SalvageBoots
-
-- type: startingGear
   id: SalvageBoots
   equipment:
     shoes: ClothingShoesBootsSalvage
 
 - type: loadout # DeltaV
-  id: SalvageWinterBoots
-  equipment: SalvageWinterBoots
-
-- type: startingGear # DeltaV
   id: SalvageWinterBoots
   equipment:
     shoes: ClothingShoesBootsWinterMiner
 
 # Neck - DeltaV
 - type: loadout # DeltaV
-  id: SalvageCloak
-  equipment: SalvageCloak
-
-- type: startingGear # DeltaV
   id: SalvageCloak
   equipment:
     neck: ClothingNeckSalvager
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml
index 0ae19394ae3..3363cdc200b 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml
@@ -1,84 +1,48 @@
 # Head
 - type: loadout
-  id: BartenderHead
-  equipment: BartenderHead
-
-- type: startingGear
   id: BartenderHead
   equipment:
     head: ClothingHeadHatTophat
 
 - type: loadout
-  id: BartenderBowler
-  equipment: BartenderBowler
-
-- type: startingGear
   id: BartenderBowler
   equipment:
     head: ClothingHeadHatBowlerHat
 
 # Jumpsuit
 - type: loadout
-  id: BartenderJumpsuit
-  equipment: BartenderJumpsuit
-
-- type: startingGear
   id: BartenderJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitBartender
 
 - type: loadout
-  id: BartenderJumpskirt
-  equipment: BartenderJumpskirt
-
-- type: startingGear
   id: BartenderJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtBartender
 
 - type: loadout
-  id: BartenderJumpsuitPurple
-  equipment: BartenderJumpsuitPurple
-
-- type: startingGear
   id: BartenderJumpsuitPurple
   equipment:
     jumpsuit: ClothingUniformJumpsuitBartenderPurple
 
 # Outer clothing
 - type: loadout
-  id: BartenderApron
-  equipment: BartenderApron
-
-- type: startingGear
   id: BartenderApron
   equipment:
     outerClothing: ClothingOuterApronBar
 
 - type: loadout
-  id: BartenderVest
-  equipment: BartenderVest
-
-- type: startingGear
   id: BartenderVest
   equipment:
     outerClothing: ClothingOuterVest
 
 - type: loadout
-  id: BartenderWintercoat
-  equipment: BartenderWintercoat
-
-- type: startingGear
   id: BartenderWintercoat
   equipment:
     outerClothing: ClothingOuterWinterBar
 
 # Glasses - DeltaV
 - type: loadout
-  id: BartenderGlasses
-  equipment: BartenderGlasses
-
-- type: startingGear
   id: BartenderGlasses
   equipment:
     eyes: ClothingEyesHudBeer
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml
index 0f57caa8f65..95838d72415 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml
@@ -1,93 +1,53 @@
 # Head
 - type: loadout
-  id: BotanistHead
-  equipment: BotanistHead
-
-- type: startingGear
   id: BotanistHead
   equipment:
     head: ClothingHeadHatTrucker
 
 - type: loadout
-  id: BotanistBandana
-  equipment: BotanistBandana
-
-- type: startingGear
   id: BotanistBandana
   equipment:
     head: ClothingHeadBandBotany
 
 # Jumpsuit
 - type: loadout
-  id: BotanistJumpsuit
-  equipment: BotanistJumpsuit
-
-- type: startingGear
   id: BotanistJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitHydroponics
 
 - type: loadout
-  id: BotanistJumpskirt
-  equipment: BotanistJumpskirt
-
-- type: startingGear
   id: BotanistJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtHydroponics
 
 - type: loadout
-  id: BotanistOveralls
-  equipment: BotanistOveralls
-
-- type: startingGear
   id: BotanistOveralls
   equipment:
     jumpsuit: ClothingUniformOveralls
 
 # Back
 - type: loadout
-  id: BotanistBackpack
-  equipment: BotanistBackpack
-
-- type: startingGear
   id: BotanistBackpack
   equipment:
-    back: ClothingBackpackHydroponicsFilled
+    back: ClothingBackpackHydroponics
 
 - type: loadout
-  id: BotanistSatchel
-  equipment: BotanistSatchel
-
-- type: startingGear
   id: BotanistSatchel
   equipment:
-    back: ClothingBackpackSatchelHydroponicsFilled
+    back: ClothingBackpackSatchelHydroponics
 
 - type: loadout
-  id: BotanistDuffel
-  equipment: BotanistDuffel
-
-- type: startingGear
   id: BotanistDuffel
   equipment:
-    back: ClothingBackpackDuffelHydroponicsFilled
+    back: ClothingBackpackDuffelHydroponics
 
 # Outer clothing
 - type: loadout
-  id: BotanistApron
-  equipment: BotanistApron
-
-- type: startingGear
   id: BotanistApron
   equipment:
     outerClothing: ClothingOuterApronBotanist
 
 - type: loadout
-  id: BotanistWintercoat
-  equipment: BotanistWintercoat
-
-- type: startingGear
   id: BotanistWintercoat
   equipment:
     outerClothing: ClothingOuterWinterHydro
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml
index 623e18a01d0..27e41e6461c 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml
@@ -1,167 +1,79 @@
 # Head
 - type: loadout
-  id: ChaplainHead
-  equipment: ChaplainHead
-
-- type: startingGear
   id: ChaplainHead
   equipment:
     head: ClothingHeadHatFez
 
 - type: loadout
-  id: ChaplainNunHood
-  equipment: ChaplainNunHood
-
-- type: startingGear
   id: ChaplainNunHood
   equipment:
     head: ClothingHeadHatHoodNunHood
 
 - type: loadout
-  id: ChaplainPlagueHat
-  equipment: ChaplainPlagueHat
-
-- type: startingGear
   id: ChaplainPlagueHat
   equipment:
     head: ClothingHeadHatPlaguedoctor
 
 - type: loadout
-  id: ChaplainWitchHat
-  equipment: ChaplainWitchHat
-
-- type: startingGear
   id: ChaplainWitchHat
   equipment:
     head: ClothingHeadHatWitch
 
 - type: loadout
-  id: ChaplainWitchHatAlt
-  equipment: ChaplainWitchHatAlt
-
-- type: startingGear
   id: ChaplainWitchHatAlt
   equipment:
     head: ClothingHeadHatWitch1
 
 # Mask
 - type: loadout
-  id: ChaplainMask
-  equipment: ChaplainMask
-
-- type: startingGear
   id: ChaplainMask
   equipment:
     mask: ClothingMaskPlague
 
 # Jumpsuit
 - type: loadout
-  id: ChaplainJumpsuit
-  equipment: ChaplainJumpsuit
-
-- type: startingGear
   id: ChaplainJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitChaplain
 
 - type: loadout
-  id: ChaplainJumpskirt
-  equipment: ChaplainJumpskirt
-
-- type: startingGear
   id: ChaplainJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtChaplain
 
 - type: loadout
-  id: ChaplainRobesDark
-  equipment: ChaplainRobesDark
-
-- type: startingGear
   id: ChaplainRobesDark
   equipment:
     jumpsuit: ClothingUniformJumpsuitMonasticRobeDark
 
 - type: loadout
-  id: ChaplainRobesLight
-  equipment: ChaplainRobesLight
-
-- type: startingGear
   id: ChaplainRobesLight
   equipment:
     jumpsuit: ClothingUniformJumpsuitMonasticRobeLight
 
-# Back
-- type: loadout
-  id: ChaplainBackpack
-  equipment: ChaplainBackpack
-
-- type: startingGear
-  id: ChaplainBackpack
-  equipment:
-    back: ClothingBackpackChaplainFilled
-
-- type: loadout
-  id: ChaplainSatchel
-  equipment: ChaplainSatchel
-
-- type: startingGear
-  id: ChaplainSatchel
-  equipment:
-    back: ClothingBackpackSatchelChaplainFilled
-
-- type: loadout
-  id: ChaplainDuffel
-  equipment: ChaplainDuffel
-
-- type: startingGear
-  id: ChaplainDuffel
-  equipment:
-    back: ClothingBackpackDuffelChaplainFilled
-
 # Neck
 - type: loadout
-  id: ChaplainNeck
-  equipment: ChaplainNeck
-
-- type: startingGear
   id: ChaplainNeck
   equipment:
     neck: ClothingNeckStoleChaplain
 
 # Outer clothing
 - type: loadout
-  id: ChaplainPlagueSuit
-  equipment: ChaplainPlagueSuit
-
-- type: startingGear
   id: ChaplainPlagueSuit
   equipment:
     outerClothing: ClothingOuterPlagueSuit
 
 - type: loadout
-  id: ChaplainNunRobe
-  equipment: ChaplainNunRobe
-
-- type: startingGear
   id: ChaplainNunRobe
   equipment:
     outerClothing: ClothingOuterNunRobe
 
 - type: loadout
-  id: ChaplainBlackHoodie
-  equipment: ChaplainBlackHoodie
-
-- type: startingGear
   id: ChaplainBlackHoodie
   equipment:
     outerClothing: ClothingOuterHoodieBlack
 
 - type: loadout
-  id: ChaplainHoodie
-  equipment: ChaplainHoodie
-
-- type: startingGear
   id: ChaplainHoodie
   equipment:
     outerClothing: ClothingOuterHoodieChaplain
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml
index 82359a9ce5b..5cfa76d4a73 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml
@@ -1,66 +1,38 @@
 # Head
 - type: loadout
-  id: ChefHead
-  equipment: ChefHead
-
-- type: startingGear
   id: ChefHead
   equipment:
     head: ClothingHeadHatChef
 
 # Mask
 - type: loadout
-  id: ChefMask
-  equipment: ChefMask
-
-- type: startingGear
   id: ChefMask
   equipment:
     mask: ClothingMaskItalianMoustache
 
 # Jumpsuit
 - type: loadout
-  id: ChefJumpsuit
-  equipment: ChefJumpsuit
-
-- type: startingGear
   id: ChefJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitChef
 
 - type: loadout
-  id: ChefJumpskirt
-  equipment: ChefJumpskirt
-
-- type: startingGear
   id: ChefJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtChef
 
 # Outer clothing
 - type: loadout
-  id: ChefApron
-  equipment: ChefApron
-
-- type: startingGear
   id: ChefApron
   equipment:
     outerClothing: ClothingOuterApronChef
 
 - type: loadout
-  id: ChefJacket
-  equipment: ChefJacket
-
-- type: startingGear
   id: ChefJacket
   equipment:
     outerClothing: ClothingOuterJacketChef
 
 - type: loadout
-  id: ChefWintercoat
-  equipment: ChefWintercoat
-
-- type: startingGear
   id: ChefWintercoat
   equipment:
     outerClothing: ClothingOuterWinterChef
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml
index 1cce8a61170..161d49c1ed7 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml
@@ -1,94 +1,54 @@
 # Head
 - type: loadout
-  id: JesterHat
-  equipment: JesterHat
-
-- type: startingGear
   id: JesterHat
   equipment:
     head: ClothingHeadHatJesterAlt
 
 # Jumpsuit
 - type: loadout
-  id: ClownSuit
-  equipment: ClownSuit
-
-- type: startingGear
   id: ClownSuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitClown
 
 - type: loadout
-  id: JesterSuit
-  equipment: JesterSuit
-
-- type: startingGear
   id: JesterSuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitJesterAlt
 
 # Back
 - type: loadout
-  id: ClownBackpack
-  equipment: ClownBackpack
-
-- type: startingGear
   id: ClownBackpack
   equipment:
-    back: ClothingBackpackClownFilled
+    back: ClothingBackpackClown
 
 - type: loadout
-  id: ClownSatchel
-  equipment: ClownSatchel
-
-- type: startingGear
   id: ClownSatchel
   equipment:
-    back: ClothingBackpackSatchelClownFilled
+    back: ClothingBackpackSatchelClown
 
 - type: loadout
-  id: ClownDuffel
-  equipment: ClownDuffel
-
-- type: startingGear
   id: ClownDuffel
   equipment:
-    back: ClothingBackpackDuffelClownFilled
+    back: ClothingBackpackDuffelClown
 
 # Shoes
 - type: loadout
-  id: ClownShoes
-  equipment: ClownShoes
-
-- type: startingGear
   id: ClownShoes
   equipment:
     shoes: ClothingShoesClown
 
 - type: loadout
-  id: JesterShoes
-  equipment: JesterShoes
-
-- type: startingGear
   id: JesterShoes
   equipment:
     shoes: ClothingShoesJester
 
 # Outer clothing
 - type: loadout
-  id: ClownRobes
-  equipment: ClownRobes
-
-- type: startingGear
   id: ClownRobes
   equipment:
     outerClothing: ClothingOuterClownPriest
 
 - type: loadout
-  id: ClownWintercoat
-  equipment: ClownWintercoat
-
-- type: startingGear
   id: ClownWintercoat
   equipment:
     outerClothing: ClothingOuterWinterClown
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
index def02c18dd0..615a18c414e 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
@@ -9,57 +9,33 @@
 
 # Head
 - type: loadout
-  id: JanitorHead
-  equipment: JanitorHead
-
-- type: startingGear
   id: JanitorHead
   equipment:
     head: ClothingHeadHatPurplesoft
 
 # Jumpsuit
 - type: loadout
-  id: JanitorJumpsuit
-  equipment: JanitorJumpsuit
-
-- type: startingGear
   id: JanitorJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitJanitor
 
 - type: loadout
-  id: JanitorJumpskirt
-  equipment: JanitorJumpskirt
-
-- type: startingGear
   id: JanitorJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtJanitor
 
 # Gloves
 - type: loadout
-  id: JanitorRubberGloves
-  equipment: JanitorRubberGloves
-
-- type: startingGear
   id: JanitorRubberGloves
   equipment:
     gloves: ClothingHandsGlovesJanitor
 
 - type: loadout
-  id: OrangeGloves
-  equipment: OrangeGloves
-
-- type: startingGear
   id: OrangeGloves
   equipment:
     gloves: ClothingHandsGlovesColorOrange
 
 - type: loadout
-  id: PurpleGloves
-  equipment: PurpleGloves
-
-- type: startingGear
   id: PurpleGloves
   equipment:
     gloves: ClothingHandsGlovesColorPurple
@@ -67,10 +43,6 @@
 
 # Outer clothing
 - type: loadout
-  id: JanitorWintercoat
-  equipment: JanitorWintercoat
-
-- type: startingGear
   id: JanitorWintercoat
   equipment:
     outerClothing: ClothingOuterWinterJani
@@ -78,13 +50,9 @@
 # Misc
 - type: loadout
   id: JanitorGoldenPlunger
-  equipment: JanitorGoldenPlunger
   effects:
   - !type:GroupLoadoutEffect
     proto: SeniorJanitorial
-
-- type: startingGear
-  id: JanitorGoldenPlunger
   storage:
     back:
-    - GoldenPlunger
\ No newline at end of file
+    - GoldenPlunger
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/lawyer.yml
index 5edd3ecf76d..cdc60bb61d1 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/lawyer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/lawyer.yml
@@ -1,128 +1,56 @@
 # Jumpsuit
 - type: loadout
-  id: LawyerJumpsuit
-  equipment: LawyerJumpsuit
-
-- type: startingGear
   id: LawyerJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitLawyerBlack
 
 - type: loadout
-  id: LawyerJumpskirt
-  equipment: LawyerJumpskirt
-
-- type: startingGear
   id: LawyerJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtLawyerBlack
 
 - type: loadout
-  id: LawyerJumpsuitBlue
-  equipment: LawyerJumpsuitBlue
-
-- type: startingGear
   id: LawyerJumpsuitBlue
   equipment:
     jumpsuit: ClothingUniformJumpsuitLawyerBlue
 
 - type: loadout
-  id: LawyerJumpskirtBlue
-  equipment: LawyerJumpskirtBlue
-
-- type: startingGear
   id: LawyerJumpskirtBlue
   equipment:
     jumpsuit: ClothingUniformJumpskirtLawyerBlue
 
 - type: loadout
-  id: LawyerJumpsuitPurple
-  equipment: LawyerJumpsuitPurple
-
-- type: startingGear
   id: LawyerJumpsuitPurple
   equipment:
     jumpsuit: ClothingUniformJumpsuitLawyerPurple
 
 - type: loadout
-  id: LawyerJumpskirtPurple
-  equipment: LawyerJumpskirtPurple
-
-- type: startingGear
   id: LawyerJumpskirtPurple
   equipment:
     jumpsuit: ClothingUniformJumpskirtLawyerPurple
 
 - type: loadout
-  id: LawyerJumpsuitRed
-  equipment: LawyerJumpsuitRed
-
-- type: startingGear
   id: LawyerJumpsuitRed
   equipment:
     jumpsuit: ClothingUniformJumpsuitLawyerRed
 
 - type: loadout
-  id: LawyerJumpskirtRed
-  equipment: LawyerJumpskirtRed
-
-- type: startingGear
   id: LawyerJumpskirtRed
   equipment:
     jumpsuit: ClothingUniformJumpskirtLawyerRed
 
 - type: loadout
-  id: LawyerJumpsuitGood
-  equipment: LawyerJumpsuitGood
-
-- type: startingGear
   id: LawyerJumpsuitGood
   equipment:
     jumpsuit: ClothingUniformJumpsuitLawyerGood
 
 - type: loadout
-  id: LawyerJumpskirtGood
-  equipment: LawyerJumpskirtGood
-
-- type: startingGear
   id: LawyerJumpskirtGood
   equipment:
     jumpsuit: ClothingUniformJumpskirtLawyerGood
 
 # Neck
 - type: loadout
-  id: LawyerNeck
-  equipment: LawyerNeck
-
-- type: startingGear
   id: LawyerNeck
   equipment:
     neck: ClothingNeckLawyerbadge
-
-# Backpack
-- type: loadout
-  id: LawyerBackpack
-  equipment: LawyerBackpack
-
-- type: startingGear
-  id: LawyerBackpack
-  equipment:
-    back: ClothingBackpackLawyerFilled
-
-- type: loadout
-  id: LawyerSatchel
-  equipment: LawyerSatchel
-
-- type: startingGear
-  id: LawyerSatchel
-  equipment:
-    back: ClothingBackpackSatchelLawyerFilled
-
-- type: loadout
-  id: LawyerDuffel
-  equipment: LawyerDuffel
-
-- type: startingGear
-  id: LawyerDuffel
-  equipment:
-    back: ClothingBackpackDuffelLawyerFilled
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml
index 288ded758db..a4b58914dfa 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml
@@ -1,36 +1,20 @@
 # Jumpsuit
 - type: loadout
-  id: LibrarianJumpsuit
-  equipment: LibrarianJumpsuit
-
-- type: startingGear
   id: LibrarianJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitLibrarian
 
 - type: loadout
-  id: LibrarianJumpskirt
-  equipment: LibrarianJumpskirt
-
-- type: startingGear
   id: LibrarianJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtLibrarian
 
 - type: loadout
-  id: CuratorJumpsuit
-  equipment: CuratorJumpsuit
-
-- type: startingGear
   id: CuratorJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitCurator
 
 - type: loadout
-  id: CuratorJumpskirt
-  equipment: CuratorJumpskirt
-
-- type: startingGear
   id: CuratorJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtCurator
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml
index c5d7c92e8d6..0d137b488b8 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml
@@ -1,112 +1,64 @@
 # Head
 - type: loadout
-  id: MimeHead
-  equipment: MimeHead
-
-- type: startingGear
   id: MimeHead
   equipment:
     head: ClothingHeadHatBeret
 
 - type: loadout
-  id: MimeFrenchBeret
-  equipment: MimeFrenchBeret
-
-- type: startingGear
   id: MimeFrenchBeret
   equipment:
     head: ClothingHeadHatBeretFrench
 
 - type: loadout
-  id: MimeCap
-  equipment: MimeCap
-
-- type: startingGear
   id: MimeCap
   equipment:
     head: ClothingHeadHatMimesoft
 
 # Mask
 - type: loadout
-  id: MimeMask
-  equipment: MimeMask
-
-- type: startingGear
   id: MimeMask
   equipment:
     mask: ClothingMaskMime
 
 - type: loadout
-  id: MimeMaskSad
-  equipment: MimeMaskSad
-
-- type: startingGear
   id: MimeMaskSad
   equipment:
     mask: ClothingMaskSadMime
 
 - type: loadout
-  id: MimeMaskScared
-  equipment: MimeMaskScared
-
-- type: startingGear
   id: MimeMaskScared
   equipment:
     mask: ClothingMaskScaredMime
 
 # Jumpsuit
 - type: loadout
-  id: MimeJumpsuit
-  equipment: MimeJumpsuit
-
-- type: startingGear
   id: MimeJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitMime
 
 - type: loadout
-  id: MimeJumpskirt
-  equipment: MimeJumpskirt
-
-- type: startingGear
   id: MimeJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtMime
 
 # Back
 - type: loadout
-  id: MimeBackpack
-  equipment: MimeBackpack
-
-- type: startingGear
   id: MimeBackpack
   equipment:
-    back: ClothingBackpackMimeFilled
+    back: ClothingBackpackMime
 
 - type: loadout
-  id: MimeSatchel
-  equipment: MimeSatchel
-
-- type: startingGear
   id: MimeSatchel
   equipment:
-    back: ClothingBackpackSatchelMimeFilled
+    back: ClothingBackpackSatchelMime
 
 - type: loadout
-  id: MimeDuffel
-  equipment: MimeDuffel
-
-- type: startingGear
   id: MimeDuffel
   equipment:
-    back: ClothingBackpackDuffelMimeFilled
+    back: ClothingBackpackDuffelMime
 
 # Outerclothing
 - type: loadout
-  id: MimeWintercoat
-  equipment: MimeWintercoat
-
-- type: startingGear
   id: MimeWintercoat
   equipment:
     outerClothing: ClothingOuterWinterMime
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml
index b6e1a8a2cbc..2d3e6bd0fed 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml
@@ -1,56 +1,16 @@
 # Jumpsuit
 - type: loadout
-  id: MusicianJumpsuit
-  equipment: MusicianJumpsuit
-
-- type: startingGear
   id: MusicianJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitMusician
 
 - type: loadout
-  id: MusicianJumpskirt
-  equipment: MusicianJumpskirt
-
-- type: startingGear
   id: MusicianJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtMusician
 
-# Back
-- type: loadout
-  id: MusicianBackpack
-  equipment: MusicianBackpack
-
-- type: startingGear
-  id: MusicianBackpack
-  equipment:
-    back: ClothingBackpackMusicianFilled
-
-- type: loadout
-  id: MusicianSatchel
-  equipment: MusicianSatchel
-
-- type: startingGear
-  id: MusicianSatchel
-  equipment:
-    back: ClothingBackpackSatchelMusicianFilled
-
-- type: loadout
-  id: MusicianDuffel
-  equipment: MusicianDuffel
-
-- type: startingGear
-  id: MusicianDuffel
-  equipment:
-    back: ClothingBackpackDuffelMusicianFilled
-
 # Outerclothing
 - type: loadout
-  id: MusicianWintercoat
-  equipment: MusicianWintercoat
-
-- type: startingGear
   id: MusicianWintercoat
   equipment:
     outerClothing: ClothingOuterWinterMusician
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml
index 883e5a793cf..6134d672893 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml
@@ -11,32 +11,20 @@
 # Face
 - type: loadout
   id: PassengerFace
-  equipment: GasMask
   effects:
   - !type:GroupLoadoutEffect
     proto: GreyTider
-
-- type: startingGear
-  id: GasMask
   equipment:
     mask: ClothingMaskGas
 
 # Jumpsuits
 # Grey
 - type: loadout
-  id: GreyJumpsuit
-  equipment: GreyJumpsuit
-
-- type: startingGear
   id: GreyJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorGrey
 
 - type: loadout
-  id: GreyJumpskirt
-  equipment: GreyJumpskirt
-
-- type: startingGear
   id: GreyJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtColorGrey
@@ -44,51 +32,31 @@
 # Rainbow
 - type: loadout
   id: RainbowJumpsuit
-  equipment: RainbowJumpsuit
   effects:
   - !type:GroupLoadoutEffect
     proto: GreyTider
-
-- type: startingGear
-  id: RainbowJumpsuit
   equipment:
     jumpsuit: ClothingUniformColorRainbow
 
 # Rose Hoodie w/ Skirt - DeltaV
 - type: loadout
-  id: MioSkirt
-  equipment: MioSkirt
-
-- type: startingGear
   id: MioSkirt
   equipment:
     jumpsuit: ClothingCostumeMioSkirt
 
 # Turqoise Hoodie w/ Shorts - DeltaV
 - type: loadout
-  id: NaotaHoodie
-  equipment: NaotaHoodie
-
-- type: startingGear
   id: NaotaHoodie
   equipment:
     jumpsuit: ClothingCostumeNaota
 
 # Casual Blue - DeltaV
 - type: loadout
-  id: CasualRedSkirt
-  equipment: CasualRedSkirt
-
-- type: startingGear
   id: CasualRedSkirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtCasualRed
 
 - type: loadout
-  id: CasualRedSuit
-  equipment: CasualRedSuit
-
-- type: startingGear
   id: CasualRedSuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitCasualRed
@@ -96,38 +64,22 @@
 
 # Casual Blue - DeltaV
 - type: loadout
-  id: CasualBlueSkirt
-  equipment: CasualBlueSkirt
-
-- type: startingGear
   id: CasualBlueSkirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtCasualBlue
 
 - type: loadout
-  id: CasualBlueSuit
-  equipment: CasualBlueSuit
-
-- type: startingGear
   id: CasualBlueSuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitCasualBlue
 
 # Casual Purple - DeltaV
 - type: loadout
-  id: CasualPurpleSkirt
-  equipment: CasualPurpleSkirt
-
-- type: startingGear
   id: CasualPurpleSkirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtCasualPurple
 
 - type: loadout
-  id: CasualPurpleSuit
-  equipment: CasualPurpleSuit
-
-- type: startingGear
   id: CasualPurpleSuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitCasualPurple
@@ -135,82 +87,50 @@
 # Ancient
 - type: loadout
   id: AncientJumpsuit
-  equipment: AncientJumpsuit
   effects:
   - !type:GroupLoadoutEffect
     proto: GreyTider
-
-- type: startingGear
-  id: AncientJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitAncient
 
 # Back
 - type: loadout
-  id: CommonBackpack
-  equipment: CommonBackpack
-
-- type: startingGear
   id: CommonBackpack
   equipment:
-    back: ClothingBackpackFilled
+    back: ClothingBackpack
 
 - type: loadout
-  id: CommonSatchel
-  equipment: CommonSatchel
-
-- type: startingGear
   id: CommonSatchel
   equipment:
-    back: ClothingBackpackSatchelFilled
+    back: ClothingBackpackSatchel
 
 - type: loadout
-  id: CommonDuffel
-  equipment: CommonDuffel
-
-- type: startingGear
   id: CommonDuffel
   equipment:
-    back: ClothingBackpackDuffelFilled
+    back: ClothingBackpackDuffel
 
 # Gloves
 - type: loadout
   id: PassengerGloves
-  equipment: FingerlessInsulatedGloves
   effects:
   - !type:GroupLoadoutEffect
     proto: GreyTider
-
-- type: startingGear
-  id: FingerlessInsulatedGloves
   equipment:
     gloves: ClothingHandsGlovesFingerlessInsulated
 
 # Outerclothing
 - type: loadout
-  id: PassengerWintercoat
-  equipment: PassengerWintercoat
-
-- type: startingGear
   id: PassengerWintercoat
   equipment:
     outerClothing: ClothingOuterWinterCoat
 
 # Shoes
 - type: loadout
-  id: BlackShoes
-  equipment: BlackShoes
-
-- type: startingGear
   id: BlackShoes
   equipment:
     shoes: ClothingShoesColorBlack
 
 - type: loadout
-  id: WinterBoots
-  equipment: WinterBoots
-
-- type: startingGear
   id: WinterBoots
   equipment:
     shoes: ClothingShoesBootsWinter
diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
index dcd639b2a99..1604b1356b9 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
@@ -1,168 +1,96 @@
 # Jumpsuit
 - type: loadout
-  id: CaptainJumpsuit
-  equipment: CaptainJumpsuit
-
-- type: startingGear
   id: CaptainJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitCaptain
 
 - type: loadout
-  id: CaptainJumpskirt
-  equipment: CaptainJumpskirt
-
-- type: startingGear
   id: CaptainJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtCaptain
 
 - type: loadout
-  id: CaptainFormalSuit
-  equipment: CaptainFormalSuit
-
-- type: startingGear
   id: CaptainFormalSuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitCapFormal
 
 - type: loadout
-  id: CaptainFormalSkirt
-  equipment: CaptainFormalSkirt
-
-- type: startingGear
   id: CaptainFormalSkirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtCapFormalDress
 
 # Head
 - type: loadout
-  id: CaptainHead
-  equipment: CaptainHead
-
-- type: startingGear
   id: CaptainHead
   equipment:
     head: ClothingHeadHatCaptain
 
 - type: loadout
-  id: CaptainCap
-  equipment: CaptainCap
-
-- type: startingGear
   id: CaptainCap
   equipment:
     head: ClothingHeadHatCapcap
 
 - type: loadout # DeltaV
-  id: CaptainBeret
-  equipment: CaptainBeret
-
-- type: startingGear # DeltaV
   id: CaptainBeret
   equipment:
     head: ClothingHeadHatBeretCap
 
 # Neck
 - type: loadout
-  id: CaptainCloak
-  equipment: CaptainCloak
-
-- type: startingGear
   id: CaptainCloak
   equipment:
     neck: ClothingNeckCloakCap
 
-- type: loadout
-  id: CaptainCloakFormal
-  equipment: CaptainCloakFormal
-
-- type: startingGear
+- type: loadout # DeltaV
   id: CaptainCloakFormal
   equipment:
     neck: ClothingNeckCloakCapFormal
 
 - type: loadout
-  id: CaptainMantle
-  equipment: CaptainMantle
-
-- type: startingGear
   id: CaptainMantle
   equipment:
     neck: ClothingNeckMantleCap
 
 # Back
 - type: loadout
-  id: CaptainBackpack
-  equipment: CaptainBackpack
-
-- type: startingGear
   id: CaptainBackpack
   equipment:
-    back: ClothingBackpackCaptainFilled
+    back: ClothingBackpackCaptain
 
 - type: loadout
-  id: CaptainSatchel
-  equipment: CaptainSatchel
-
-- type: startingGear
   id: CaptainSatchel
   equipment:
-    back: ClothingBackpackSatchelCaptainFilled
+    back: ClothingBackpackSatchelCaptain
 
 - type: loadout
-  id: CaptainDuffel
-  equipment: CaptainDuffel
-
-- type: startingGear
   id: CaptainDuffel
   equipment:
-    back: ClothingBackpackDuffelCaptainFilled
+    back: ClothingBackpackDuffelCaptain
 
 # Outer clothing
 - type: loadout
-  id: CaptainOuterClothing
-  equipment: CaptainOuterClothing
-
-- type: startingGear
   id: CaptainOuterClothing
   equipment:
     outerClothing: ClothingOuterArmorCaptainCarapace
 
 - type: loadout
-  id: CaptainWintercoat
-  equipment: CaptainWintercoat
-
-- type: startingGear
   id: CaptainWintercoat
   equipment:
     outerClothing: ClothingOuterWinterCap
 
 # Gloves - DeltaV
 - type: loadout #DeltaV
-  id: CaptainGloves
-  equipment: CaptainGloves
-
-- type: startingGear #DeltaV
   id: CaptainGloves
   equipment:
     gloves: ClothingHandsGlovesCaptain
 
 - type: loadout # DeltaV
-  id: InspectionGloves
-  equipment: InspectionGloves
-
-- type: startingGear # DeltaV
   id: InspectionGloves
   equipment:
     gloves: ClothingHandsGlovesInspection
 
 # Shoes - DeltaV
 - type: loadout # DeltaV
-  id: CaptainWinterBoots
-  equipment: CaptainWinterBoots
-
-- type: startingGear # DeltaV
   id: CaptainWinterBoots
   equipment:
     shoes: ClothingShoesBootsWinterCap
diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
index a31f7895d42..76c46d7d1a0 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
@@ -10,98 +10,43 @@
 
 # Jumpsuit
 - type: loadout
-  id: HoPJumpsuit
-  equipment: HoPJumpsuit
-
-- type: startingGear
   id: HoPJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitHoP
 
 - type: loadout
-  id: HoPJumpskirt
-  equipment: HoPJumpskirt
-
-- type: startingGear
   id: HoPJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtHoP
 
 # Head
 - type: loadout
-  id: HoPHead
-  equipment: HoPHead
-
-- type: startingGear
   id: HoPHead
   equipment:
     head: ClothingHeadHatHopcap
 
 # Neck
 - type: loadout
-  id: HoPCloak
-  equipment: HoPCloak
-
-- type: startingGear
   id: HoPCloak
   equipment:
     neck: ClothingNeckCloakHop
 
 - type: loadout
-  id: HoPMantle
-  equipment: HoPMantle
-
-- type: startingGear
   id: HoPMantle
   equipment:
     neck: ClothingNeckMantleHOP
 
 # Back
-- type: loadout
-  id: HoPBackpack
-  equipment: HoPBackpack
-
-- type: startingGear
-  id: HoPBackpack
-  equipment:
-    back: ClothingBackpackHOPFilled
-
-- type: loadout
-  id: HoPSatchel
-  equipment: HoPSatchel
-
-- type: startingGear
-  id: HoPSatchel
-  equipment:
-    back: ClothingBackpackSatchelHOPFilled
-
-- type: loadout
-  id: HoPDuffel
-  equipment: HoPDuffel
-
-- type: startingGear
-  id: HoPDuffel
-  equipment:
-    back: ClothingBackpackDuffelHOPFilled
-
 - type: loadout
   id: HoPBackpackIan
-  equipment: HoPBackpackIan
   effects:
   - !type:GroupLoadoutEffect
     proto: ProfessionalHoP
-
-- type: startingGear
-  id: HoPBackpackIan
   equipment:
-    back: ClothingBackpackHOPIanFilled
+    back: ClothingBackpackIan
 
 # Outerclothing
 - type: loadout
-  id: HoPWintercoat
-  equipment: HoPWintercoat
-
-- type: startingGear
   id: HoPWintercoat
   equipment:
     outerClothing: ClothingOuterWinterHoP
diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml
index 81805f0ec56..b3f1ae3cd6a 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml
@@ -1,75 +1,43 @@
 # Jumpsuit
 - type: loadout
-  id: AtmosphericTechnicianJumpsuit
-  equipment: AtmosphericTechnicianJumpsuit
-
-- type: startingGear
   id: AtmosphericTechnicianJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitAtmos
 
 - type: loadout
-  id: AtmosphericTechnicianJumpskirt
-  equipment: AtmosphericTechnicianJumpskirt
-
-- type: startingGear
   id: AtmosphericTechnicianJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtAtmos
 
 - type: loadout
-  id: AtmosphericTechnicianJumpsuitCasual
-  equipment: AtmosphericTechnicianJumpsuitCasual
-
-- type: startingGear
   id: AtmosphericTechnicianJumpsuitCasual
   equipment:
     jumpsuit: ClothingUniformJumpsuitAtmosCasual
 
 # Back
 - type: loadout
-  id: AtmosphericTechnicianBackpack
-  equipment: AtmosphericTechnicianBackpack
-
-- type: startingGear
   id: AtmosphericTechnicianBackpack
   equipment:
-    back: ClothingBackpackAtmosphericsFilled
+    back: ClothingBackpackAtmospherics
 
 - type: loadout
-  id: AtmosphericTechnicianSatchel
-  equipment: AtmosphericTechnicianSatchel
-
-- type: startingGear
   id: AtmosphericTechnicianSatchel
   equipment:
-    back: ClothingBackpackSatchelAtmosphericsFilled
+    back: ClothingBackpackSatchelAtmospherics
 
 - type: loadout
-  id: AtmosphericTechnicianDuffel
-  equipment: AtmosphericTechnicianDuffel
-
-- type: startingGear
   id: AtmosphericTechnicianDuffel
   equipment:
-    back: ClothingBackpackDuffelAtmosphericsFilled
+    back: ClothingBackpackDuffelAtmospherics
 
 # OuterClothing
 - type: loadout
-  id: AtmosphericTechnicianWintercoat
-  equipment: AtmosphericTechnicianWintercoat
-
-- type: startingGear
   id: AtmosphericTechnicianWintercoat
   equipment:
     outerClothing: ClothingOuterWinterAtmos
 
 # Shoes
 - type: loadout
-  id: WhiteShoes
-  equipment: WhiteShoes
-
-- type: startingGear
   id: WhiteShoes
   equipment:
     shoes: ClothingShoesColorWhite
diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml
index 12e607a5109..f60f1ea84c0 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml
@@ -1,126 +1,58 @@
 # Jumpsuit
 - type: loadout
-  id: ChiefEngineerJumpsuit
-  equipment: ChiefEngineerJumpsuit
-
-- type: startingGear
   id: ChiefEngineerJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitChiefEngineer
 
 - type: loadout
-  id: ChiefEngineerJumpskirt
-  equipment: ChiefEngineerJumpskirt
-
-- type: startingGear
   id: ChiefEngineerJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtChiefEngineer
 
 - type: loadout
-  id: ChiefEngineerTurtleneck
-  equipment: ChiefEngineerTurtleneck
-
-- type: startingGear
   id: ChiefEngineerTurtleneck
   equipment:
     jumpsuit: ClothingUniformJumpsuitChiefEngineerTurtle
 
 - type: loadout
-  id: ChiefEngineerTurtleneckSkirt
-  equipment: ChiefEngineerTurtleneckSkirt
-
-- type: startingGear
   id: ChiefEngineerTurtleneckSkirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtChiefEngineerTurtle
 
 # Head
 - type: loadout
-  id: ChiefEngineerHead
-  equipment: ChiefEngineerHead
-
-- type: startingGear
   id: ChiefEngineerHead
   equipment:
     head: ClothingHeadHatHardhatWhite
 
 - type: loadout
   id: ChiefEngineerBeret
-  equipment: EngineeringBeret
+  startingGear: EngineeringBeret
 
 # Neck
 - type: loadout
-  id: ChiefEngineerCloak
-  equipment: ChiefEngineerCloak
-
-- type: startingGear
   id: ChiefEngineerCloak
   equipment:
     neck: ClothingNeckCloakCe
 
 - type: loadout
-  id: ChiefEngineerMantle
-  equipment: ChiefEngineerMantle
-
-- type: startingGear
   id: ChiefEngineerMantle
   equipment:
     neck: ClothingNeckMantleCE
 
-# Back
-- type: loadout
-  id: ChiefEngineerBackpack
-  equipment: ChiefEngineerBackpack
-
-- type: startingGear
-  id: ChiefEngineerBackpack
-  equipment:
-    back: ClothingBackpackChiefEngineerFilled
-
-- type: loadout
-  id: ChiefEngineerSatchel
-  equipment: ChiefEngineerSatchel
-
-- type: startingGear
-  id: ChiefEngineerSatchel
-  equipment:
-    back: ClothingBackpackSatchelChiefEngineerFilled
-
-- type: loadout
-  id: ChiefEngineerDuffel
-  equipment: ChiefEngineerDuffel
-
-- type: startingGear
-  id: ChiefEngineerDuffel
-  equipment:
-    back: ClothingBackpackDuffelChiefEngineerFilled
-
 # OuterClothing
 - type: loadout
-  id: ChiefEngineerWintercoat
-  equipment: ChiefEngineerWintercoat
-
-- type: startingGear
   id: ChiefEngineerWintercoat
   equipment:
     outerClothing: ClothingOuterWinterCE
 
 # Shoes
 - type: loadout
-  id: BrownShoes
-  equipment: BrownShoes
-
-- type: startingGear
   id: BrownShoes
   equipment:
     shoes: ClothingShoesColorBrown
 
 - type: loadout
-  id: ChiefEngineerWinterBoots
-  equipment: ChiefEngineerWinterBoots
-
-- type: startingGear
   id: ChiefEngineerWinterBoots
   equipment:
     shoes: ClothingShoesBootsWinterChiefEngineer
diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
index b314bebe888..38c3909d7c8 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
@@ -20,181 +20,113 @@
 
 
 # Head
-- type: loadout
-  id: StationEngineerHardhatYellow
-  equipment: StationEngineerHardhatYellow
-
 - type: startingGear
+  id: EngineeringBeret
+  equipment:
+    head: ClothingHeadHatBeretEngineering
+
+- type: loadout
   id: StationEngineerHardhatYellow
   equipment:
     head: ClothingHeadHatHardhatYellow
 
 - type: loadout
-  id: StationEngineerHardhatOrange
-  equipment: StationEngineerHardhatOrange
-
-- type: startingGear
   id: StationEngineerHardhatOrange
   equipment:
     head: ClothingHeadHatHardhatOrange
 
 - type: loadout
-  id: StationEngineerHardhatRed
-  equipment: StationEngineerHardhatRed
-
-- type: startingGear
   id: StationEngineerHardhatRed
   equipment:
     head: ClothingHeadHatHardhatRed
 
 - type: loadout
   id: SeniorEngineerBeret
-  equipment: EngineeringBeret
+  startingGear: EngineeringBeret
   effects:
   - !type:GroupLoadoutEffect
     proto: SeniorEngineering
 
-- type: startingGear
-  id: EngineeringBeret
-  equipment:
-    head: ClothingHeadHatBeretEngineering
-
 # Jumpsuit
 - type: loadout
-  id: StationEngineerJumpsuit
-  equipment: StationEngineerJumpsuit
-
-- type: startingGear
   id: StationEngineerJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitEngineering
 
 - type: loadout
-  id: StationEngineerJumpskirt
-  equipment: StationEngineerJumpskirt
-
-- type: startingGear
   id: StationEngineerJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtEngineering
 
 - type: loadout
-  id: StationEngineerHazardsuit
-  equipment: StationEngineerHazardsuit
-
-- type: startingGear
   id: StationEngineerHazardsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitEngineeringHazard
 
 - type: loadout
   id: SeniorEngineerJumpsuit
-  equipment: SeniorEngineerJumpsuit
   effects:
   - !type:GroupLoadoutEffect
     proto: SeniorEngineering
-
-- type: startingGear
-  id: SeniorEngineerJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitSeniorEngineer
 
 - type: loadout
   id: SeniorEngineerJumpskirt
-  equipment: SeniorEngineerJumpskirt
   effects:
   - !type:GroupLoadoutEffect
     proto: SeniorEngineering
-
-- type: startingGear
-  id: SeniorEngineerJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtSeniorEngineer
 
 # Back
 - type: loadout
-  id: StationEngineerBackpack
-  equipment: StationEngineerBackpack
-
-- type: startingGear
   id: StationEngineerBackpack
   equipment:
-    back: ClothingBackpackEngineeringFilled
+    back: ClothingBackpackEngineering
 
 - type: loadout
-  id: StationEngineerSatchel
-  equipment: StationEngineerSatchel
-
-- type: startingGear
   id: StationEngineerSatchel
   equipment:
-    back: ClothingBackpackSatchelEngineeringFilled
+    back: ClothingBackpackSatchelEngineering
 
 - type: loadout
-  id: StationEngineerDuffel
-  equipment: StationEngineerDuffel
-
-- type: startingGear
   id: StationEngineerDuffel
   equipment:
-    back: ClothingBackpackDuffelEngineeringFilled
+    back: ClothingBackpackDuffelEngineering
 
 # OuterClothing
 - type: loadout
-  id: StationEngineerOuterVest
-  equipment: StationEngineerOuterVest
-
-- type: startingGear
   id: StationEngineerOuterVest
   equipment:
     outerClothing: ClothingOuterVestHazard
 
-- type: loadout
-  id: StationEngineerWintercoat
-  equipment: StationEngineerWintercoat
-
-- type: startingGear
+- type: loadout # DeltaV
   id: StationEngineerWintercoat
   equipment:
     outerClothing: ClothingOuterWinterEngi
 
 # Shoes
 - type: loadout
-  id: WorkBoots
-  equipment: WorkBoots
-
-- type: startingGear
   id: WorkBoots
   equipment:
     shoes: ClothingShoesBootsWork
 
 - type: loadout
-  id: EngineeringWinterBoots
-  equipment: EngineeringWinterBoots
-
-- type: startingGear
   id: EngineeringWinterBoots
   equipment:
     shoes: ClothingShoesBootsWinterEngi
 
 # ID
 - type: loadout
-  id: StationEngineerPDA
-  equipment: StationEngineerPDA
-
-- type: startingGear
   id: StationEngineerPDA
   equipment:
     id: EngineerPDA
 
 - type: loadout
   id: SeniorEngineerPDA
-  equipment: SeniorEngineerPDA
   effects:
   - !type:GroupLoadoutEffect
     proto: SeniorEngineering
-
-- type: startingGear
-  id: SeniorEngineerPDA
   equipment:
     id: SeniorEngineerPDA
diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/technical_assistant.yml
index d6acc4dbfdc..2a2c16a6ddb 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Engineering/technical_assistant.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/technical_assistant.yml
@@ -1,18 +1,10 @@
 # Jumpsuit
 - type: loadout
-  id: YellowJumpsuit
-  equipment: YellowJumpsuit
-
-- type: startingGear
   id: YellowJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorYellow
 
 - type: loadout
-  id: YellowJumpskirt
-  equipment: YellowJumpskirt
-
-- type: startingGear
   id: YellowJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtColorYellow
diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml
index 54babe12e2e..cea3ca94b71 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml
@@ -1,123 +1,71 @@
 # Neck - DeltaV
 - type: loadout # DeltaV
-  id: ChemistTie
-  equipment: ChemistTie
-
-- type: startingGear # DeltaV
   id: ChemistTie
   equipment:
     neck: ClothingNeckTieChem
 
 # Jumpsuit
 - type: loadout
-  id: ChemistJumpsuit
-  equipment: ChemistJumpsuit
-
-- type: startingGear
   id: ChemistJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitChemistry
 
 - type: loadout
-  id: ChemistJumpskirt
-  equipment: ChemistJumpskirt
-
-- type: startingGear
   id: ChemistJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtChemistry
 
 - type: loadout # DeltaV
-  id: ChemistFormalSuit
-  equipment: ChemistFormalSuit
-
-- type: startingGear # DeltaV
   id: ChemistFormalSuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitChemShirt
 
 # Back
 - type: loadout
-  id: ChemistBackpack
-  equipment: ChemistBackpack
-
-- type: startingGear
   id: ChemistBackpack
   equipment:
-    back: ClothingBackpackChemistryFilled
+    back: ClothingBackpackChemistry
 
 - type: loadout
-  id: ChemistSatchel
-  equipment: ChemistSatchel
-
-- type: startingGear
   id: ChemistSatchel
   equipment:
-    back: ClothingBackpackSatchelChemistryFilled
+    back: ClothingBackpackSatchelChemistry
 
 - type: loadout
-  id: ChemistDuffel
-  equipment: ChemistDuffel
-
-- type: startingGear
   id: ChemistDuffel
   equipment:
-    back: ClothingBackpackDuffelChemistryFilled
+    back: ClothingBackpackDuffelChemistry
 
 # Outer clothing
 - type: loadout
-  id: ChemistLabCoat
-  equipment: ChemistLabCoat
-
-- type: startingGear
   id: ChemistLabCoat
   equipment:
     outerClothing: ClothingOuterCoatLabChem
 
 - type: loadout
-  id: ChemistWintercoat
-  equipment: ChemistWintercoat
-
-- type: startingGear
   id: ChemistWintercoat
   equipment:
     outerClothing: ClothingOuterWinterChem
 
 ## Start DeltaV Changes
 - type: loadout
-  id: ChemistApron
-  equipment: ChemistApron
-
-- type: startingGear
   id: ChemistApron
   equipment:
     outerClothing: ClothingOuterApronChemist
 
 # Gloves - DeltaV
 - type: loadout
-  id: ChemistGloves
-  equipment: ChemistGloves
-
-- type: startingGear
   id: ChemistGloves
   equipment:
     gloves: ClothingHandsGlovesChemist
 
 # Shoes - DeltaV
 - type: loadout
-  id: ChemistWinterBoots
-  equipment: ChemistWinterBoots
-
-- type: startingGear
   id: ChemistWinterBoots
   equipment:
     shoes: ClothingShoesBootsWinterChem
 
 - type: loadout
-  id: ChemistShoes
-  equipment: ChemistShoes
-
-- type: startingGear
   id: ChemistShoes
   equipment:
     shoes: ClothingShoesEnclosedChem
diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml
index 23db1514d8c..c0e95cf5c07 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml
@@ -1,131 +1,59 @@
 # Jumpsuit
 - type: loadout
-  id: ChiefMedicalOfficerJumpsuit
-  equipment: ChiefMedicalOfficerJumpsuit
-
-- type: startingGear
   id: ChiefMedicalOfficerJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitCMO
 
 - type: loadout
-  id: ChiefMedicalOfficerJumpskirt
-  equipment: ChiefMedicalOfficerJumpskirt
-
-- type: startingGear
   id: ChiefMedicalOfficerJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtCMO
 
 - type: loadout
-  id: ChiefMedicalOfficerTurtleneckJumpsuit
-  equipment: ChiefMedicalOfficerTurtleneckJumpsuit
-
-- type: startingGear
   id: ChiefMedicalOfficerTurtleneckJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitCMOTurtle
 
 - type: loadout
-  id: ChiefMedicalOfficerTurtleneckJumpskirt
-  equipment: ChiefMedicalOfficerTurtleneckJumpskirt
-
-- type: startingGear
   id: ChiefMedicalOfficerTurtleneckJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtCMOTurtle
 
 # Head
 - type: loadout
-  id: ChiefMedicalOfficerBeret
-  equipment: ChiefMedicalOfficerBeret
-
-- type: startingGear
   id: ChiefMedicalOfficerBeret
   equipment:
     head: ClothingHeadHatBeretCmo
 
 - type: loadout
-  id: CMOMedicalHeadMirror
-  equipment: CMOMedicalHeadMirror
-
-- type: startingGear
   id: CMOMedicalHeadMirror
   equipment:
     head: ClothingHeadMirror
 
 # Neck
 - type: loadout
-  id: ChiefMedicalOfficerCloak
-  equipment: ChiefMedicalOfficerCloak
-
-- type: startingGear
   id: ChiefMedicalOfficerCloak
   equipment:
     neck: ClothingCloakCmo
 
 - type: loadout
-  id: ChiefMedicalOfficerMantle
-  equipment: ChiefMedicalOfficerMantle
-
-- type: startingGear
   id: ChiefMedicalOfficerMantle
   equipment:
     neck: ClothingNeckMantleCMO
 
-# Back
-- type: loadout
-  id: ChiefMedicalOfficerBackpack
-  equipment: ChiefMedicalOfficerBackpack
-
-- type: startingGear
-  id: ChiefMedicalOfficerBackpack
-  equipment:
-    back: ClothingBackpackCMOFilled
-
-- type: loadout
-  id: ChiefMedicalOfficerSatchel
-  equipment: ChiefMedicalOfficerSatchel
-
-- type: startingGear
-  id: ChiefMedicalOfficerSatchel
-  equipment:
-    back: ClothingBackpackSatchelCMOFilled
-
-- type: loadout
-  id: ChiefMedicalOfficerDuffel
-  equipment: ChiefMedicalOfficerDuffel
-
-- type: startingGear
-  id: ChiefMedicalOfficerDuffel
-  equipment:
-    back: ClothingBackpackDuffelCMOFilled
-
 # Outer clothing
 - type: loadout
-  id: ChiefMedicalOfficerLabCoat
-  equipment: ChiefMedicalOfficerLabCoat
-
-- type: startingGear
   id: ChiefMedicalOfficerLabCoat
   equipment:
     outerClothing: ClothingOuterCoatLabCmo
 
 - type: loadout
-  id: ChiefMedicalOfficerWintercoat
-  equipment: ChiefMedicalOfficerWintercoat
-
-- type: startingGear
   id: ChiefMedicalOfficerWintercoat
   equipment:
     outerClothing: ClothingOuterWinterCMO
 
 # Shoes - DeltaV
 - type: loadout
-  id: ChiefMedicalOfficerWinterBoots
-  equipment: ChiefMedicalOfficerWinterBoots
-
-- type: startingGear
   id: ChiefMedicalOfficerWinterBoots
   equipment:
     shoes: ClothingShoesBootsWinterChiefMedicalOfficer
diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
index 60550cf25b5..d715f0ede62 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
@@ -33,251 +33,151 @@
 
 - type: loadout
   id: SeniorPhysicianBeret
-  equipment: SeniorPhysicianBeret
   effects:
   - !type:GroupLoadoutEffect
     proto: SeniorPhysician
-
-- type: startingGear
-  id: SeniorPhysicianBeret
   equipment:
     head: ClothingHeadHatBeretSeniorPhysician
 
 - type: loadout
   id: MedicalHeadMirror
-  equipment: MedicalHeadMirror
   effects:
   - !type:GroupLoadoutEffect
     proto: MedicalHeadMirrorTimer
-
-- type: startingGear
-  id: MedicalHeadMirror
   equipment:
     head: ClothingHeadMirror
 
 - type: loadout
-  id: MedicalBeret
-  equipment: MedicalBeret
-
-- type: startingGear
   id: MedicalBeret
   equipment:
     head: ClothingHeadHatBeretMedic
 
 - type: loadout
-  id: BlueSurgeryCap
-  equipment: BlueSurgeryCap
-
-- type: startingGear
   id: BlueSurgeryCap
   equipment:
     head: ClothingHeadHatSurgcapBlue
 
 - type: loadout
-  id: GreenSurgeryCap
-  equipment: GreenSurgeryCap
-
-- type: startingGear
   id: GreenSurgeryCap
   equipment:
     head: ClothingHeadHatSurgcapGreen
 
 - type: loadout
-  id: PurpleSurgeryCap
-  equipment: PurpleSurgeryCap
-
-- type: startingGear
   id: PurpleSurgeryCap
   equipment:
     head: ClothingHeadHatSurgcapPurple
 
 - type: loadout
-  id: NurseHat
-  equipment: NurseHat
-
-- type: startingGear
   id: NurseHat
   equipment:
     head: ClothingHeadNurseHat
 
 # Neck - DeltaV
 - type: loadout # DeltaV
-  id: Stethoscope
-  equipment: Stethoscope
-
-- type: startingGear # DeltaV
   id: Stethoscope
   equipment:
     neck: ClothingNeckStethoscope
 
 # Jumpsuit
 - type: loadout
-  id: MedicalDoctorJumpsuit
-  equipment: MedicalDoctorJumpsuit
-
-- type: startingGear
   id: MedicalDoctorJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitMedicalDoctor
 
 - type: loadout
-  id: MedicalDoctorJumpskirt
-  equipment: MedicalDoctorJumpskirt
-
-- type: startingGear
   id: MedicalDoctorJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtMedicalDoctor
 
 - type: loadout
   id: SeniorPhysicianJumpsuit
-  equipment: SeniorPhysicianJumpsuit
   effects:
   - !type:GroupLoadoutEffect
     proto: SeniorPhysician
-
-- type: startingGear
-  id: SeniorPhysicianJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitSeniorPhysician
 
 - type: loadout
   id: SeniorPhysicianJumpskirt
-  equipment: SeniorPhysicianJumpskirt
   effects:
   - !type:GroupLoadoutEffect
     proto: SeniorPhysician
-
-- type: startingGear
-  id: SeniorPhysicianJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtSeniorPhysician
 
 - type: loadout
-  id: MedicalBlueScrubs
-  equipment: MedicalBlueScrubs
-
-- type: startingGear
   id: MedicalBlueScrubs
   equipment:
     jumpsuit: UniformScrubsColorBlue
 
 - type: loadout
-  id: MedicalGreenScrubs
-  equipment: MedicalGreenScrubs
-
-- type: startingGear
   id: MedicalGreenScrubs
   equipment:
     jumpsuit: UniformScrubsColorGreen
 
 - type: loadout
-  id: MedicalPurpleScrubs
-  equipment: MedicalPurpleScrubs
-
-- type: startingGear
   id: MedicalPurpleScrubs
   equipment:
     jumpsuit: UniformScrubsColorPurple
 
 # Back
 - type: loadout
-  id: MedicalDoctorBackpack
-  equipment: MedicalDoctorBackpack
-
-- type: startingGear
   id: MedicalDoctorBackpack
   equipment:
-    back: ClothingBackpackMedicalFilled
+    back: ClothingBackpackMedical
 
 - type: loadout
-  id: MedicalDoctorSatchel
-  equipment: MedicalDoctorSatchel
-
-- type: startingGear
   id: MedicalDoctorSatchel
   equipment:
-    back: ClothingBackpackSatchelMedicalFilled
+    back: ClothingBackpackSatchelMedical
 
 - type: loadout
-  id: MedicalDoctorDuffel
-  equipment: MedicalDoctorDuffel
-
-- type: startingGear
   id: MedicalDoctorDuffel
   equipment:
-    back: ClothingBackpackDuffelMedicalFilled
+    back: ClothingBackpackDuffelMedical
 
 # OuterClothing
 - type: loadout
-  id: MedicalDoctorWintercoat
-  equipment: MedicalDoctorWintercoat
-
-- type: startingGear
   id: MedicalDoctorWintercoat
   equipment:
     outerClothing: ClothingOuterWinterMed
 
 - type: loadout
   id: SeniorPhysicianLabCoat
-  equipment: SeniorPhysicianLabCoat
   effects:
   - !type:GroupLoadoutEffect
     proto: SeniorPhysician
-
-- type: startingGear
-  id: SeniorPhysicianLabCoat
   equipment:
     outerClothing: ClothingOuterCoatLabSeniorPhysician
 
 # Shoes
 - type: loadout
-  id: MedicalWinterBoots
-  equipment: MedicalWinterBoots
-
-- type: startingGear
   id: MedicalWinterBoots
   equipment:
     shoes: ClothingShoesBootsWinterMed
 
 # ID
 - type: loadout
-  id: MedicalDoctorPDA
-  equipment: MedicalDoctorPDA
-
-- type: startingGear
   id: MedicalDoctorPDA
   equipment:
     id: MedicalPDA
 
 - type: loadout
   id: SeniorPhysicianPDA
-  equipment: SeniorPhysicianPDA
   effects:
   - !type:GroupLoadoutEffect
     proto: SeniorPhysician
-
-- type: startingGear
-  id: SeniorPhysicianPDA
   equipment:
     id: SeniorPhysicianPDA
 
 # Gloves
 - type: loadout
-  id: NitrileGloves
-  equipment: NitrileGloves
-
-- type: startingGear
   id: NitrileGloves
   equipment:
     gloves: ClothingHandsGlovesNitrile
 
 #Masks
 - type: loadout
-  id: SterileMask
-  equipment: SterileMask
-
-- type: startingGear
   id: SterileMask
   equipment:
     mask: ClothingMaskSterile
diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_intern.yml
index c14c082f561..94741f6d6f6 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_intern.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_intern.yml
@@ -1,19 +1,11 @@
 # Jumpsuit
 
 - type: loadout
-  id: WhiteJumpsuit
-  equipment: WhiteJumpsuit
-
-- type: startingGear
   id: WhiteJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorWhite
 
 - type: loadout
-  id: WhiteJumpskirt
-  equipment: WhiteJumpskirt
-
-- type: startingGear
   id: WhiteJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtColorWhite
diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml
index e60cde9d8d3..9347e0c4b1e 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml
@@ -1,94 +1,38 @@
 # Head
 - type: loadout
-  id: ParamedicHead
-  equipment: ParamedicHead
-
-- type: startingGear
   id: ParamedicHead
   equipment:
     head: ClothingHeadHatParamedicsoft
 
 # Jumpsuit
 - type: loadout
-  id: ParamedicJumpsuit
-  equipment: ParamedicJumpsuit
-
-- type: startingGear
   id: ParamedicJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitParamedic
 
 - type: loadout
-  id: ParamedicJumpskirt
-  equipment: ParamedicJumpskirt
-
-- type: startingGear
   id: ParamedicJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtParamedic
 
-# Back
-- type: loadout
-  id: ParamedicBackpack
-  equipment: ParamedicBackpack
-
-- type: startingGear
-  id: ParamedicBackpack
-  equipment:
-    back: ClothingBackpackParamedicFilledDV
-
-- type: loadout
-  id: ParamedicSatchel
-  equipment: ParamedicSatchel
-
-- type: startingGear
-  id: ParamedicSatchel
-  equipment:
-    back: ClothingBackpackSatchelParamedicFilledDV
-
-- type: loadout
-  id: ParamedicDuffel
-  equipment: ParamedicDuffel
-
-- type: startingGear
-  id: ParamedicDuffel
-  equipment:
-    back: ClothingBackpackDuffelParamedicFilledDV
-
 # Outer clothing
 - type: loadout
-  id: ParamedicWindbreaker
-  equipment: ParamedicWindbreaker
-
-- type: startingGear
   id: ParamedicWindbreaker
   equipment:
     outerClothing: ClothingOuterCoatParamedicWB
 
 - type: loadout
-  id: ParamedicWintercoat
-  equipment: ParamedicWintercoat
-
-- type: startingGear
   id: ParamedicWintercoat
   equipment:
     outerClothing: ClothingOuterWinterPara
 
 # Shoes
 - type: loadout
-  id: BlueShoes
-  equipment: BlueShoes
-
-- type: startingGear
   id: BlueShoes
   equipment:
     shoes: ClothingShoesColorBlue
 
 - type: loadout # DeltaV
-  id: ParamedicWinterBoots
-  equipment: ParamedicWinterBoots
-
-- type: startingGear # DeltaV
   id: ParamedicWinterBoots
   equipment:
     shoes: ClothingShoesBootsWinterParamedic
diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml b/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
index ac6ee5fbf48..fabfc964040 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
@@ -2,118 +2,54 @@
 
 - type: loadout
   id: ResearchDirectorBeret
-  equipment: ScientificBeret
+  startingGear: ScientificBeret
 
-- type: startingGear # DeltaV
+- type: loadout # DeltaV
   id: ResearchDirectorHood
   equipment:
     head: ClothingHeadHoodMysta
 
-- type: loadout # DeltaV
-  id: ResearchDirectorHood
-  equipment: ResearchDirectorHood
-
 # Neck
 
 - type: loadout
-  id: ResearchDirectorMantle
-  equipment: ResearchDirectorMantle
-
-- type: startingGear
   id: ResearchDirectorMantle
   equipment:
     neck: ClothingNeckMantleRD
 
 - type: loadout
-  id: ResearchDirectorCloak
-  equipment: ResearchDirectorCloak
-
-- type: startingGear
   id: ResearchDirectorCloak
   equipment:
     neck: ClothingNeckCloakRd
 
 # Jumpsuit
 - type: loadout
-  id: ResearchDirectorJumpsuit
-  equipment: ResearchDirectorJumpsuit
-
-- type: startingGear
   id: ResearchDirectorJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitResearchDirector
 
 - type: loadout
-  id: ResearchDirectorJumpskirt
-  equipment: ResearchDirectorJumpskirt
-
-- type: startingGear
   id: ResearchDirectorJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtResearchDirector
 
-# Back
-- type: loadout
-  id: ResearchDirectorBackpack
-  equipment: ResearchDirectorBackpack
-
-- type: startingGear
-  id: ResearchDirectorBackpack
-  equipment:
-    back: ClothingBackpackResearchDirectorFilled
-
-- type: loadout
-  id: ResearchDirectorSatchel
-  equipment: ResearchDirectorSatchel
-
-- type: startingGear
-  id: ResearchDirectorSatchel
-  equipment:
-    back: ClothingBackpackSatchelResearchDirectorFilled
-
-- type: loadout
-  id: ResearchDirectorDuffel
-  equipment: ResearchDirectorDuffel
-
-- type: startingGear
-  id: ResearchDirectorDuffel
-  equipment:
-    back: ClothingBackpackDuffelResearchDirectorFilled
-
 # OuterClothing
 - type: loadout
   id: ResearchDirectorLabCoat
-  equipment: ResearchDirectorLabCoat
-
-- type: startingGear # DeltaV
-  id: MystaLabCoat
   equipment:
-    outerClothing: ClothingOuterCoatRndMysta
+    outerClothing: ClothingOuterCoatRD
 
 - type: loadout # DeltaV
   id: MystaLabCoat
-  equipment: MystaLabCoat
-
-- type: startingGear
-  id: ResearchDirectorLabCoat
   equipment:
-    outerClothing: ClothingOuterCoatRD
+    outerClothing: ClothingOuterCoatRndMysta
 
 - type: loadout
-  id: ResearchDirectorWintercoat
-  equipment: ResearchDirectorWintercoat
-
-- type: startingGear
   id: ResearchDirectorWintercoat
   equipment:
     outerClothing: ClothingOuterWinterRD
 
 # Shoes - DeltaV
 - type: loadout # DeltaV
-  id: ResearchDirectorWinterBoots
-  equipment: ResearchDirectorWinterBoots
-
-- type: startingGear # DeltaV
   id: ResearchDirectorWinterBoots
   equipment:
     shoes: ClothingShoesBootsWinterMystagogue
diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
index f5097071fc7..5a9d775fe44 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
@@ -10,33 +10,24 @@
 
 
 # Head
+- type: startingGear
+  id: ScientificBeret
+  equipment:
+    head: ClothingHeadHatBeretRND
 
 - type: loadout
   id: ScientificBeret
-  equipment: ScientificBeret
+  startingGear: ScientificBeret
   effects:
   - !type:GroupLoadoutEffect
     proto: SeniorResearcher
 
-- type: startingGear
-  id: ScientificBeret
-  equipment:
-    head: ClothingHeadHatBeretRND
-
 - type: loadout
-  id: RoboticistCap
-  equipment: RoboticistCap
-
-- type: startingGear
   id: RoboticistCap
   equipment:
     head: ClothingHeadHatCorpsoft
 
 - type: loadout
-  id: SkullBandana
-  equipment: SkullBandana
-
-- type: startingGear
   id: SkullBandana
   equipment:
     head: ClothingHeadBandSkull
@@ -44,199 +35,124 @@
 # Neck
 
 - type: loadout
-  id: ScientistTie
-  equipment: ScientistTie
-
-- type: startingGear
   id: ScientistTie
   equipment:
     neck: ClothingNeckTieSci
 
 # Jumpsuit
 - type: loadout
-  id: ScientistJumpsuit
-  equipment: ScientistJumpsuit
-
-- type: startingGear
   id: ScientistJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitScientist
 
 - type: loadout
-  id: ScientistJumpskirt
-  equipment: ScientistJumpskirt
-
-- type: startingGear
   id: ScientistJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtScientist
 
 - type: loadout
-  id: RoboticistJumpsuit
-  equipment: RoboticistJumpsuit
-
-- type: startingGear
   id: RoboticistJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitRoboticist
 
 - type: loadout
-  id: RoboticistJumpskirt
-  equipment: RoboticistJumpskirt
-
-- type: startingGear
   id: RoboticistJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtRoboticist
 
 - type: loadout
   id: SeniorResearcherJumpsuit
-  equipment: SeniorResearcherJumpsuit
   effects:
   - !type:GroupLoadoutEffect
     proto: SeniorResearcher
-
-- type: startingGear
-  id: SeniorResearcherJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitSeniorResearcher
 
 - type: loadout
   id: SeniorResearcherJumpskirt
-  equipment: SeniorResearcherJumpskirt
   effects:
   - !type:GroupLoadoutEffect
     proto: SeniorResearcher
-
-- type: startingGear
-  id: SeniorResearcherJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtSeniorResearcher
 
 # Back
 - type: loadout
-  id: ScientistBackpack
-  equipment: ScientistBackpack
-
-- type: startingGear
   id: ScientistBackpack
   equipment:
-    back: ClothingBackpackScienceFilled
+    back: ClothingBackpackScience
 
 - type: loadout
-  id: ScientistSatchel
-  equipment: ScientistSatchel
-
-- type: startingGear
   id: ScientistSatchel
   equipment:
-    back: ClothingBackpackSatchelScienceFilled
+    back: ClothingBackpackSatchelScience
 
 - type: loadout
-  id: ScientistDuffel
-  equipment: ScientistDuffel
-
-- type: startingGear
   id: ScientistDuffel
   equipment:
-    back: ClothingBackpackDuffelScienceFilled
+    back: ClothingBackpackDuffelScience
 
 # OuterClothing
 - type: loadout
-  id: RegularLabCoat
-  equipment: RegularLabCoat
-
-- type: startingGear
   id: RegularLabCoat
   equipment:
     outerClothing: ClothingOuterCoatLab
 
 - type: loadout
-  id: ScienceLabCoat
-  equipment: ScienceLabCoat
-
-- type: startingGear
   id: ScienceLabCoat
   equipment:
     outerClothing: ClothingOuterCoatRnd
 
-- type: loadout # DeltaV
-  id: RoboticistLabCoat
-  equipment: RoboticistLabCoat
+- type: loadout
+  id: ScienceWintercoat
+  equipment:
+    outerClothing: ClothingOuterWinterSci
 
-- type: startingGear # DeltaV
+- type: loadout
   id: RoboticistLabCoat
   equipment:
     outerClothing: ClothingOuterCoatRobo
 
 - type: loadout
-  id: ScienceWintercoat
-  equipment: ScienceWintercoat
-
-- type: startingGear
-  id: ScienceWintercoat
+  id: RoboticistWintercoat
   equipment:
-    outerClothing: ClothingOuterWinterSci
+    outerClothing: ClothingOuterWinterRobo
 
 - type: loadout
   id: SeniorResearcherLabCoat
-  equipment: SeniorResearcherLabCoat
   effects:
   - !type:GroupLoadoutEffect
     proto: SeniorResearcher
-
-- type: startingGear
-  id: SeniorResearcherLabCoat
   equipment:
     outerClothing: ClothingOuterCoatLabSeniorResearcher
 
 # Gloves
 - type: loadout
-  id: LatexGloves
-  equipment: LatexGloves
-
-- type: startingGear
   id: LatexGloves
   equipment:
     gloves: ClothingHandsGlovesLatex
 
 - type: loadout
-  id: RobohandsGloves
-  equipment: RobohandsGloves
-
-- type: startingGear
   id: RobohandsGloves
   equipment:
     gloves: ClothingHandsGlovesRobohands
 
 # Shoes
 - type: loadout
-  id: ScienceWinterBoots
-  equipment: ScienceWinterBoots
-
-- type: startingGear
   id: ScienceWinterBoots
   equipment:
     shoes: ClothingShoesBootsWinterSci
 
 # ID
 - type: loadout
-  id: ScientistPDA
-  equipment: ScientistPDA
-
-- type: startingGear
   id: ScientistPDA
   equipment:
     id: SciencePDA
 
 - type: loadout
   id: SeniorResearcherPDA
-  equipment: SeniorResearcherPDA
   effects:
   - !type:GroupLoadoutEffect
     proto: SeniorResearcher
-
-- type: startingGear
-  id: SeniorResearcherPDA
   equipment:
     id: SeniorResearcherPDA
diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml
index 5fabfdca91d..e8afa5a203c 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml
@@ -1,112 +1,48 @@
 # Head
 - type: loadout
-  id: DetectiveFedora
-  equipment: DetectiveFedora
-
-- type: startingGear
   id: DetectiveFedora
   equipment:
     head: ClothingHeadHatFedoraBrown
 
 - type: loadout
-  id: DetectiveFedoraGrey
-  equipment: DetectiveFedoraGrey
-
-- type: startingGear
   id: DetectiveFedoraGrey
   equipment:
     head: ClothingHeadHatFedoraGrey
 
 # Neck
 - type: loadout
-  id: DetectiveTie
-  equipment: DetectiveTie
-
-- type: startingGear
   id: DetectiveTie
   equipment:
     neck: ClothingNeckTieDet
 
 # Jumpsuit
 - type: loadout
-  id: DetectiveJumpsuit
-  equipment: DetectiveJumpsuit
-
-- type: startingGear
   id: DetectiveJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitDetective
 
 - type: loadout
-  id: DetectiveJumpskirt
-  equipment: DetectiveJumpskirt
-
-- type: startingGear
   id: DetectiveJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtDetective
 
 - type: loadout
-  id: NoirJumpsuit
-  equipment: NoirJumpsuit
-
-- type: startingGear
   id: NoirJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitDetectiveGrey
 
 - type: loadout
-  id: NoirJumpskirt
-  equipment: NoirJumpskirt
-
-- type: startingGear
   id: NoirJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtDetectiveGrey
 
-# Back
-- type: loadout
-  id: DetectiveBackpack
-  equipment: DetectiveBackpack
-
-- type: startingGear
-  id: DetectiveBackpack
-  equipment:
-    back: ClothingBackpackSecurityFilledDetective
-
-- type: loadout
-  id: DetectiveSatchel
-  equipment: DetectiveSatchel
-
-- type: startingGear
-  id: DetectiveSatchel
-  equipment:
-    back: ClothingBackpackSatchelSecurityFilledDetective
-
-- type: loadout
-  id: DetectiveDuffel
-  equipment: DetectiveDuffel
-
-- type: startingGear
-  id: DetectiveDuffel
-  equipment:
-    back: ClothingBackpackDuffelSecurityFilledDetective
-
 # OuterClothing
 - type: loadout
-  id: DetectiveArmorVest
-  equipment: DetectiveArmorVest
-
-- type: startingGear
   id: DetectiveArmorVest
   equipment:
     outerClothing: ClothingOuterVestDetective
 
 - type: loadout
-  id: DetectiveCoat
-  equipment: DetectiveCoat
-
-- type: startingGear
   id: DetectiveCoat
   equipment:
-    outerClothing: ClothingOuterCoatDetective
+    outerClothing: ClothingOuterCoatDetectiveLoadout
diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml
index ef619eb288f..6f2d205be07 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml
@@ -1,139 +1,79 @@
 # Jumpsuit
 - type: loadout
-  id: HeadofSecurityJumpsuit
-  equipment: HeadofSecurityJumpsuit
-
-- type: startingGear
   id: HeadofSecurityJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitHoS
 
 - type: loadout
-  id: HeadofSecurityJumpskirt
-  equipment: HeadofSecurityJumpskirt
-
-- type: startingGear
   id: HeadofSecurityJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtHoS
 
 - type: loadout
-  id: HeadofSecurityTurtleneck
-  equipment: HeadofSecurityTurtleneck
-
-- type: startingGear
   id: HeadofSecurityTurtleneck
   equipment:
     jumpsuit: ClothingUniformJumpsuitHoSAlt
 
 - type: loadout
-  id: HeadofSecurityTurtleneckSkirt
-  equipment: HeadofSecurityTurtleneckSkirt
-
-- type: startingGear
   id: HeadofSecurityTurtleneckSkirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtHoSAlt
 
 - type: loadout
-  id: HeadofSecurityFormalSuit
-  equipment: HeadofSecurityFormalSuit
-
-- type: startingGear
   id: HeadofSecurityFormalSuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitHosFormal
 
 - type: loadout
-  id: HeadofSecurityFormalSkirt
-  equipment: HeadofSecurityFormalSkirt
-
-- type: startingGear
   id: HeadofSecurityFormalSkirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtHosFormal
-    
-- type: loadout # DeltaV
-  id: HeadofSecurityParadeSuit
-  equipment: HeadofSecurityParadeSuit
 
-- type: startingGear # DeltaV
+- type: loadout # DeltaV
   id: HeadofSecurityParadeSuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitHoSParadeMale
 
 - type: loadout # DeltaV
-  id: HeadofSecurityParadeSkirt
-  equipment: HeadofSecurityParadeSkirt
-
-- type: startingGear # DeltaV
   id: HeadofSecurityParadeSkirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtHoSParadeMale
 
 # Head
 - type: loadout
-  id: HeadofSecurityHead
-  equipment: HeadofSecurityHead
-
-- type: startingGear
   id: HeadofSecurityHead
   equipment:
     head: ClothingHeadHatHoshat
 
 - type: loadout
-  id: HeadofSecurityBeret
-  equipment: HeadofSecurityBeret
-
-- type: startingGear
   id: HeadofSecurityBeret
   equipment:
     head: ClothingHeadHatBeretHoS
 
 # Neck
 - type: loadout
-  id: HeadofSecurityCloak
-  equipment: HeadofSecurityCloak
-
-- type: startingGear
   id: HeadofSecurityCloak
   equipment:
     neck: ClothingNeckCloakHos
 
 - type: loadout
-  id: HeadofSecurityMantle
-  equipment: HeadofSecurityMantle
-
-- type: startingGear
   id: HeadofSecurityMantle
   equipment:
     neck: ClothingNeckMantleHOS
 
 # OuterClothing
 - type: loadout
-  id: HeadofSecurityCoat
-  equipment: HeadofSecurityCoat
-
-- type: startingGear
   id: HeadofSecurityCoat
   equipment:
     outerClothing: ClothingOuterCoatHoSTrench
 
 - type: loadout
-  id: HeadofSecurityWinterCoat
-  equipment: HeadofSecurityWinterCoat
-
-- type: startingGear
   id: HeadofSecurityWinterCoat
   equipment:
     outerClothing: ClothingOuterWinterHoS
 
 # Shoes - DeltaV
 - type: loadout # DeltaV
-  id: HeadOfSecurityWinterBoots
-  equipment: HeadOfSecurityWinterBoots
-
-- type: startingGear # DeltaV
   id: HeadOfSecurityWinterBoots
   equipment:
     shoes: ClothingShoesBootsWinterHeadOfSecurity
diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_cadet.yml
index bc19900e5bd..94f889fc797 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Security/security_cadet.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_cadet.yml
@@ -1,18 +1,10 @@
 # Jumpsuit
 - type: loadout
-  id: RedJumpsuit
-  equipment: RedJumpsuit
-
-- type: startingGear
   id: RedJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorRed
 
 - type: loadout
-  id: RedJumpskirt
-  equipment: RedJumpskirt
-
-- type: startingGear
   id: RedJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtColorRed
diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
index 20ba1c2e693..66ceceffd88 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
@@ -16,250 +16,146 @@
 
 # Head
 - type: loadout
-  id: SecurityHelmet
-  equipment: SecurityHelmet
-
-- type: startingGear
   id: SecurityHelmet
   equipment:
     head: ClothingHeadHelmetBasic
 
 - type: loadout
-  id: SecurityHat
-  equipment: SecurityHat
-
-- type: startingGear
   id: SecurityHat
   equipment:
     head: ClothingHeadHatSecsoft
 
 - type: loadout
-  id: SecurityBeret
-  equipment: SecurityBeret
-
-- type: startingGear
   id: SecurityBeret
   equipment:
     head: ClothingHeadHatBeretSecurity
 
 # Jumpsuit
 - type: loadout
-  id: SecurityJumpsuit
-  equipment: SecurityJumpsuit
-
-- type: startingGear
   id: SecurityJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitSec
 
 - type: loadout
-  id: SecurityJumpskirt
-  equipment: SecurityJumpskirt
-
-- type: startingGear
   id: SecurityJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtSec
 
 - type: loadout
-  id: SecurityJumpsuitGrey
-  equipment: SecurityJumpsuitGrey
-
-- type: startingGear
   id: SecurityJumpsuitGrey
   equipment:
     jumpsuit: ClothingUniformJumpsuitSecGrey
 
 - type: loadout
-  id: SecurityJumpskirtGrey
-  equipment: SecurityJumpskirtGrey
-
-- type: startingGear
   id: SecurityJumpskirtGrey
   equipment:
     jumpsuit: ClothingUniformJumpskirtSecGrey
 
 - type: loadout # DeltaV
-  id: SecurityJumpsuitBlue
-  equipment: SecurityJumpsuitBlue
-
-- type: startingGear # DeltaV
   id: SecurityJumpsuitBlue
   equipment:
     jumpsuit: ClothingUniformJumpsuitSecBlue
 
 - type: loadout # DeltaV
-  id: SecurityJumpskirtBlue
-  equipment: SecurityJumpskirtBlue
-
-- type: startingGear # DeltaV
   id: SecurityJumpskirtBlue
   equipment:
     jumpsuit: ClothingUniformJumpskirtSecBlue
 
 - type: loadout
   id: SeniorOfficerJumpsuit
-  equipment: SeniorOfficerJumpsuit
   effects:
   - !type:GroupLoadoutEffect
     proto: SeniorOfficer
-
-- type: startingGear
-  id: SeniorOfficerJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitSeniorOfficer
 
 - type: loadout
   id: SeniorOfficerJumpskirt
-  equipment: SeniorOfficerJumpskirt
   effects:
   - !type:GroupLoadoutEffect
     proto: SeniorOfficer
-
-- type: startingGear
-  id: SeniorOfficerJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtSeniorOfficer
 
 # Back
 - type: loadout
-  id: SecurityBackpack
-  equipment: SecurityBackpack
-
-- type: startingGear
   id: SecurityBackpack
   equipment:
-    back: ClothingBackpackSecurityFilled
+    back: ClothingBackpackSecurity
 
 - type: loadout
-  id: SecuritySatchel
-  equipment: SecuritySatchel
-
-- type: startingGear
   id: SecuritySatchel
   equipment:
-    back: ClothingBackpackSatchelSecurityFilled
+    back: ClothingBackpackSatchelSecurity
 
 - type: loadout
-  id: SecurityDuffel
-  equipment: SecurityDuffel
-
-- type: startingGear
   id: SecurityDuffel
   equipment:
-    back: ClothingBackpackDuffelSecurityFilled
+    back: ClothingBackpackDuffelSecurity
 
 # Belt
 - type: loadout
-  id: SecurityBelt
-  equipment: SecurityBelt
-
-- type: startingGear
   id: SecurityBelt
   equipment:
     belt: ClothingBeltSecurityFilled
 
 - type: loadout
-  id: SecurityWebbing
-  equipment: SecurityWebbing
-
-- type: startingGear
   id: SecurityWebbing
   equipment:
     belt: ClothingBeltSecurityWebbingFilled
 
 # Outerclothing
 - type: loadout
-  id: ArmorVest
-  equipment: ArmorVest
-
-- type: startingGear
   id: ArmorVest
   equipment:
     outerClothing: ClothingOuterArmorBasic
 
 - type: loadout # DeltaV
-  id: PlateCarrier
-  equipment: PlateCarrier
-
-- type: startingGear # DeltaV
   id: PlateCarrier
   equipment:
     outerClothing: ClothingOuterArmorPlateCarrier
 
 - type: loadout # DeltaV
-  id: DuraVest
-  equipment: DuraVest
-
-- type: startingGear # DeltaV
   id: DuraVest
   equipment:
     outerClothing: ClothingOuterArmorDuraVest
 
 - type: loadout
-  id: ArmorVestSlim
-  equipment: ArmorVestSlim
-
-- type: startingGear
   id: ArmorVestSlim
   equipment:
     outerClothing: ClothingOuterArmorBasicSlim
 
 - type: loadout
-  id: SecurityOfficerWintercoat
-  equipment: SecurityOfficerWintercoat
-
-- type: startingGear
   id: SecurityOfficerWintercoat
   equipment:
     outerClothing: ClothingOuterWinterSec
 
 # Shoes
 - type: loadout
-  id: CombatBoots
-  equipment: CombatBoots
-
-- type: startingGear
   id: CombatBoots
   equipment:
     shoes: ClothingShoesBootsCombatFilled
 
-- type: loadout # DeltaV
-  id: JackBoots
-  equipment: JackBoots
-
-- type: startingGear # DeltaV
+- type: loadout
   id: JackBoots
   equipment:
     shoes: ClothingShoesBootsJackFilled
 
 - type: loadout
-  id: SecurityWinterBoots
-  equipment: SecurityWinterBoots
-
-- type: startingGear
   id: SecurityWinterBoots
   equipment:
-    shoes: ClothingShoesBootsWinterSec
+    shoes: ClothingShoesBootsWinterSecFilled
 
 # PDA
 - type: loadout
-  id: SecurityPDA
-  equipment: SecurityPDA
-
-- type: startingGear
   id: SecurityPDA
   equipment:
     id: SecurityPDA
 
 - type: loadout
   id: SeniorOfficerPDA
-  equipment: SeniorOfficerPDA
   effects:
   - !type:GroupLoadoutEffect
     proto: SeniorOfficer
-
-- type: startingGear
-  id: SeniorOfficerPDA
   equipment:
     id: SeniorOfficerPDA
diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml b/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml
index e3a39d709e4..9c270e6d6fd 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml
@@ -1,56 +1,32 @@
 # Head
 - type: loadout
-  id: WardenHead
-  equipment: WardenHead
-
-- type: startingGear
   id: WardenHead
   equipment:
     head: ClothingHeadHatWarden
 
 - type: loadout
-  id: WardenBeret
-  equipment: WardenBeret
-
-- type: startingGear
   id: WardenBeret
   equipment:
     head: ClothingHeadHatBeretWarden
 
 # Jumpsuit
 - type: loadout
-  id: WardenJumpsuit
-  equipment: WardenJumpsuit
-
-- type: startingGear
   id: WardenJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitWarden
 
 - type: loadout
-  id: WardenJumpskirt
-  equipment: WardenJumpskirt
-
-- type: startingGear
   id: WardenJumpskirt
   equipment:
     jumpsuit: ClothingUniformJumpskirtWarden
 
 # OuterClothing
 - type: loadout
-  id: WardenCoat
-  equipment: WardenCoat
-
-- type: startingGear
   id: WardenCoat
   equipment:
     outerClothing: ClothingOuterCoatWarden
 
 - type: loadout
-  id: WardenArmoredWinterCoat
-  equipment: WardenArmoredWinterCoat
-
-- type: startingGear
   id: WardenArmoredWinterCoat
   equipment:
     outerClothing: ClothingOuterWinterWarden
diff --git a/Resources/Prototypes/Loadouts/Jobs/Wildcards/boxer.yml b/Resources/Prototypes/Loadouts/Jobs/Wildcards/boxer.yml
index 02f0b68c244..a9833798c76 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Wildcards/boxer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Wildcards/boxer.yml
@@ -1,55 +1,31 @@
 # Jumpsuit
 - type: loadout
-  id: BoxerShorts
-  equipment: BoxerShorts
-
-- type: startingGear
   id: BoxerShorts
   equipment:
     jumpsuit: UniformShortsRed
 
 - type: loadout
-  id: BoxerShortsWithTop
-  equipment: BoxerShortsWithTop
-
-- type: startingGear
   id: BoxerShortsWithTop
   equipment:
     jumpsuit: UniformShortsRedWithTop
 
 # Gloves
 - type: loadout
-  id: RedBoxingGloves
-  equipment: RedBoxingGloves
-
-- type: startingGear
   id: RedBoxingGloves
   equipment:
     gloves: ClothingHandsGlovesBoxingRed
 
 - type: loadout
-  id: BlueBoxingGloves
-  equipment: BlueBoxingGloves
-
-- type: startingGear
   id: BlueBoxingGloves
   equipment:
     gloves: ClothingHandsGlovesBoxingBlue
 
 - type: loadout
-  id: GreenBoxingGloves
-  equipment: GreenBoxingGloves
-
-- type: startingGear
   id: GreenBoxingGloves
   equipment:
     gloves: ClothingHandsGlovesBoxingGreen
 
 - type: loadout
-  id: YellowBoxingGloves
-  equipment: YellowBoxingGloves
-
-- type: startingGear
   id: YellowBoxingGloves
   equipment:
     gloves: ClothingHandsGlovesBoxingYellow
diff --git a/Resources/Prototypes/Loadouts/Jobs/Wildcards/reporter.yml b/Resources/Prototypes/Loadouts/Jobs/Wildcards/reporter.yml
index 7703e036f2b..5dfb1319880 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Wildcards/reporter.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Wildcards/reporter.yml
@@ -1,18 +1,10 @@
 # Jumpsuit
 - type: loadout
-  id: ReporterJumpsuit
-  equipment: ReporterJumpsuit
-
-- type: startingGear
   id: ReporterJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitReporter
 
 - type: loadout
-  id: JournalistJumpsuit
-  equipment: JournalistJumpsuit
-
-- type: startingGear
   id: JournalistJumpsuit
   equipment:
     jumpsuit: ClothingUniformJumpsuitJournalist
diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml b/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml
index c141d270810..41cad93a21f 100644
--- a/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml
@@ -29,10 +29,6 @@
 # Basic options
 # Glasses
 - type: loadout
-  id: Glasses
-  equipment: Glasses
-
-- type: startingGear
   id: Glasses
   equipment:
     eyes: ClothingEyesGlasses
@@ -41,38 +37,26 @@
 # Jamjar
 - type: loadout
   id: GlassesJamjar
-  equipment: GlassesJamjar
   effects:
   - !type:GroupLoadoutEffect
     proto: JamjarTimer
-
-- type: startingGear
-  id: GlassesJamjar
   equipment:
     eyes: ClothingEyesGlassesJamjar
 
 # Jensen
 - type: loadout
   id: GlassesJensen
-  equipment: GlassesJensen
   effects:
   - !type:GroupLoadoutEffect
     proto: JensenTimer
-
-- type: startingGear
-  id: GlassesJensen
   equipment:
     eyes: ClothingEyesGlassesJensen
 
 # Cheap Sunglasses - DeltaV
 - type: loadout # DeltaV
   id: GlassesCheapSunglasses
-  equipment: GlassesCheapSunglasses
   effects:
   - !type:GroupLoadoutEffect
     proto: CheapSunglassesTimer
-  
-- type: startingGear # DeltaV
-  id: GlassesCheapSunglasses
   equipment:
     eyes: ClothingEyesGlassesCheapSunglasses
diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/instruments.yml b/Resources/Prototypes/Loadouts/Miscellaneous/instruments.yml
index 5b7e46151fe..21b9070b0dc 100644
--- a/Resources/Prototypes/Loadouts/Miscellaneous/instruments.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/instruments.yml
@@ -1,279 +1,167 @@
 # Instruments
 - type: loadout
-  id: Glockenspiel
-  equipment: Glockenspiel
-
-- type: startingGear
   id: Glockenspiel
   storage:
     back:
     - GlockenspielInstrument
 
 - type: loadout
-  id: MusicBox
-  equipment: MusicBox
-
-- type: startingGear
   id: MusicBox
   storage:
     back:
     - MusicBoxInstrument
 
 - type: loadout
-  id: Xylophone
-  equipment: Xylophone
-
-- type: startingGear
   id: Xylophone
   storage:
     back:
     - XylophoneInstrument
 
 - type: loadout
-  id: Microphone
-  equipment: Microphone
-
-- type: startingGear
   id: Microphone
   storage:
     back:
     - MicrophoneInstrument
 
 - type: loadout
-  id: Synthesizer
-  equipment: Synthesizer
-
-- type: startingGear
   id: Synthesizer
   storage:
     back:
     - SynthesizerInstrument
 
 - type: loadout
-  id: Kalimba
-  equipment: Kalimba
-
-- type: startingGear
   id: Kalimba
   storage:
     back:
     - KalimbaInstrument
 
 - type: loadout
-  id: Woodblock
-  equipment: Woodblock
-
-- type: startingGear
   id: Woodblock
   storage:
     back:
     - WoodblockInstrument
 
 - type: loadout
-  id: ElectricGuitar
-  equipment: ElectricGuitar
-
-- type: startingGear
   id: ElectricGuitar
   storage:
     back:
     - ElectricGuitarInstrument
 
 - type: loadout
-  id: BassGuitar
-  equipment: BassGuitar
-
-- type: startingGear
   id: BassGuitar
   storage:
     back:
     - BassGuitarInstrument
 
 - type: loadout
-  id: RockGuitar
-  equipment: RockGuitar
-
-- type: startingGear
   id: RockGuitar
   storage:
     back:
     - RockGuitarInstrument
 
 - type: loadout
-  id: AcousticGuitar
-  equipment: AcousticGuitar
-
-- type: startingGear
   id: AcousticGuitar
   storage:
     back:
     - AcousticGuitarInstrument
 
 - type: loadout
-  id: Banjo
-  equipment: Banjo
-
-- type: startingGear
   id: Banjo
   storage:
     back:
     - BanjoInstrument
 
 - type: loadout
-  id: Violin
-  equipment: Violin
-
-- type: startingGear
   id: Violin
   storage:
     back:
     - ViolinInstrument
 
 - type: loadout
-  id: Viola
-  equipment: Viola
-
-- type: startingGear
   id: Viola
   storage:
     back:
     - ViolaInstrument
 
 - type: loadout
-  id: Cello
-  equipment: Cello
-
-- type: startingGear
   id: Cello
   storage:
     back:
     - CelloInstrument
 
 - type: loadout
-  id: Trumpet
-  equipment: Trumpet
-
-- type: startingGear
   id: Trumpet
   storage:
     back:
     - TrumpetInstrument
 
 - type: loadout
-  id: Trombone
-  equipment: Trombone
-
-- type: startingGear
   id: Trombone
   storage:
     back:
     - TromboneInstrument
 
 - type: loadout
-  id: FrenchHorn
-  equipment: FrenchHorn
-
-- type: startingGear
   id: FrenchHorn
   storage:
     back:
     - FrenchHornInstrument
 
 - type: loadout
-  id: Euphonium
-  equipment: Euphonium
-
-- type: startingGear
   id: Euphonium
   storage:
     back:
     - EuphoniumInstrument
 
 - type: loadout
-  id: Saxophone
-  equipment: Saxophone
-
-- type: startingGear
   id: Saxophone
   storage:
     back:
     - SaxophoneInstrument
 
 - type: loadout
-  id: Accordion
-  equipment: Accordion
-
-- type: startingGear
   id: Accordion
   storage:
     back:
     - AccordionInstrument
 
 - type: loadout
-  id: Harmonica
-  equipment: Harmonica
-
-- type: startingGear
   id: Harmonica
   storage:
     back:
     - HarmonicaInstrument
 
 - type: loadout
-  id: Clarinet
-  equipment: Clarinet
-
-- type: startingGear
   id: Clarinet
   storage:
     back:
     - ClarinetInstrument
 
 - type: loadout
-  id: Flute
-  equipment: Flute
-
-- type: startingGear
   id: Flute
   storage:
     back:
     - FluteInstrument
 
 - type: loadout
-  id: Recorder
-  equipment: Recorder
-
-- type: startingGear
   id: Recorder
   storage:
     back:
     - RecorderInstrument
 
 - type: loadout
-  id: PanFlute
-  equipment: PanFlute
-
-- type: startingGear
   id: PanFlute
   storage:
     back:
     - PanFluteInstrument
 
 - type: loadout
-  id: Ocarina
-  equipment: Ocarina
-
-- type: startingGear
   id: Ocarina
   storage:
     back:
     - OcarinaInstrument
 
 - type: loadout
-  id: Bagpipe
-  equipment: Bagpipe
-
-- type: startingGear
   id: Bagpipe
   storage:
     back:
diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml b/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml
new file mode 100644
index 00000000000..56d6eb36811
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml
@@ -0,0 +1,209 @@
+# Species
+- type: loadoutEffectGroup
+  id: NitrogenBreather
+  effects:
+  - !type:SpeciesLoadoutEffect
+    species:
+    - SlimePerson
+    - Vox
+
+- type: loadoutEffectGroup
+  id: OxygenBreather
+  effects:
+  - !type:SpeciesLoadoutEffect
+    species:
+    - Arachnid
+    - Diona
+    - Dwarf
+    - Human
+    - Moth
+    - Reptilian
+    # Begin DeltaV additions
+    - Felinid
+    - Harpy
+    - Oni
+    - Vulpkanin
+    # End DeltaV additions
+
+- type: loadoutEffectGroup
+  id: EffectSpeciesVox
+  effects:
+  - !type:SpeciesLoadoutEffect
+    species:
+    - Vox
+
+# Basic
+- type: loadout
+  id: EmergencyOxygen
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: OxygenBreather
+  storage:
+    back:
+    - BoxSurvival
+
+- type: loadout
+  id: EmergencyNitrogen
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: NitrogenBreather
+  storage:
+    back:
+    - BoxSurvivalNitrogen
+
+# Clown
+- type: loadout
+  id: EmergencyOxygenClown
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: OxygenBreather
+  storage:
+    back:
+    - BoxHug
+
+- type: loadout
+  id: EmergencyNitrogenClown
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: NitrogenBreather
+  storage:
+    back:
+    - BoxHugNitrogen
+
+# Engineering / Extended
+- type: loadout
+  id: EmergencyOxygenExtended
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: OxygenBreather
+  storage:
+    back:
+    - BoxSurvivalEngineering
+
+- type: loadout
+  id: EmergencyNitrogenExtended
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: NitrogenBreather
+  storage:
+    back:
+    - BoxSurvivalEngineeringNitrogen
+
+# Medical
+- type: loadout
+  id: EmergencyOxygenMedical
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: OxygenBreather
+  storage:
+    back:
+    - BoxSurvivalMedical
+
+- type: loadout
+  id: EmergencyNitrogenMedical
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: NitrogenBreather
+  storage:
+    back:
+    - BoxSurvivalMedicalNitrogen
+
+# Security
+- type: loadout
+  id: EmergencyOxygenSecurity
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: OxygenBreather
+  storage:
+    back:
+    - BoxSurvivalSecurity
+
+- type: loadout
+  id: EmergencyNitrogenSecurity
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: NitrogenBreather
+  storage:
+    back:
+    - BoxSurvivalSecurityNitrogen
+
+# Syndicate
+- type: loadout
+  id: EmergencyOxygenSyndicate
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: OxygenBreather
+  storage:
+    back:
+    - BoxSurvivalSyndicate
+
+- type: loadout
+  id: EmergencyNitrogenSyndicate
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: NitrogenBreather
+  storage:
+    back:
+    - BoxSurvivalSyndicateNitrogen
+
+# Pre-equipped species gear
+
+# Full tank for vox as part of any Survival loadout
+- type: loadout
+  id: LoadoutSpeciesVoxNitrogen
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: EffectSpeciesVox
+  equipment:
+    suitstorage: NitrogenTankFilled
+
+# Full EVA Tank, Any Species
+- type: loadout
+  id: LoadoutSpeciesEVANitrogen
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: NitrogenBreather
+  equipment:
+    suitstorage: NitrogenTankFilled
+
+- type: loadout
+  id: LoadoutSpeciesEVAOxygen
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: OxygenBreather
+  equipment:
+    suitstorage: OxygenTankFilled
+
+# Tank Harness
+- type: loadout
+  id: LoadoutTankHarness
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: EffectSpeciesVox
+  equipment:
+    outerClothing: ClothingOuterVestTank
+
+# Breath Tool On Face
+- type: loadout
+  id: LoadoutSpeciesBreathTool
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: EffectSpeciesVox
+  equipment:
+    mask: ClothingMaskBreath
+
+- type: loadout
+  id: LoadoutSpeciesBreathToolMedical
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: EffectSpeciesVox
+  equipment:
+    mask: ClothingMaskBreathMedical
+
+- type: loadout
+  id: LoadoutSpeciesBreathToolSecurity
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: EffectSpeciesVox
+  equipment:
+    mask: ClothingMaskGasSecurity
diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
index fe826a83340..c91108124f9 100644
--- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
@@ -10,20 +10,12 @@
 
 # Plushies
 - type: loadout
-  id: PlushieLizard
-  equipment: PlushieLizard
-
-- type: startingGear
   id: PlushieLizard
   storage:
     back:
     - PlushieLizard
-    
-- type: loadout
-  id: PlushieSpaceLizard
-  equipment: PlushieSpaceLizard
 
-- type: startingGear
+- type: loadout
   id: PlushieSpaceLizard
   storage:
     back:
@@ -31,50 +23,30 @@
 
 # Smokeables
 - type: loadout
-  id: Lighter
-  equipment: Lighter
-
-- type: startingGear
   id: Lighter
   storage:
     back:
     - Lighter
 
 - type: loadout
-  id: CigPackGreen
-  equipment: CigPackGreen
-
-- type: startingGear
   id: CigPackGreen
   storage:
     back:
     - CigPackGreen
 
 - type: loadout
-  id: CigPackRed
-  equipment: CigPackRed
-
-- type: startingGear
   id: CigPackRed
   storage:
     back:
     - CigPackRed
 
 - type: loadout
-  id: CigPackBlue
-  equipment: CigPackBlue
-
-- type: startingGear
   id: CigPackBlue
   storage:
     back:
     - CigPackBlue
 
 - type: loadout
-  id: CigPackBlack
-  equipment: CigPackBlack
-
-- type: startingGear
   id: CigPackBlack
   storage:
     back:
@@ -82,136 +54,84 @@
 
 - type: loadout
   id: CigarCase
-  equipment: CigarCase
   effects:
   - !type:GroupLoadoutEffect
     proto: Command
-
-- type: startingGear
-  id: CigarCase
   storage:
     back:
     - CigarCase
 
 - type: loadout
   id: CigarGold
-  equipment: CigarGold
   effects:
   - !type:GroupLoadoutEffect
     proto: Command
-
-- type: startingGear
-  id: CigarGold
   storage:
     back:
     - CigarGold
 
 # Pins
 - type: loadout
-  id: ClothingNeckLGBTPin
-  equipment: ClothingNeckLGBTPin
-
-- type: startingGear
   id: ClothingNeckLGBTPin
   storage:
     back:
     - ClothingNeckLGBTPin
 
 - type: loadout
-  id: ClothingNeckAromanticPin
-  equipment: ClothingNeckAromanticPin
-
-- type: startingGear
   id: ClothingNeckAromanticPin
   storage:
     back:
     - ClothingNeckAromanticPin
 
 - type: loadout
-  id: ClothingNeckAsexualPin
-  equipment: ClothingNeckAsexualPin
-
-- type: startingGear
   id: ClothingNeckAsexualPin
   storage:
     back:
     - ClothingNeckAsexualPin
 
 - type: loadout
-  id: ClothingNeckBisexualPin
-  equipment: ClothingNeckBisexualPin
-
-- type: startingGear
   id: ClothingNeckBisexualPin
   storage:
     back:
     - ClothingNeckBisexualPin
 
 - type: loadout
-  id: ClothingNeckIntersexPin
-  equipment: ClothingNeckIntersexPin
-
-- type: startingGear
   id: ClothingNeckIntersexPin
   storage:
     back:
     - ClothingNeckIntersexPin
 
 - type: loadout
-  id: ClothingNeckLesbianPin
-  equipment: ClothingNeckLesbianPin
-
-- type: startingGear
   id: ClothingNeckLesbianPin
   storage:
     back:
     - ClothingNeckLesbianPin
 
 - type: loadout
-  id: ClothingNeckNonBinaryPin
-  equipment: ClothingNeckNonBinaryPin
-
-- type: startingGear
   id: ClothingNeckNonBinaryPin
   storage:
     back:
     - ClothingNeckNonBinaryPin
 
 - type: loadout
-  id: ClothingNeckPansexualPin
-  equipment: ClothingNeckPansexualPin
-
-- type: startingGear
   id: ClothingNeckPansexualPin
   storage:
     back:
     - ClothingNeckPansexualPin
 
 - type: loadout
-  id: ClothingNeckTransPin
-  equipment: ClothingNeckTransPin
-
-- type: startingGear
   id: ClothingNeckTransPin
   storage:
     back:
     - ClothingNeckTransPin
 
 - type: loadout
-  id: ClothingNeckAutismPin
-  equipment: ClothingNeckAutismPin
-
-- type: startingGear
   id: ClothingNeckAutismPin
   storage:
     back:
     - ClothingNeckAutismPin
 
 - type: loadout
-  id: ClothingNeckGoldAutismPin
-  equipment: ClothingNeckGoldAutismPin
-
-- type: startingGear
   id: ClothingNeckGoldAutismPin
   storage:
     back:
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index dea95fc4716..885809db49d 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -36,15 +36,31 @@
   - GlassesJamjar
   - GlassesJensen
 
-#- type: loadoutGroup
-#  id: Survival
-#  name: loadout-group-survival-basic
-#  minLimit: 1
-#  maxLimit: 1
-#  hidden: true
-#  loadouts:
-#  - EmergencyNitrogen
-#  - EmergencyOxygen
+- type: loadoutGroup
+  id: GroupTankHarness
+  name: loadout-group-tank-harness
+  minLimit: 1
+  hidden: true
+  loadouts:
+  - LoadoutTankHarness
+
+- type: loadoutGroup
+  id: Survival
+  name: loadout-group-survival-basic
+  minLimit: 3
+  hidden: true
+  loadouts:
+  - EmergencyNitrogen
+  - EmergencyOxygen
+  - LoadoutSpeciesVoxNitrogen
+
+- type: loadoutGroup
+  id: GroupEVATank
+  name: loadout-group-EVA-tank
+  hidden: true
+  loadouts:
+  - LoadoutSpeciesEVANitrogen
+  - LoadoutSpeciesEVAOxygen
 
 # Command
 - type: loadoutGroup
@@ -145,9 +161,9 @@
   id: HoPBackpack
   name: loadout-group-hop-backpack
   loadouts:
-  - HoPBackpack
-  - HoPSatchel
-  - HoPDuffel
+  - CommonBackpack
+  - CommonSatchel
+  - CommonDuffel
   - HoPBackpackIan
 
 - type: loadoutGroup
@@ -184,8 +200,8 @@
   - CasualRedSuit
   - CasualPurpleSkirt
   - CasualPurpleSuit # End DeltaV Changes
-  - RainbowJumpsuit
   - AncientJumpsuit
+  - RainbowJumpsuit
 
 - type: loadoutGroup
   id: PassengerFace
@@ -203,7 +219,7 @@
 
 - type: loadoutGroup
   id: CommonBackpack
-  name: loadout-group-passenger-backpack
+  name: loadout-group-backpack
   loadouts:
   - CommonBackpack
   - CommonSatchel
@@ -337,14 +353,6 @@
   - ScarfBlack # Delta V
   - ScarfPurple # Delta V
 
-- type: loadoutGroup
-  id: LawyerBackpack
-  name: loadout-group-lawyer-backpack
-  loadouts:
-  - LawyerBackpack
-  - LawyerSatchel
-  - LawyerDuffel
-
 - type: loadoutGroup
   id: ChaplainHead
   name: loadout-group-chaplain-head
@@ -372,14 +380,6 @@
   - ChaplainRobesLight
   - ChaplainRobesDark
 
-- type: loadoutGroup
-  id: ChaplainBackpack
-  name: loadout-group-chaplain-backpack
-  loadouts:
-  - ChaplainBackpack
-  - ChaplainSatchel
-  - ChaplainDuffel
-
 - type: loadoutGroup
   id: ChaplainOuterClothing
   name: loadout-group-chaplain-outerclothing
@@ -519,6 +519,16 @@
   - ClownShoes
   - JesterShoes
 
+- type: loadoutGroup
+  id: SurvivalClown
+  name: loadout-group-survival-clown
+  minLimit: 2
+  hidden: true
+  loadouts:
+  - EmergencyNitrogenClown
+  - EmergencyOxygenClown
+  - LoadoutSpeciesVoxNitrogen
+
 - type: loadoutGroup
   id: MimeHead
   name: loadout-group-mime-head
@@ -575,14 +585,6 @@
   - ScarfPurple
   - ScarfZebra
 
-- type: loadoutGroup
-  id: MusicianBackpack
-  name: loadout-group-musician-backpack
-  loadouts:
-  - MusicianBackpack
-  - MusicianSatchel
-  - MusicianDuffel
-
 - type: loadoutGroup
   id: MusicianJumpsuit
   name: loadout-group-musician-jumpsuit
@@ -652,14 +654,6 @@
   - QuartermasterTurtleneckSkirt
   - QuartermasterFormalSuit
 
-- type: loadoutGroup
-  id: QuartermasterBackpack
-  name: loadout-group-quartermaster-backpack
-  loadouts:
-  - QuartermasterBackpack
-  - QuartermasterSatchel
-  - QuartermasterDuffel
-
 - type: loadoutGroup
   id: QuartermasterNeck
   name: loadout-group-quartermaster-neck
@@ -776,14 +770,6 @@
   - ChiefEngineerTurtleneck
   - ChiefEngineerTurtleneckSkirt
 
-- type: loadoutGroup
-  id: ChiefEngineerBackpack
-  name: loadout-group-chief-engineer-backpack
-  loadouts:
-  - ChiefEngineerBackpack
-  - ChiefEngineerSatchel
-  - ChiefEngineerDuffel
-
 - type: loadoutGroup
   id: ChiefEngineerNeck
   name: loadout-group-chief-engineer-neck
@@ -912,6 +898,16 @@
   - WhiteShoes
   - EngineeringWinterBoots
 
+- type: loadoutGroup
+  id: SurvivalExtended
+  name: loadout-group-survival-extended
+  minLimit: 2
+  hidden: true
+  loadouts:
+  - EmergencyNitrogenExtended
+  - EmergencyOxygenExtended
+  - LoadoutSpeciesVoxNitrogen
+
 # Science
 - type: loadoutGroup
   id: ResearchDirectorHead
@@ -939,14 +935,6 @@
   - ResearchDirectorJumpsuit
   - ResearchDirectorJumpskirt
 
-- type: loadoutGroup
-  id: ResearchDirectorBackpack
-  name: loadout-group-research-director-backpack
-  loadouts:
-  - ResearchDirectorBackpack
-  - ResearchDirectorSatchel
-  - ResearchDirectorDuffel
-
 - type: loadoutGroup
   id: ResearchDirectorOuterClothing
   name: loadout-group-research-director-outerclothing
@@ -1166,7 +1154,7 @@
   name: loadout-group-security-shoes
   loadouts:
   - CombatBoots
-  - JackBoots # DeltaV
+  - JackBoots
   - SecurityWinterBoots
 
 - type: loadoutGroup
@@ -1208,14 +1196,6 @@
   - NoirJumpsuit
   - NoirJumpskirt
 
-- type: loadoutGroup
-  id: DetectiveBackpack
-  name: loadout-group-detective-backpack
-  loadouts:
-  - DetectiveBackpack
-  - DetectiveSatchel
-  - DetectiveDuffel
-
 - type: loadoutGroup
   id: DetectiveOuterClothing
   name: loadout-group-detective-outerclothing
@@ -1231,12 +1211,15 @@
   - RedJumpsuit
   - RedJumpskirt
 
-- type: loadoutGroup # DeltaV
-  id: SecurityCadetHead
-  name: loadout-group-security-cadet-head
-  minLimit: 0
+- type: loadoutGroup
+  id: SurvivalSecurity
+  name: loadout-group-survival-security
+  minLimit: 2
+  hidden: true
   loadouts:
-  - MimeHead # DeltaV - Red Beret
+  - EmergencyNitrogenSecurity
+  - EmergencyOxygenSecurity
+  - LoadoutSpeciesVoxNitrogen
 
 # Medical
 - type: loadoutGroup
@@ -1264,14 +1247,6 @@
   - ChiefMedicalOfficerLabCoat
   - ChiefMedicalOfficerWintercoat
 
-- type: loadoutGroup
-  id: ChiefMedicalOfficerBackpack
-  name: loadout-group-chief-medical-officer-backpack
-  loadouts:
-  - ChiefMedicalOfficerBackpack
-  - ChiefMedicalOfficerSatchel
-  - ChiefMedicalOfficerDuffel
-
 - type: loadoutGroup
   id: ChiefMedicalOfficerNeck
   name: loadout-group-chief-medical-officer-neck
@@ -1455,14 +1430,6 @@
   - ParamedicWindbreaker
   - ParamedicWintercoat
 
-- type: loadoutGroup
-  id: ParamedicBackpack
-  name: loadout-group-paramedic-backpack
-  loadouts:
-  - ParamedicBackpack
-  - ParamedicSatchel
-  - ParamedicDuffel
-
 - type: loadoutGroup
   id: ParamedicShoes
   name: loadout-group-paramedic-shoes
@@ -1471,6 +1438,16 @@
   - MedicalWinterBoots
   - ParamedicWinterBoots # DeltaV
 
+- type: loadoutGroup
+  id: SurvivalMedical
+  name: loadout-group-survival-medical
+  minLimit: 2
+  hidden: true
+  loadouts:
+  - EmergencyNitrogenMedical
+  - EmergencyOxygenMedical
+  - LoadoutSpeciesVoxNitrogen
+
 # Wildcards
 - type: loadoutGroup
   id: ReporterJumpsuit
@@ -1494,3 +1471,41 @@
   - BlueBoxingGloves
   - GreenBoxingGloves
   - YellowBoxingGloves
+
+# Other
+- type: loadoutGroup
+  id: SurvivalSyndicate
+  name: loadout-group-survival-syndicate
+  minLimit: 2
+  hidden: true
+  loadouts:
+  - EmergencyNitrogenSyndicate
+  - EmergencyOxygenSyndicate
+  - LoadoutSpeciesVoxNitrogen
+
+- type: loadoutGroup
+  id: GroupSpeciesBreathTool
+  name: loadout-group-breath-tool
+  minLimit: 1
+  maxLimit: 1
+  hidden: true
+  loadouts:
+  - LoadoutSpeciesBreathTool
+
+- type: loadoutGroup
+  id: GroupSpeciesBreathToolMedical
+  name: loadout-group-breath-tool
+  minLimit: 1
+  maxLimit: 1
+  hidden: true
+  loadouts:
+  - LoadoutSpeciesBreathToolMedical
+
+- type: loadoutGroup
+  id: GroupSpeciesBreathToolSecurity
+  name: loadout-group-breath-tool
+  minLimit: 1
+  maxLimit: 1
+  hidden: true
+  loadouts:
+  - LoadoutSpeciesBreathToolSecurity
diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
index cac84ac8e3c..2876aec3020 100644
--- a/Resources/Prototypes/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -9,11 +9,14 @@
   - CaptainOuterClothing
   - CaptainGloves # DeltaV
   - CaptainShoes # DeltaV
+  - Survival
   - Trinkets
+  - GroupSpeciesBreathTool
 
 - type: roleLoadout
   id: JobHeadOfPersonnel
   groups:
+  - GroupTankHarness
   - HoPHead
   - HoPNeck
   - HoPJumpsuit
@@ -22,13 +25,16 @@
   - HoPGloves # DeltaV
   - HoPShoes # DeltaV
   - Glasses
+  - Survival
   - Trinkets
+  - GroupSpeciesBreathTool
 
 # Civilian
 - type: roleLoadout
   id: JobPassenger
   groups:
   - Scarfs # DeltaV
+  - GroupTankHarness
   - PassengerJumpsuit
   - CommonBackpack
   - PassengerFace
@@ -38,19 +44,24 @@
   - PassengerShoes
   - Glasses
   - Trinkets
+  - Survival
+  - Trinkets
+  - GroupSpeciesBreathTool
 
 - type: roleLoadout
   id: JobBartender
   groups:
+  - GroupTankHarness
   - BartenderHead
-  - BartenderGlasses # DeltaV
+  - BartenderGlasses # DeltaV - replaces Glasses
   - BartenderNeck # DeltaV
   - BartenderJumpsuit
   - CommonBackpack
   - BartenderOuterClothing
   - BartenderPDADelta # DeltaV
-  #- Glasses
+  - Survival
   - Trinkets
+  - GroupSpeciesBreathTool
 
 - type: roleLoadout
   id: JobServiceWorker
@@ -58,13 +69,17 @@
   - ServiceWorkerHead # DeltaV
   - Scarfs # DeltaV
   - ServiceWorkerJumpsuit # DeltaV, was BartenderJumpsuit
+  - GroupTankHarness
   - CommonBackpack
   - Glasses
+  - Survival
   - Trinkets
+  - GroupSpeciesBreathTool
 
 - type: roleLoadout
   id: JobChef
   groups:
+  - GroupTankHarness
   - ChefHead
   - ChefMask
   - ChefJumpsuit
@@ -72,41 +87,54 @@
   - ChefOuterClothing
   - ChefPDADelta # DeltaV
   - Glasses
+  - Survival
   - Trinkets
+  - GroupSpeciesBreathTool
 
 - type: roleLoadout
   id: JobLibrarian
   groups:
   - LibrarianNeck # DeltaV
+  - GroupTankHarness
   - LibrarianJumpsuit
   - CommonBackpack
   - Glasses
+  - Survival
   - Trinkets
+  - GroupSpeciesBreathTool
 
 - type: roleLoadout
   id: JobLawyer
   groups:
+  - GroupTankHarness
   - LawyerNeck
   - LawyerJumpsuit
-  - LawyerBackpack
+  - CommonBackpack
   - Glasses
   - Trinkets
+  - Survival
+  - Trinkets
+  - GroupSpeciesBreathTool
 
 - type: roleLoadout
   id: JobChaplain
   groups:
+  - GroupTankHarness
   - ChaplainHead
   - ChaplainMask
   - ChaplainNeck
   - ChaplainJumpsuit
-  - ChaplainBackpack
+  - CommonBackpack
   - ChaplainOuterClothing
   - Glasses
+  - Survival
   - Trinkets
+  - GroupSpeciesBreathTool
 
 - type: roleLoadout
   id: JobJanitor
   groups:
+  - GroupTankHarness
   - JanitorHead
   - JanitorNeck # DeltaV
   - JanitorJumpsuit
@@ -114,23 +142,29 @@
   - CommonBackpack
   - JanitorOuterClothing
   - Glasses
+  - Survival
   - Trinkets
   - JanitorPlunger
+  - GroupSpeciesBreathTool
 
 - type: roleLoadout
   id: JobBotanist
   groups:
+  - GroupTankHarness
   - BotanistHead
   - BotanistNeck # DeltaV
   - BotanistJumpsuit
   - BotanistBackpack
   - BotanistOuterClothing
   - Glasses
+  - Survival
   - Trinkets
+  - GroupSpeciesBreathTool
 
 - type: roleLoadout
   id: JobClown
   groups:
+  - GroupTankHarness
   - ClownHead
   - Scarfs # DeltaV
   - ClownJumpsuit
@@ -140,10 +174,12 @@
   - ClownShoes
   - Glasses
   - Trinkets
+  - SurvivalClown
 
 - type: roleLoadout
   id: JobMime
   groups:
+  - GroupTankHarness
   - MimeHead
   - MimeMask
   - MimeNeck # DeltaV
@@ -152,34 +188,42 @@
   - MimeOuterClothing
   - Glasses
   - Trinkets
+  - Survival
 
 - type: roleLoadout
   id: JobMusician
   groups:
+  - GroupTankHarness
   - MusicianJumpsuit
   - MusicianNeck
-  - MusicianBackpack
+  - CommonBackpack
   - MusicianOuterClothing
   - Glasses
+  - Survival
   - Trinkets
   - Instruments
+  - GroupSpeciesBreathTool
 
 # Cargo
 - type: roleLoadout
   id: JobQuartermaster
   groups:
+  - GroupTankHarness
   - QuartermasterHead
   - QuartermasterNeck
   - QuartermasterJumpsuit
-  - QuartermasterBackpack
+  - CargoTechnicianBackpack
   - QuartermasterOuterClothing
   - QuartermasterShoes
   - Glasses
+  - Survival
   - Trinkets
+  - GroupSpeciesBreathTool
 
 - type: roleLoadout
   id: JobCargoTechnician
   groups:
+  - GroupTankHarness
   - CargoTechnicianHead
   - CargoTechnicianNeck # DeltaV
   - CargoTechnicianJumpsuit
@@ -188,41 +232,54 @@
   - CargoPDADelta # DeltaV
   - CargoTechnicianShoes
   - Glasses
+  - Survival
   - Trinkets
+  - GroupSpeciesBreathTool
 
 - type: roleLoadout
   id: JobSalvageSpecialist
   groups:
   - SalvageSpecialistNeck # DeltaV
+  - GroupTankHarness
   - SalvageSpecialistBackpack
   - SalvageSpecialistOuterClothing
   - SalvagePDADelta # DeltaV
   - SalvageSpecialistShoes
   - Glasses
+  - Survival
   - Trinkets
+  - GroupSpeciesBreathTool
 
 # Engineering
 - type: roleLoadout
   id: JobChiefEngineer
   groups:
+  - GroupTankHarness
   - ChiefEngineerHead
   - ChiefEngineerJumpsuit
-  - ChiefEngineerBackpack
+  - StationEngineerBackpack
   - ChiefEngineerNeck
   - ChiefEngineerOuterClothing
   - ChiefEngineerShoes
   - Trinkets
+  - SurvivalExtended
+  - Trinkets
+  - GroupSpeciesBreathTool
 
 - type: roleLoadout
   id: JobTechnicalAssistant
   groups:
+  - GroupTankHarness
   - TechnicalAssistantJumpsuit
   - StationEngineerBackpack
+  - SurvivalExtended
   - Trinkets
+  - GroupSpeciesBreathTool
 
 - type: roleLoadout
   id: JobStationEngineer
   groups:
+  - GroupTankHarness
   - StationEngineerHead
   - StationEngineerNeck # DeltaV
   - StationEngineerJumpsuit
@@ -230,37 +287,47 @@
   - StationEngineerOuterClothing
   - StationEngineerShoes
   - StationEngineerID
+  - SurvivalExtended
   - Trinkets
+  - GroupSpeciesBreathTool
 
 - type: roleLoadout
   id: JobAtmosphericTechnician
   groups:
   - StationEngineerHead # DeltaV - Safety First!
   - AtmosphericTechnicianNeck # DeltaV
+  - GroupTankHarness
   - AtmosphericTechnicianJumpsuit
   - AtmosphericTechnicianBackpack
   - AtmosphericTechnicianOuterClothing
   - AtmosPDADelta # DeltaV
   - AtmosphericTechnicianShoes
   - Trinkets
+  - SurvivalExtended
+  - Trinkets
+  - GroupSpeciesBreathTool
 
 # Science
 - type: roleLoadout
   id: JobResearchDirector
   groups:
+  - GroupTankHarness
   - ResearchDirectorHead
   - ResearchDirectorNeck
   - ResearchDirectorJumpsuit
-  - ResearchDirectorBackpack
+  - ScientistBackpack
   - ResearchDirectorOuterClothing
   - ScientistGloves
   - ResearchDirectorShoes
   - Glasses
+  - Survival
   - Trinkets
+  - GroupSpeciesBreathTool
 
 - type: roleLoadout
   id: JobScientist
   groups:
+  - GroupTankHarness
   - ScientistHead
   - ScientistNeck
   - ScientistJumpsuit
@@ -270,15 +337,20 @@
   - ScientistShoes
   - ScientistPDA
   - Glasses
+  - Survival
   - Trinkets
+  - GroupSpeciesBreathTool
 
 - type: roleLoadout
   id: JobResearchAssistant
   groups:
+  - GroupTankHarness
   - ResearchAssistantJumpsuit
   - ScientistBackpack
   - Glasses
+  - Survival
   - Trinkets
+  - GroupSpeciesBreathTool
 
 # Security
 - type: roleLoadout
@@ -290,9 +362,10 @@
   - SecurityBackpack
   - SecurityBelt
   - HeadofSecurityOuterClothing
-  #- SecurityShoes
-  - HeadOfSecurityShoes # DeltaV
+  - HeadOfSecurityShoes # DeltaV, replaces SecurityShoes
+  - SurvivalSecurity
   - Trinkets
+  - GroupSpeciesBreathToolSecurity
 
 - type: roleLoadout
   id: JobWarden
@@ -304,7 +377,9 @@
   - SecurityBelt
   - WardenOuterClothing
   - SecurityShoes
+  - SurvivalSecurity
   - Trinkets
+  - GroupSpeciesBreathToolSecurity
 
 - type: roleLoadout
   id: JobSecurityOfficer
@@ -317,18 +392,23 @@
   - SecurityShoes
   - SecurityPDA
   - SecurityBelt
+  - SurvivalSecurity
   - Trinkets
+  - GroupSpeciesBreathToolSecurity
 
 - type: roleLoadout
   id: JobDetective
   groups:
+  - GroupTankHarness
   - DetectiveHead
   - DetectiveNeck
   - DetectiveJumpsuit
-  - DetectiveBackpack
+  - SecurityBackpack
   - DetectiveOuterClothing
   - SecurityShoes
+  - SurvivalSecurity
   - Trinkets
+  - GroupSpeciesBreathToolSecurity
 
 - type: roleLoadout
   id: JobSecurityCadet
@@ -337,26 +417,32 @@
   - SecurityNeck # DeltaV
   - SecurityCadetJumpsuit
   - SecurityBackpack
+  - SurvivalSecurity
   - Trinkets
+  - GroupSpeciesBreathToolSecurity
 
 # Medical
 - type: roleLoadout
   id: JobChiefMedicalOfficer
   groups:
+  - GroupTankHarness
   - ChiefMedicalOfficerHead
   - MedicalMask
   - ChiefMedicalOfficerJumpsuit
   - MedicalGloves
-  - ChiefMedicalOfficerBackpack
+  - MedicalBackpack
   - ChiefMedicalOfficerOuterClothing
   - ChiefMedicalOfficerNeck
   - ChiefMedicalOfficerShoes
   - Glasses
+  - SurvivalMedical
   - Trinkets
+  - GroupSpeciesBreathToolMedical
 
 - type: roleLoadout
   id: JobMedicalDoctor
   groups:
+  - GroupTankHarness
   - MedicalDoctorHead
   - MedicalDoctorNeck # DeltaV
   - MedicalMask
@@ -367,73 +453,144 @@
   - MedicalShoes
   - MedicalDoctorPDA
   - Glasses
+  - SurvivalMedical
   - Trinkets
+  - GroupSpeciesBreathToolMedical
 
 - type: roleLoadout
   id: JobMedicalIntern
   groups:
+  - GroupTankHarness
   - MedicalInternJumpsuit
   - MedicalBackpack
   - MedicalInternPDADelta # DeltaV
   - Glasses
+  - SurvivalMedical
   - Trinkets
+  - GroupSpeciesBreathToolMedical
 
 - type: roleLoadout
   id: JobChemist
   groups:
+  - GroupTankHarness
   - MedicalMask
   - ChemistNeck # DeltaV
   - ChemistJumpsuit
-#  - MedicalGloves
-  - ChemistGloves # DeltaV
+  - ChemistGloves # DeltaV, replaces MedicalGloves
   - ChemistBackpack
   - ChemistOuterClothing
-#  - MedicalShoes
-  - ChemistShoes # DeltaV
+  - ChemistShoes # DeltaV, replaces MedicalShoes
+  - SurvivalMedical
   - Trinkets
+  - GroupSpeciesBreathToolMedical
 
 - type: roleLoadout
   id: JobParamedic
   groups:
+  - GroupTankHarness
   - ParamedicHead
   - MedicalMask
   - MedicalDoctorNeck # DeltaV
   - ParamedicJumpsuit
   - MedicalGloves
-  - ParamedicBackpack
+  - MedicalBackpack
   - ParamedicOuterClothing
   - ParamedicShoes
   - Glasses
+  - SurvivalMedical
   - Trinkets
+  - GroupSpeciesBreathToolMedical
 
 # Wildcards
 - type: roleLoadout
   id: JobZookeeper
   groups:
+  - GroupTankHarness
   - CommonBackpack
   - Glasses
+  - Survival
   - Trinkets
+  - GroupSpeciesBreathTool
 
 - type: roleLoadout
   id: JobReporter
   groups:
+  - GroupTankHarness
   - ReporterJumpsuit
   - CommonBackpack
   - Glasses
+  - Survival
   - Trinkets
+  - GroupSpeciesBreathTool
 
 - type: roleLoadout
   id: JobPsychologist
   groups:
+  - GroupTankHarness
   - MedicalBackpack
   - Glasses
+  - SurvivalMedical # DeltaV, replaces Survival
   - Trinkets
+  - GroupSpeciesBreathTool
 
 - type: roleLoadout
   id: JobBoxer
   groups:
+  - GroupTankHarness
   - BoxerJumpsuit
   - BoxerGloves
   - CommonBackpack
   - Glasses
+  - Survival
   - Trinkets
+  - GroupSpeciesBreathTool
+
+# These loadouts are used for non-crew spawns, like off-station antags and event mobs
+# They will be used without player configuration, thus they will only ever apply what is forced by MinLimit
+
+- type: roleLoadout
+  id: RoleSurvivalStandard
+  groups:
+  - Survival
+  - GroupSpeciesBreathTool
+  - GroupTankHarness
+
+- type: roleLoadout
+  id: RoleSurvivalClown
+  groups:
+  - SurvivalClown
+  - GroupTankHarness
+
+- type: roleLoadout
+  id: RoleSurvivalExtended
+  groups:
+  - SurvivalExtended
+  - GroupSpeciesBreathTool
+  - GroupTankHarness
+
+- type: roleLoadout
+  id: RoleSurvivalMedical
+  groups:
+  - SurvivalMedical
+  - GroupSpeciesBreathToolMedical
+  - GroupTankHarness
+
+- type: roleLoadout
+  id: RoleSurvivalSecurity
+  groups:
+  - SurvivalSecurity
+  - GroupSpeciesBreathToolSecurity
+  - GroupTankHarness
+
+- type: roleLoadout
+  id: RoleSurvivalSyndicate
+  groups:
+  - SurvivalSyndicate
+  - GroupSpeciesBreathTool
+  - GroupTankHarness
+
+- type: roleLoadout
+  id: RoleSurvivalEVA
+  groups:
+  - GroupEVATank
+  - SurvivalExtended
diff --git a/Resources/Prototypes/Magic/forcewall_spells.yml b/Resources/Prototypes/Magic/forcewall_spells.yml
index f1865cf7229..3001f71421e 100644
--- a/Resources/Prototypes/Magic/forcewall_spells.yml
+++ b/Resources/Prototypes/Magic/forcewall_spells.yml
@@ -1,6 +1,6 @@
-- type: entity
+- type: entity
   id: ActionForceWall
-  name: Forcewall
+  name: forcewall
   description: Creates a magical barrier.
   components:
   - type: InstantAction
diff --git a/Resources/Prototypes/Maps/syndicate.yml b/Resources/Prototypes/Maps/syndicate.yml
deleted file mode 100644
index abb63126d9e..00000000000
--- a/Resources/Prototypes/Maps/syndicate.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- 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/NPCs/utility_queries.yml b/Resources/Prototypes/NPCs/utility_queries.yml
index 3d5385ecbcd..06bc0a9a9eb 100644
--- a/Resources/Prototypes/NPCs/utility_queries.yml
+++ b/Resources/Prototypes/NPCs/utility_queries.yml
@@ -131,6 +131,7 @@
             types:
               Blunt: 0
         - type: Item
+    - !type:RemoveAnchoredFilter
   considerations:
     - !type:TargetMeleeCon
       curve: !type:QuadraticCurve
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Uniforms/costumes.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Uniforms/costumes.yml
index c82dbffae86..3ff429b3fbd 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Uniforms/costumes.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Uniforms/costumes.yml
@@ -64,7 +64,7 @@
   - type: Clothing
     sprite: Nyanotrasen/Clothing/Uniforms/Costume/bunny.rsi
     # TODO: Remove the line below when the sprite accounts for FemaleMask.
-    femaleMask: NoMask
+    #femaleMask: NoMask
 
 - type: entity
   parent: ClothingUniformSkirtBase
@@ -110,7 +110,7 @@
   - type: Clothing
     sprite: Nyanotrasen/Clothing/Uniforms/Costume/rat.rsi
     # TODO: Remove the line below when the sprite accounts for FemaleMask.
-    femaleMask: NoMask
+    #femaleMask: NoMask
 
 - type: entity
   parent: ClothingUniformBase
@@ -122,7 +122,7 @@
     sprite: Nyanotrasen/Clothing/Uniforms/Costume/red_dress.rsi
   - type: Clothing
     sprite: Nyanotrasen/Clothing/Uniforms/Costume/red_dress.rsi
-    femaleMask: NoMask
+    #femaleMask: NoMask
 
 - type: entity
   parent: ClothingUniformBase
@@ -134,7 +134,7 @@
     sprite: Nyanotrasen/Clothing/Uniforms/Costume/swimsuit.rsi
   - type: Clothing
     sprite: Nyanotrasen/Clothing/Uniforms/Costume/swimsuit.rsi
-    femaleMask: UniformTop
+    #femaleMask: UniformTop
 
 ## old schoolgirl uniforms
 
@@ -341,7 +341,7 @@
     sprite: Nyanotrasen/Clothing/Uniforms/Costume/gakuran.rsi
   - type: Clothing
     sprite: Nyanotrasen/Clothing/Uniforms/Costume/gakuran.rsi
-    femaleMask: NoMask
+    #femaleMask: NoMask
 
 ## mnk
 
@@ -355,7 +355,7 @@
     sprite: Nyanotrasen/Clothing/Misc/office_skirt.rsi
   - type: Clothing
     sprite: Nyanotrasen/Clothing/Misc/office_skirt.rsi
-    femaleMask: NoMask
+    #femaleMask: NoMask
 
 - type: entity
   parent: ClothingUniformBase
@@ -378,7 +378,7 @@
     sprite: Nyanotrasen/Clothing/Misc/gym_bra.rsi
   - type: Clothing
     sprite: Nyanotrasen/Clothing/Misc/gym_bra.rsi
-    femaleMask: NoMask
+    #femaleMask: NoMask
 
 - type: entity
   parent: ClothingUniformBase
@@ -390,7 +390,7 @@
     sprite: Nyanotrasen/Clothing/Misc/black_dress.rsi
   - type: Clothing
     sprite: Nyanotrasen/Clothing/Misc/black_dress.rsi
-    femaleMask: UniformTop
+    #femaleMask: UniformTop
 
 - type: entity
   parent: ClothingUniformBase
@@ -402,7 +402,7 @@
     sprite: Nyanotrasen/Clothing/Misc/black_overall.rsi
   - type: Clothing
     sprite: Nyanotrasen/Clothing/Misc/black_overall.rsi
-    femaleMask: NoMask
+    #femaleMask: NoMask
 
 - type: entity
   parent: ClothingUniformBase
@@ -414,7 +414,7 @@
     sprite: Nyanotrasen/Clothing/Misc/exposed_shoulder.rsi
   - type: Clothing
     sprite: Nyanotrasen/Clothing/Misc/exposed_shoulder.rsi
-    femaleMask: UniformTop
+    #femaleMask: UniformTop
 
 - type: entity
   parent: ClothingUniformBase
@@ -426,4 +426,4 @@
     sprite: Nyanotrasen/Clothing/Misc/tracksuit.rsi
   - type: Clothing
     sprite: Nyanotrasen/Clothing/Misc/tracksuit.rsi
-    femaleMask: NoMask
+    #femaleMask: NoMask
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Uniforms/jumpsuits.yml
index 11f6d32b5c3..f45e854c2ac 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -8,7 +8,7 @@
     sprite: Nyanotrasen/Clothing/Uniforms/Jumpsuit/mailman.rsi
   - type: Clothing
     sprite: Nyanotrasen/Clothing/Uniforms/Jumpsuit/mailman.rsi
-#  - type: ClothingAddFaction
+#  - type: FactionClothing
 #    faction: Mailman
 
 - type: entity
@@ -21,7 +21,7 @@
     sprite: Nyanotrasen/Clothing/Uniforms/Jumpskirt/mailman.rsi
   - type: Clothing
     sprite: Nyanotrasen/Clothing/Uniforms/Jumpskirt/mailman.rsi
-#  - type: ClothingAddFaction
+#  - type: FactionClothing
 #    faction: Mailman
 
 - type: entity
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/psionic_clothing.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/psionic_clothing.yml
index 0bc1b60ad35..477f73a3718 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/psionic_clothing.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/psionic_clothing.yml
@@ -37,8 +37,6 @@
     sprite: Clothing/Hands/Gloves/leather.rsi
   - type: Clothing
     sprite: Clothing/Hands/Gloves/leather.rsi
-  - type: GloveHeatResistance
-    heatResistance: 1400
   - type: Fiber
     fiberMaterial: fibers-leather
     fiberColor: fibers-brown
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml
index 562b9c564ec..1166d8a29f5 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml
@@ -32,4 +32,3 @@
   - type: NpcFactionMember
     factions:
     - NanoTrasen
-  - type: PotentialPsionic
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml
index db7936cc5b4..396bbbbe155 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml
@@ -49,5 +49,4 @@
   - type: NpcFactionMember
     factions:
     - NanoTrasen
-  - type: PotentialPsionic
 
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/Misc/identification_cards.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/Misc/identification_cards.yml
index df612426687..d44f7c12083 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/Misc/identification_cards.yml
@@ -9,7 +9,7 @@
     - sprite: DeltaV/Objects/Misc/id_cards.rsi
       state: nyanoprisoner
   - type: PresetIdCard
-    jobName: Prisoner
+    job: Prisoner
 
 - type: entity
   parent: IDCardStandard
@@ -22,7 +22,7 @@
     - sprite: DeltaV/Objects/Misc/id_cards.rsi
       state: nyanogladiator
   - type: PresetIdCard
-    jobName: Gladiator
+    job: Gladiator
 
 - type: entity
   parent: IDCardStandard
@@ -35,10 +35,10 @@
     - sprite: DeltaV/Objects/Misc/id_cards.rsi
       state: nyanoprisonguard
   - type: PresetIdCard
-    jobName: PrisonGuard
+    job: PrisonGuard
 
 - type: entity
-  parent: IDCardStandard
+  parent: CourierIDCard
   id: MailCarrierIDCard
   name: mail carrier ID card
   components:
@@ -47,8 +47,8 @@
     - state: default
     - sprite: DeltaV/Objects/Misc/id_cards.rsi
       state: nyanomailcarrier
-  - type: PresetIdCard
-    virtualJobName: job-name-mail-carrier # DeltaV
+  - type: IdCard
+    jobTitle: Mail Carrier
 
 - type: entity
   parent: IDCardStandard
@@ -61,7 +61,7 @@
     - sprite: DeltaV/Objects/Misc/id_cards.rsi
       state: nyanomartialartist
   - type: PresetIdCard
-    jobName: MartialArtist
+    job: MartialArtist
 
 - type: entity
   parent: IDCardStandard
@@ -74,4 +74,4 @@
         - sprite: DeltaV/Objects/Misc/id_cards.rsi
           state: nyanomantis
     - type: PresetIdCard
-      jobName: ForensicMantis
+      job: ForensicMantis
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
index dc0629a745c..8a1d24a9908 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
@@ -9,7 +9,6 @@
         map: [ "enum.AmmoVisualLayers.Base" ]
   - type: CartridgeAmmo
     proto: PelletShotgunSoulbreaker
-    count: 1
   - type: ChemicalAmmo
   - type: SolutionContainerManager
     solutions:
@@ -20,4 +19,4 @@
   - type: SolutionTransfer
     maxTransferAmount: 15
   - type: SpentAmmoVisuals
-    state: "practice"
\ No newline at end of file
+    state: "practice"
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/base_lighting.yml
index 12058c9aef5..478c15c1f5b 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/base_lighting.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/base_lighting.yml
@@ -6,6 +6,7 @@
   components:
   - type: PoweredLight
     hasLampOnSpawn: BlueLightTube
+  - type: DamageOnInteract
     damage:
       types:
         Heat: 0.2
@@ -30,6 +31,7 @@
   components:
   - type: PoweredLight
     hasLampOnSpawn: LightBulbMaintenance
+  - type: DamageOnInteract
     damage:
       types:
         Heat: 0.2
@@ -56,6 +58,7 @@
   components:
   - type: PoweredLight
     hasLampOnSpawn: ColoredLightTubeRed
+  - type: DamageOnInteract
     damage:
       types:
         Heat: 0.2
@@ -80,6 +83,7 @@
   components:
   - type: PoweredLight
     hasLampOnSpawn: ColoredLightTubeFrostyBlue
+  - type: DamageOnInteract
     damage:
       types:
         Heat: 0.2
@@ -104,6 +108,7 @@
   components:
   - type: PoweredLight
     hasLampOnSpawn: ColoredLightTubeBlackLight
+  - type: DamageOnInteract
     damage:
       types:
         Heat: 0.2
@@ -131,6 +136,7 @@
     state: base
   - type: PoweredLight
     hasLampOnSpawn: ColoredLightTubeRed
+  - type: DamageOnInteract
     damage:
       types:
         Heat: 2
@@ -161,6 +167,7 @@
   components:
   - type: PoweredLight
     hasLampOnSpawn: LightBulbMaintenanceRed
+  - type: DamageOnInteract
     damage:
       types:
         Heat: 0.2
diff --git a/Resources/Prototypes/Nyanotrasen/GameRules/events.yml b/Resources/Prototypes/Nyanotrasen/GameRules/events.yml
index 2ec2cc08b8f..a604d80b147 100644
--- a/Resources/Prototypes/Nyanotrasen/GameRules/events.yml
+++ b/Resources/Prototypes/Nyanotrasen/GameRules/events.yml
@@ -2,7 +2,6 @@
 - type: entity
   id: NoosphericStorm
   parent: BaseGameRule
-  noSpawn: true
   components:
     - type: StationEvent
       startAnnouncement: station-event-noospheric-storm-announcement
@@ -16,7 +15,6 @@
 - type: entity
   id: BaseGlimmerEvent
   parent: BaseGameRule
-  noSpawn: true
   components:
     - type: StationEvent
       # Favor glimmer events just a little more than regular events.
@@ -27,18 +25,15 @@
 - type: entity
   id: MundaneDischarge
   parent: BaseGlimmerEvent
-  noSpawn: true
   components:
     - type: GlimmerEvent
       maximumGlimmer: 300
       glimmerBurnLower: 18
       glimmerBurnUpper: 40
-    - type: MundaneDischargeRule
 
 - type: entity
   id: NoosphericZap
   parent: BaseGlimmerEvent
-  noSpawn: true
   components:
     - type: GlimmerEvent
     - type: NoosphericZapRule
@@ -46,7 +41,6 @@
 - type: entity
   id: NoosphericFry
   parent: BaseGlimmerEvent
-  noSpawn: true
   components:
     - type: GlimmerEvent
       minimumGlimmer: 300
@@ -57,7 +51,6 @@
 - type: entity
   id: PsionicCatGotYourTongue
   parent: BaseGlimmerEvent
-  noSpawn: true
   components:
     - type: GlimmerEvent
       minimumGlimmer: 500
@@ -69,7 +62,6 @@
 - type: entity
   id: MassMindSwap
   parent: BaseGlimmerEvent
-  noSpawn: true
   components:
     - type: GlimmerEvent
       minimumGlimmer: 900
diff --git a/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Cargo/mail_carrier.yml b/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Cargo/mail_carrier.yml
index 54b678b68cd..ab7eda57419 100644
--- a/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Cargo/mail_carrier.yml
+++ b/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Cargo/mail_carrier.yml
@@ -1,38 +1,22 @@
 # Head
 - type: loadout
-  id: MailCarrierHead
-  equipment: MailCarrierHead
-
-- type: startingGear
   id: MailCarrierHead
   equipment:
     head: ClothingHeadMailCarrier
 
 # Jumpsuit
 - type: loadout
-  id: MailCarrierJumpsuit
-  equipment: MailCarrierJumpsuit
-
-- type: startingGear
   id: MailCarrierJumpsuit
   equipment:
     jumpsuit: ClothingUniformMailCarrier
 
 - type: loadout
-  id: MailCarrierJumpskirt
-  equipment: MailCarrierJumpskirt
-
-- type: startingGear
   id: MailCarrierJumpskirt
   equipment:
-      jumpsuit: ClothingUniformSkirtMailCarrier
+    jumpsuit: ClothingUniformSkirtMailCarrier
 
 # OuterClothing
 - type: loadout
-  id: MailCarrierWintercoat
-  equipment: MailCarrierWintercoat
-
-- type: startingGear
   id: MailCarrierWintercoat
   equipment:
-      coat: ClothingOuterWinterCoatMail
+    coat: ClothingOuterWinterCoatMail
diff --git a/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Epistemics/forensicmantis.yml
index 9c8bfa6d93e..ae76b0b7f6a 100644
--- a/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Epistemics/forensicmantis.yml
+++ b/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Epistemics/forensicmantis.yml
@@ -1,95 +1,55 @@
 # Head
 - type: loadout
-  id: MantisFezHat
-  equipment: MantisFezHat
-
-- type: startingGear
   id: MantisFezHat
   equipment:
-      head: ClothingHeadHatFezMantis
+    head: ClothingHeadHatFezMantis
 
 # Jumpsuit
 - type: loadout
-  id: MantisJumpsuit
-  equipment: MantisJumpsuit
-
-- type: startingGear
   id: MantisJumpsuit
   equipment:
-      jumpsuit: ClothingUniformJumpsuitMantis
+    jumpsuit: ClothingUniformJumpsuitMantis
 
 - type: loadout
-  id: MantisJumpskirt
-  equipment: MantisJumpskirt
-
-- type: startingGear
   id: MantisJumpskirt
   equipment:
-      jumpsuit: ClothingUniformSkirtMantis
+    jumpsuit: ClothingUniformSkirtMantis
 
 # Back
 - type: loadout
-  id: MantisBackpack
-  equipment: MantisBackpack
-
-- type: startingGear
   id: MantisBackpack
   equipment:
-      back: ClothingBackpackMantisFilled
+    back: ClothingBackpackMantisFilled
 
 - type: loadout
-  id: MantisSatchel
-  equipment: MantisSatchel
-
-- type: startingGear
   id: MantisSatchel
   equipment:
-      back: ClothingBackpackSatchelMantisFilled
+    back: ClothingBackpackSatchelMantisFilled
 
 - type: loadout
-  id: MantisDuffel
-  equipment: MantisDuffel
-
-- type: startingGear
   id: MantisDuffel
   equipment:
-      back: ClothingBackpackDuffelMantisFilled
+    back: ClothingBackpackDuffelMantisFilled
 
 # OuterClothing
 - type: loadout
-  id: MantisCoat
-  equipment: MantisCoat
-
-- type: startingGear
   id: MantisCoat
   equipment:
-      coat: ClothingOuterCoatMantis
+    coat: ClothingOuterCoatMantis
 
 - type: loadout
-  id: MantisWintercoat
-  equipment: MantisWintercoat
-
-- type: startingGear
   id: MantisWintercoat
   equipment:
-      coat: ClothingOuterWinterCoatMantis
+    coat: ClothingOuterWinterCoatMantis
 
 # Shoes
 - type: loadout
-  id: MantisBoots
-  equipment: MantisBoots
-
-- type: startingGear
   id: MantisBoots
   equipment:
-      shoes: ClothingShoesBootsMantis
+    shoes: ClothingShoesBootsMantis
 
 # Gloves
 - type: loadout
-  id: WhiteGloves
-  equipment: WhiteGloves
-
-- type: startingGear
   id: WhiteGloves
   equipment:
-      gloves: ClothingHandsGlovesColorWhite
+    gloves: ClothingHandsGlovesColorWhite
diff --git a/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Security/prisonguard.yml b/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Security/prisonguard.yml
index b383645edb5..55fd7e3158c 100644
--- a/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Security/prisonguard.yml
+++ b/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Security/prisonguard.yml
@@ -1,19 +1,11 @@
 # Head
 - type: loadout
-  id: PrisonGuardHead
-  equipment: PrisonGuardHead
-
-- type: startingGear
   id: PrisonGuardHead
   equipment:
-      head: ClothingHeadPrisonGuard
+    head: ClothingHeadPrisonGuard
 
 # Jumpsuit
 - type: loadout
-  id: PrisonGuardJumpsuit
-  equipment: PrisonGuardJumpsuit
-
-- type: startingGear
   id: PrisonGuardJumpsuit
   equipment:
-      jumpsuit: ClothingUniformJumpsuitPrisonGuard
+    jumpsuit: ClothingUniformJumpsuitPrisonGuard
diff --git a/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Wildcards/gladiator.yml b/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Wildcards/gladiator.yml
index 9200607f064..d161887040c 100644
--- a/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Wildcards/gladiator.yml
+++ b/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Wildcards/gladiator.yml
@@ -1,19 +1,11 @@
 # Jumpsuits
 - type: loadout
-  id: GladiatorJumpsuit
-  equipment: GladiatorJumpsuit
-
-- type: startingGear
   id: GladiatorJumpsuit
   equipment:
-      jumpsuit: ClothingUniformJumpsuitGladiator
+    jumpsuit: ClothingUniformJumpsuitGladiator
 
 # OuterClothing
 - type: loadout
-  id: ClothingOuterArmorGladiator
-  equipment: ClothingOuterArmorGladiator
-
-- type: startingGear
   id: ClothingOuterArmorGladiator
   equipment:
-      outerClothing: ClothingOuterArmorGladiator
+    outerClothing: ClothingOuterArmorGladiator
diff --git a/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Wildcards/martialartist.yml b/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Wildcards/martialartist.yml
index c2778956309..25d861202e6 100644
--- a/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Wildcards/martialartist.yml
+++ b/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Wildcards/martialartist.yml
@@ -1,29 +1,17 @@
 # Jumpsuits
 - type: loadout
-  id: MartialArtistJumpsuit
-  equipment: MartialArtistJumpsuit
-
-- type: startingGear
   id: MartialArtistJumpsuit
   equipment:
-      jumpsuit: ClothingUniformMartialGi
+    jumpsuit: ClothingUniformMartialGi
 
 # Belts
 - type: loadout
-  id: MartialBlackBelt
-  equipment: MartialBlackBelt
-
-- type: startingGear
   id: MartialBlackBelt
   equipment:
-      belt: ClothingBeltMartialBlack
+    belt: ClothingBeltMartialBlack
 
 # Shoes
 - type: loadout
-  id: MartialArtistShoes
-  equipment: MartialArtistShoes
-
-- type: startingGear
   id: MartialArtistShoes
   equipment:
-      shoes: ClothingShoesGeta
+    shoes: ClothingShoesGeta
diff --git a/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Wildcards/prisoner.yml b/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Wildcards/prisoner.yml
index 9040003c0cc..4e667bec593 100644
--- a/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Wildcards/prisoner.yml
+++ b/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Wildcards/prisoner.yml
@@ -1,18 +1,10 @@
 # Jumpsuit
 - type: loadout
-  id: PrisonerJumpsuit
-  equipment: PrisonerJumpsuit
-
-- type: startingGear
   id: PrisonerJumpsuit
   equipment:
-      jumpsuit: ClothingUniformJumpsuitPrisoner
+    jumpsuit: ClothingUniformJumpsuitPrisoner
 
 - type: loadout
-  id: PrisonerJumpskirt
-  equipment: PrisonerJumpskirt
-
-- type: startingGear
   id: PrisonerJumpskirt
   equipment:
-      jumpsuit: ClothingUniformJumpskirtPrisoner
+    jumpsuit: ClothingUniformJumpskirtPrisoner
diff --git a/Resources/Prototypes/Nyanotrasen/Loadouts/role_loadouts.yml b/Resources/Prototypes/Nyanotrasen/Loadouts/role_loadouts.yml
index e3684bee40e..b8cb0dc03d9 100644
--- a/Resources/Prototypes/Nyanotrasen/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Nyanotrasen/Loadouts/role_loadouts.yml
@@ -2,11 +2,14 @@
 - type: roleLoadout
   id: JobMailCarrier
   groups:
+  - GroupTankHarness
   - MailCarrierHead
   - MailCarrierJumpsuit
   - CommonBackpack
   - CargoTechnicianShoes
+  - Survival
   - Trinkets
+  - GroupSpeciesBreathTool
 
 # Epistemics
 - type: roleLoadout
@@ -18,7 +21,9 @@
   - MantisOuterClothing
   - MantisShoes
   - MantisGloves
+  - Survival
   - Trinkets
+  - GroupSpeciesBreathTool
 
 # Security
 - type: roleLoadout
@@ -31,25 +36,33 @@
   - SecurityOuterClothing
   - SecurityShoes
   - SecurityBelt
+  - SurvivalSecurity
   - Trinkets
+  - GroupSpeciesBreathToolSecurity
 
 # Wildcards
 - type: roleLoadout
   id: JobPrisoner
   groups:
+  - GroupTankHarness
   - PrisonerJumpsuit
   - PassengerShoes
+  - Survival
   - Trinkets
+  - GroupSpeciesBreathTool
 
 - type: roleLoadout
   id: JobMartialArtist
   groups:
+  - GroupTankHarness
   - MartialArtistJumpsuit
   - MartialArtistBelt
   - MartialArtistShoes
   - BoxerGloves
   - CommonBackpack
+  - Survival
   - Trinkets
+  - GroupSpeciesBreathTool
 
 - type: roleLoadout
   id: JobGladiator
@@ -57,3 +70,4 @@
   - GladiatorJumpsuit
   - GladiatorOuterClothing
   - Trinkets
+  - GroupSpeciesBreathTool
diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml
index 625d37eefce..f0c315db614 100644
--- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml
+++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml
@@ -1,17 +1,3 @@
-- type: job
-  id: MailCarrier
-  name: job-name-mail-carrier
-  description: job-description-mail-carrier
-  startingGear: CourierGear
-  playTimeTracker: JobMailCarrier
-  setPreference: false
-  icon: "JobIconMailCarrier"
-  supervisors: job-supervisors-qm
-  access:
-  - Cargo
-  - Maintenance
-  - Mail
-
 - type: startingGear
   id: MailCarrierGear
   equipment:
diff --git a/Resources/Prototypes/Nyanotrasen/StatusEffects/job.yml b/Resources/Prototypes/Nyanotrasen/StatusIcon/job.yml
similarity index 70%
rename from Resources/Prototypes/Nyanotrasen/StatusEffects/job.yml
rename to Resources/Prototypes/Nyanotrasen/StatusIcon/job.yml
index 943660199ba..30ca424c600 100644
--- a/Resources/Prototypes/Nyanotrasen/StatusEffects/job.yml
+++ b/Resources/Prototypes/Nyanotrasen/StatusIcon/job.yml
@@ -1,34 +1,31 @@
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconGladiator
   icon:
     sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
     state: nyanoGladiator
+  jobName: job-name-gladiator
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconPrisonGuard
   icon:
     sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
     state: nyanoPrisonGuard
+  jobName: job-name-prison-guard
 
-- type: statusIcon
-  parent: JobIcon
-  id: JobIconMailCarrier
-  icon:
-    sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
-    state: nyanoMailCarrier
-
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconMartialArtist
   icon:
     sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
     state: nyanoMartialArtist
+  jobName: job-name-martialartist
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconForensicMantis
   icon:
     sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
     state: nyanoMantis
+  jobName: job-name-mantis
diff --git a/Resources/Prototypes/Objectives/dragon.yml b/Resources/Prototypes/Objectives/dragon.yml
index 10ca942cb39..bbdac8faa1a 100644
--- a/Resources/Prototypes/Objectives/dragon.yml
+++ b/Resources/Prototypes/Objectives/dragon.yml
@@ -6,7 +6,7 @@
   - type: Objective
     # difficulty isn't used at all since objective are fixed
     difficulty: 1.5
-    issuer: dragon
+    issuer: objective-issuer-dragon
   - type: RoleRequirement
     roles:
       components:
diff --git a/Resources/Prototypes/Objectives/ninja.yml b/Resources/Prototypes/Objectives/ninja.yml
index c1f745d0fe4..00bf9d705b8 100644
--- a/Resources/Prototypes/Objectives/ninja.yml
+++ b/Resources/Prototypes/Objectives/ninja.yml
@@ -6,7 +6,7 @@
   - type: Objective
     # difficulty isn't used since all objectives are picked
     difficulty: 1.5
-    issuer: spiderclan
+    issuer: objective-issuer-spiderclan
   - type: RoleRequirement
     roles:
       components:
diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml
index 8a86bee8d16..e1ce641717a 100644
--- a/Resources/Prototypes/Objectives/objectiveGroups.yml
+++ b/Resources/Prototypes/Objectives/objectiveGroups.yml
@@ -61,8 +61,8 @@
 - type: weightedRandom
   id: ThiefBigObjectiveGroups
   weights:
-    ThiefObjectiveGroupStructure: 0 #Temporarily disabled until obvious ways to steal structures are added
-    ThiefObjectiveGroupAnimal: 2
+    ThiefObjectiveGroupStructure: 1
+    ThiefObjectiveGroupAnimal: 1
 
 - type: weightedRandom
   id: ThiefObjectiveGroupCollection
@@ -100,7 +100,6 @@
   weights:
     NuclearBombStealObjective: 0.5
     FaxMachineCaptainStealObjective: 1
-    VehicleSecwayStealObjective: 1
     ChemDispenserStealObjective: 1
     XenoArtifactStealObjective: 1
     FreezerHeaterStealObjective: 1
diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml
index 09905b7aaa3..b4d209a6693 100644
--- a/Resources/Prototypes/Objectives/stealTargetGroups.yml
+++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml
@@ -354,8 +354,8 @@
     state: ian
 
 - type: stealTargetGroup
-  id: AnimalBingus
-  name: Bingus
+  id: AnimalNamedCat
+  name: CMO's Cat
   sprite:
     sprite: Mobs/Pets/bingus.rsi
     state: bingus
diff --git a/Resources/Prototypes/Objectives/thief.yml b/Resources/Prototypes/Objectives/thief.yml
index 91e26b44bf6..27472500bef 100644
--- a/Resources/Prototypes/Objectives/thief.yml
+++ b/Resources/Prototypes/Objectives/thief.yml
@@ -4,7 +4,7 @@
   id: BaseThiefObjective
   components:
   - type: Objective
-    issuer: thief
+    issuer: objective-issuer-thief
   - type: RoleRequirement
     roles:
       components:
@@ -18,30 +18,29 @@
   - type: StealCondition
     verifyMapExistence: false
     descriptionText: objective-condition-thief-description
+    checkStealAreas: true
 
 - type: entity
   abstract: true
-  parent: [BaseThiefObjective, BaseStealObjective]
+  parent: [BaseThiefObjective, BaseThiefStealObjective]
   id: BaseThiefStealCollectionObjective
   components:
   - type: StealCondition
     verifyMapExistence: true
-    descriptionText: objective-condition-thief-description
 
 - type: entity
   abstract: true
-  parent: [BaseThiefObjective, BaseStealObjective]
+  parent: [BaseThiefObjective, BaseThiefStealObjective]
   id: BaseThiefStealStructureObjective
   components:
   - type: StealCondition
     verifyMapExistence: true
-    descriptionText: objective-condition-thief-description
   - type: Objective
     difficulty: 2 # it's hard to hide
 
 - type: entity
   abstract: true
-  parent: [BaseThiefObjective, BaseStealObjective]
+  parent: [BaseThiefObjective, BaseThiefStealObjective]
   id: BaseThiefStealAnimalObjective
   components:
   - type: StealCondition
@@ -61,7 +60,7 @@
   - type: StealCondition
     stealGroup: Figurines
     minCollectionSize: 10
-    maxCollectionSize: 50 #will be limited to the number of figures on the station anyway.
+    maxCollectionSize: 18 #will be limited to the number of figures on the station anyway.
   - type: Objective
     difficulty: 0.25
 
@@ -94,7 +93,7 @@
   - type: StealCondition
     stealGroup: Stamp
     minCollectionSize: 5
-    maxCollectionSize: 15
+    maxCollectionSize: 8
   - type: Objective
     difficulty: 1.0
 
@@ -436,7 +435,7 @@
   id: BingusStealObjective
   components:
   - type: StealCondition
-    stealGroup: AnimalBingus
+    stealGroup: AnimalNamedCat
   - type: Objective
     difficulty: 1
 
@@ -509,7 +508,7 @@
 - type: entity
   parent: [BaseThiefObjective, BaseLivingObjective]
   id: EscapeThiefShuttleObjective
-  name: Escape to centcom alive and unrestrained.
+  name: Escape to centcomm alive and unrestrained.
   description: You don't want your illegal activities to be discovered by anyone, do you?
   components:
   - type: Objective
diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml
index 4aa611aeff2..5a752fabeb0 100644
--- a/Resources/Prototypes/Objectives/traitor.yml
+++ b/Resources/Prototypes/Objectives/traitor.yml
@@ -4,7 +4,7 @@
   id: BaseTraitorObjective
   components:
   - type: Objective
-    issuer: syndicate
+    issuer: objective-issuer-syndicate
   - type: RoleRequirement
     roles:
       components:
@@ -38,7 +38,7 @@
 - type: entity
   parent: [BaseTraitorObjective, BaseLivingObjective]
   id: EscapeShuttleObjective
-  name: Escape to centcom alive and unrestrained.
+  name: Escape to centcomm alive and unrestrained.
   description: One of our undercover agents will debrief you when you arrive. Don't show up in cuffs.
   components:
   - type: Objective
@@ -85,7 +85,7 @@
 - type: entity
   parent: [BaseTraitorObjective, BaseKillObjective]
   id: KillRandomPersonObjective
-  description: Do it however you like, just make sure they don't make it to centcom.
+  description: Do it however you like, just make sure they don't make it to centcomm.
   components:
   - type: Objective
     difficulty: 1.75
diff --git a/Resources/Prototypes/Procedural/Magnet/asteroid.yml b/Resources/Prototypes/Procedural/Magnet/asteroid.yml
index a21b709afad..c380dfbc7cf 100644
--- a/Resources/Prototypes/Procedural/Magnet/asteroid.yml
+++ b/Resources/Prototypes/Procedural/Magnet/asteroid.yml
@@ -6,6 +6,7 @@
     OreCoal: 1.0
     OreSalt: 1.0
     OreGold: 0.25
+    OreDiamond: 0.05
     OreSilver: 0.25
     OrePlasma: 0.15
     OreUranium: 0.15
@@ -15,7 +16,8 @@
 - type: dungeonConfig
   id: BlobAsteroid
   # Floor generation
-  generator: !type:NoiseDunGen
+  layers:
+  - !type:NoiseDunGen
     tileCap: 1500
     capStd: 32
     iterations: 3
@@ -28,22 +30,22 @@
           fractalType: FBm
           octaves: 2
           lacunarity: 2
-  # Everything else
-  postGeneration:
-    # Generate biome
-    - !type:BiomePostGen
-      biomeTemplate: Asteroid
 
-    # Generate ore veins
-    - !type:MarkerLayerPostGen
-      markerTemplate: AsteroidOre
+  # Generate biome
+  - !type:BiomeDunGen
+    biomeTemplate: Asteroid
+
+  # Generate ore veins
+  - !type:BiomeMarkerLayerDunGen
+    markerTemplate: AsteroidOre
 
 # Multiple smaller asteroids
 # This is a pain so we generate fewer tiles
 - type: dungeonConfig
   id: ClusterAsteroid
   # Floor generation
-  generator: !type:NoiseDunGen
+  layers:
+  - !type:NoiseDunGen
     tileCap: 1000
     capStd: 32
     layers:
@@ -55,21 +57,21 @@
           fractalType: FBm
           octaves: 2
           lacunarity: 2
-  # Everything else
-  postGeneration:
-    # Generate biome
-    - !type:BiomePostGen
-      biomeTemplate: Asteroid
 
-    # Generate ore veins
-    - !type:MarkerLayerPostGen
-      markerTemplate: AsteroidOre
+  # Generate biome
+  - !type:BiomeDunGen
+    biomeTemplate: Asteroid
+
+  # Generate ore veins
+  - !type:BiomeMarkerLayerDunGen
+    markerTemplate: AsteroidOre
 
 # Long and spindly, less smooth than blob
 - type: dungeonConfig
   id: SpindlyAsteroid
   # Floor generation
-  generator: !type:NoiseDunGen
+  layers:
+  - !type:NoiseDunGen
     tileCap: 1500
     capStd: 32
     layers:
@@ -82,20 +84,21 @@
           octaves: 3
           lacunarity: 2
           cellularDistanceFunction: Euclidean
-  postGeneration:
-    # Generate biome
-    - !type:BiomePostGen
-      biomeTemplate: Asteroid
 
-    # Generate ore veins
-    - !type:MarkerLayerPostGen
-      markerTemplate: AsteroidOre
+  # Generate biome
+  - !type:BiomeDunGen
+    biomeTemplate: Asteroid
+
+  # Generate ore veins
+  - !type:BiomeMarkerLayerDunGen
+    markerTemplate: AsteroidOre
 
 # Lots of holes in it
 - type: dungeonConfig
   id: SwissCheeseAsteroid
   # Floor generation
-  generator: !type:NoiseDunGen
+  layers:
+  - !type:NoiseDunGen
     tileCap: 1500
     capStd: 32
     layers:
@@ -107,12 +110,11 @@
           fractalType: FBm
           octaves: 2
           lacunarity: 2
-  # Everything else
-  postGeneration:
-    # Generate biome
-    - !type:BiomePostGen
-      biomeTemplate: Asteroid
 
-    # Generate ore veins
-    - !type:MarkerLayerPostGen
-      markerTemplate: AsteroidOre
+  # Generate biome
+  - !type:BiomeDunGen
+    biomeTemplate: Asteroid
+
+  # Generate ore veins
+  - !type:BiomeMarkerLayerDunGen
+    markerTemplate: AsteroidOre
diff --git a/Resources/Prototypes/Procedural/biome_ore_templates.yml b/Resources/Prototypes/Procedural/biome_ore_templates.yml
index 4a60427e305..a6e5fac2d84 100644
--- a/Resources/Prototypes/Procedural/biome_ore_templates.yml
+++ b/Resources/Prototypes/Procedural/biome_ore_templates.yml
@@ -130,6 +130,20 @@
   maxGroupSize: 10
   radius: 4
 
+- type: biomeMarkerLayer
+  id: OreDiamond
+  entityMask:
+    AsteroidRock: AsteroidRockDiamond
+    WallRock: WallRockDiamond
+    WallRockBasalt: WallRockBasaltDiamond
+    WallRockChromite: WallRockChromiteDiamond
+    WallRockSand: WallRockSandDiamond
+    WallRockSnow: WallRockSnowDiamond
+  maxCount: 6
+  minGroupSize: 1
+  maxGroupSize: 2
+  radius: 4
+
 # Artifact Fragment
 - type: biomeMarkerLayer
   id: OreArtifactFragment
diff --git a/Resources/Prototypes/Procedural/dungeon_configs.yml b/Resources/Prototypes/Procedural/dungeon_configs.yml
index 3614e4e787f..b55d5a9e697 100644
--- a/Resources/Prototypes/Procedural/dungeon_configs.yml
+++ b/Resources/Prototypes/Procedural/dungeon_configs.yml
@@ -1,361 +1,284 @@
+# Base configs
 - type: dungeonConfig
-  id: Experiment
-  generator: !type:PrefabDunGen
-    roomWhitelist:
-      - SalvageExperiment
+  id: PlanetBase
+  layers:
+  - !type:PrefabDunGen
     presets:
-      - Bucket
-      - Wow
-      - SpaceShip
-      - Tall
-  postGeneration:
-    - !type:CorridorPostGen
-      width: 3
+    - Bucket
+    - Wow
+    - SpaceShip
+    - Tall
 
-    - !type:DungeonEntrancePostGen
-      count: 2
+  - !type:CorridorDunGen
+    width: 3
 
-    - !type:RoomEntrancePostGen
-      entities:
-        - CableApcExtension
-        - AirlockGlass
+  - !type:DungeonEntranceDunGen
+    count: 2
 
-    - !type:EntranceFlankPostGen
-      entities:
-        - Grille
-        - Window
+  - !type:RoomEntranceDunGen
 
-    - !type:ExternalWindowPostGen
-      entities:
-        - Grille
-        - Window
+  - !type:EntranceFlankDunGen
 
-    - !type:WallMountPostGen
-      spawns:
-        # Posters
-        - id: RandomPosterLegit
-          orGroup: content
-        - id: ExtinguisherCabinetFilled
-          prob: 0.2
-          orGroup: content
-        - id: RandomPainting
-          prob: 0.05
-          orGroup: content
-        - id: IntercomCommon
-          prob: 0.1
-          orGroup: content
+  - !type:ExternalWindowDunGen
 
-    - !type:BoundaryWallPostGen
-      tile: FloorSteel
-      wall: WallSolid
-      cornerWall: WallReinforced
+  - !type:WallMountDunGen
 
-    - !type:JunctionPostGen
-      width: 1
+  - !type:BoundaryWallDunGen
 
-    - !type:JunctionPostGen
+  - !type:JunctionDunGen
+    width: 1
 
-    - !type:AutoCablingPostGen
+  - !type:JunctionDunGen
 
-    - !type:CornerClutterPostGen
-      contents:
-        - id: PottedPlantRandom
-          amount: 1
+  - !type:AutoCablingDunGen
 
-    - !type:CorridorDecalSkirtingPostGen
-      color: "#D381C996"
-      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
+  - !type:CornerClutterDunGen
 
+  - !type:CorridorDecalSkirtingDunGen
+    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
 
+# Setups
 - type: dungeonConfig
-  id: LavaBrig
-  generator: !type:PrefabDunGen
-    roomWhitelist:
-      - LavaBrig
-    presets:
-      - Bucket
-      - Wow
-      - SpaceShip
-      - Tall
-  postGeneration:
-    - !type:CorridorPostGen
-      width: 3
-
-    - !type:DungeonEntrancePostGen
-      count: 2
-
-    - !type:RoomEntrancePostGen
-      entities:
-        - CableApcExtension
-        - AirlockSecurityGlassLocked
-
-    - !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: IntercomCommon
-          prob: 0.1
-          orGroup: content
-
-    - !type:BoundaryWallPostGen
-      tile: FloorSteel
-      wall: WallSolid
-      cornerWall: WallReinforced
-
-    - !type:JunctionPostGen
-      width: 1
-
-    - !type:JunctionPostGen
-
-    - !type:AutoCablingPostGen
-
-    - !type:CornerClutterPostGen
-      contents:
-        - id: PottedPlantRandom
-          amount: 1
-
-    - !type:CorridorDecalSkirtingPostGen
-      color: "#DE3A3A96"
-      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
+  id: Experiment
+  data:
+    colors:
+      Decals: "#D381C996"
+    entities:
+      Cabling: CableApcExtension
+      CornerWalls: WallReinforced
+      Walls: WallSolid
+    spawnGroups:
+      CornerClutter: BaseClutter
+      Entrance: BaseAirlock
+      EntranceFlank: BaseWindow
+      Junction: BaseAirlock
+      WallMounts: ScienceLabsWalls
+      Window: BaseWindow
+    tiles:
+      FallbackTile: FloorSteel
+    whitelists:
+      Rooms:
+        tags:
+        - SalvageExperiment
+  layers:
+  - !type:PrototypeDunGen
+    proto: PlanetBase
 
 - type: dungeonConfig
-  id: Mineshaft
-  generator: !type:PrefabDunGen
-    tile: FloorCaveDrought
-    roomWhitelist:
-      - Mineshaft
+  id: Haunted
+  data:
+    entities:
+      Walls: WallRock
+    tiles:
+      FallbackTile: FloorCaveDrought
+    whitelists:
+      Rooms:
+        tags:
+        - Mineshaft
+  layers:
+  - !type:PrefabDunGen
     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
+    - Bucket
+    - Wow
+    - SpaceShip
+    - Tall
 
-  - !type:AutoCablingPostGen
-      entity: Catwalk
+  - !type:WormCorridorDunGen
+    width: 3
 
-  - !type:JunctionPostGen
-      tile: FloorCaveDrought
-      width: 3
-      entities:
-        - RandomWoodenSupport
+  - !type:CorridorClutterDunGen
+    contents:
+    - id: FloraStalagmite1
+    - id: FloraStalagmite2
+    - id: FloraStalagmite3
+    - id: FloraStalagmite4
+    - id: FloraStalagmite5
+    - id: FloraStalagmite6
 
-  - !type:CornerClutterPostGen
-      contents:
-        - id: RandomStalagmiteOrCrystal
-          amount: 1
+  - !type:BoundaryWallDunGen
 
 - 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:
-        - AirlockGlass
-
-    - !type:JunctionPostGen
-      entities:
-        - AirlockGlass
-
-    - !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
-
-# todo: Add a biome dungeon generator
-# Add corridor first gens that place rooms on top
-# Add a worm corridor gen (place subsequent corridors somewhere randomly along the path)
-# Place room entrances on ends of corridors touching a tile
-# Remove all room tiles from corridors
-# Fix paths up and try to reconnect all corridor tiles
-# Add a postgen step to spread rooms out, though it shouldn't spread into corridor exteriors
+  id: LavaBrig
+  data:
+    colors:
+      Decals: "#DE3A3A96"
+    entities:
+      Cabling: CableApcExtension
+      CornerWalls: WallReinforced
+      Walls: WallSolid
+    spawnGroups:
+      CornerClutter: BaseClutter
+      Entrance: LavaBrigEntrance
+      EntranceFlank: BaseWindow
+      Junction: BaseAirlock
+      WallMounts: ScienceLabsWalls
+      Window: BaseWindow
+    whitelists:
+      Rooms:
+        tags:
+        - LavaBrig
+  layers:
+  - !type:PrototypeDunGen
+    proto: PlanetBase
 
 - type: dungeonConfig
-  id: Haunted
-  generator: !type:PrefabDunGen
-    tile: FloorCaveDrought
-    roomWhitelist:
-    - Mineshaft
-    presets:
-    - Bucket
-    - Wow
-    - SpaceShip
-    - Tall
-  postGeneration:
-    - !type:WormCorridorPostGen
-      width: 3
-      tile: FloorCaveDrought
-
-    - !type:CorridorClutterPostGen
-      contents:
-      - id: FloraStalagmite1
-      - id: FloraStalagmite2
-      - id: FloraStalagmite3
-      - id: FloraStalagmite4
-      - id: FloraStalagmite5
-      - id: FloraStalagmite6
+  id: Mineshaft
+  data:
+    entities:
+      Cabling: Catwalk
+    spawnGroups:
+      CornerClutter: MineshaftClutter
+      Entrance: BaseWoodWall
+      EntranceFlank: BaseWoodWall
+      Junction: BaseWoodSupport
+      Window: BaseWoodWall
+    tiles:
+      FallbackTile: FloorCaveDrought
+    whitelists:
+      Rooms:
+        tags:
+        - Mineshaft
+  layers:
+  - !type:PrototypeDunGen
+    proto: PlanetBase
 
-    - !type:BoundaryWallPostGen
-      tile: FloorCaveDrought
-      wall: WallRock
+- type: dungeonConfig
+  id: SnowyLabs
+  data:
+    colors:
+      Decals: "#4cc7aa96"
+    entities:
+      Cabling: CableApcExtension
+      CornerWalls: WallSilver
+      Walls: WallSilver
+    spawnGroups:
+      CornerClutter: BaseClutter
+      Entrance: SnowyLabsEntrance
+      EntranceFlank: BaseWindow
+      Junction: BaseAirlock
+      WallMounts: SnowyLabsWalls
+      Window: BaseWindow
+    tiles:
+      FallbackTile: FloorSteel
+    whitelists:
+      Rooms:
+        tags:
+        - SnowyLabs
+  layers:
+  - !type:PrototypeDunGen
+    proto: PlanetBase
+
+# Spawn groups
+# Basic
+- type: entitySpawnEntry
+  id: BaseClutter
+  entries:
+  - id: PottedPlantRandom
+    amount: 1
+
+- type: entitySpawnEntry
+  id: BaseAirlock
+  entries:
+  - id: CableApcExtension
+  - id: AirlockGlass
+
+- type: entitySpawnEntry
+  id: BaseWindow
+  entries:
+  - id: Grille
+  - id: Window
+
+# Lava brig
+- type: entitySpawnEntry
+  id: LavaBrigEntrance
+  entries:
+  - id: CableApcExtension
+  - id: AirlockSecurityGlassLocked
+
+# Mineshaft
+- type: entitySpawnEntry
+  id: BaseWoodWall
+  entries:
+  - id: RandomWoodenWall
+
+- type: entitySpawnEntry
+  id: BaseWoodSupport
+  entries:
+  - id: RandomWoodenSupport
+
+- type: entitySpawnEntry
+  id: MineshaftClutter
+  entries:
+  - id: RandomStalagmiteOrCrystal
+    amount: 1
+
+- type: entitySpawnEntry
+  id: MineshaftWalls
+  entries:
+  # 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
+
+# Science lab
+- type: entitySpawnEntry
+  id: ScienceLabsWalls
+  entries:
+  # Posters
+  - id: RandomPosterLegit
+    orGroup: content
+  - id: ExtinguisherCabinetFilled
+    prob: 0.2
+    orGroup: content
+  - id: RandomPainting
+    prob: 0.05
+    orGroup: content
+  - id: IntercomCommon
+    prob: 0.1
+    orGroup: content
+
+# Snowy labs
+- type: entitySpawnEntry
+  id: SnowyLabsEntrance
+  entries:
+  - id: CableApcExtension
+  - id: AirlockFreezerHydroponicsLocked
+
+- type: entitySpawnEntry
+  id: SnowyLabsWalls
+  entries:
+  # 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
diff --git a/Resources/Prototypes/Procedural/salvage_factions.yml b/Resources/Prototypes/Procedural/salvage_factions.yml
index 847a40ac025..f1e29375aa2 100644
--- a/Resources/Prototypes/Procedural/salvage_factions.yml
+++ b/Resources/Prototypes/Procedural/salvage_factions.yml
@@ -1,5 +1,6 @@
 - type: salvageFaction
   id: Xenos
+  desc: salvage-faction-xenos
   entries:
     - proto: MobXeno
     - proto: MobXenoDrone
@@ -24,6 +25,7 @@
 
 - type: salvageFaction
   id: Carps
+  desc: salvage-faction-carps
   entries:
     - proto: MobCarpDungeon
     # These do too much damage for salvage, need nerfs
diff --git a/Resources/Prototypes/Procedural/salvage_loot.yml b/Resources/Prototypes/Procedural/salvage_loot.yml
index e8783760ddc..da99da7c75b 100644
--- a/Resources/Prototypes/Procedural/salvage_loot.yml
+++ b/Resources/Prototypes/Procedural/salvage_loot.yml
@@ -178,6 +178,13 @@
     - !type:BiomeMarkerLoot
       proto: OreBananium
 
+- type: salvageLoot
+  id: OreDiamond
+  guaranteed: true
+  loots:
+    - !type:BiomeMarkerLoot
+      proto: OreDiamond
+
 - type: salvageLoot
   id: OreArtifactFragment
   guaranteed: true
diff --git a/Resources/Prototypes/Procedural/salvage_mods.yml b/Resources/Prototypes/Procedural/salvage_mods.yml
index 6c2bf678621..ca64d29a52a 100644
--- a/Resources/Prototypes/Procedural/salvage_mods.yml
+++ b/Resources/Prototypes/Procedural/salvage_mods.yml
@@ -1,25 +1,29 @@
 # Markers
 - type: entity
   id: SalvageShuttleMarker
-  name: Salvage shuttle marker
+  name: salvage shuttle marker
   parent: FTLPoint
 
 # Biome mods -> at least 1 required
 - type: salvageBiomeMod
   id: Caves
+  desc: salvage-biome-mod-caves
   biome: Caves
 
 - type: salvageBiomeMod
   id: Grasslands
+  desc: salvage-biome-mod-grasslands
   biome: Grasslands
 
 - type: salvageBiomeMod
   id: Snow
+  desc: salvage-biome-mod-snow
   cost: 1
   biome: Snow
 
 - type: salvageBiomeMod
   id: Lava
+  desc: salvage-biome-mod-lava
   cost: 2
   biome: Lava
 
@@ -32,36 +36,38 @@
 # Light mods -> required
 - type: salvageLightMod
   id: Daylight
-  desc: Daylight
+  desc: salvage-light-mod-daylight
   color: "#D8B059"
   biomes:
     - Grasslands
 
 - type: salvageLightMod
   id: Lavalight
-  desc: Daylight
+  desc: salvage-light-mod-daylight
   color: "#A34931"
   biomes:
     - Lava
 
 - type: salvageLightMod
   id: Evening
-  desc: Evening
+  desc: salvage-light-mod-evening
   color: "#2b3143"
 
 - type: salvageLightMod
   id: Night
-  desc: Night time
+  desc: salvage-light-mod-night
   cost: 1
   color: null
 
 # Temperatures
 - type: salvageTemperatureMod
   id: RoomTemp
+  desc: salvage-temperature-mod-room-temperature
   cost: 0
 
 - type: salvageTemperatureMod
   id: Hot
+  desc: salvage-temperature-mod-hot
   cost: 1
   temperature: 323.15 # 50C
   biomes:
@@ -72,7 +78,7 @@
 
 - type: salvageTemperatureMod
   id: Burning
-  desc: High temperature
+  desc: salvage-temperature-mod-high-temperature
   cost: 2
   temperature: 423.15 # 200C
   biomes:
@@ -82,7 +88,7 @@
 
 - type: salvageTemperatureMod
   id: Melting
-  desc: Extreme heat
+  desc: salvage-temperature-mod-extreme-heat
   cost: 4
   temperature: 1273.15 # 1000C hot hot hot
   biomes:
@@ -90,6 +96,7 @@
 
 - type: salvageTemperatureMod
   id: Cold
+  desc: salvage-temperature-mod-cold
   cost: 1
   temperature: 275.15 # 2C
   biomes:
@@ -100,7 +107,7 @@
 
 - type: salvageTemperatureMod
   id: Tundra
-  desc: Low temperature
+  desc: salvage-temperature-mod-low-temperature
   cost: 2
   temperature: 263.15 # -40C
   biomes:
@@ -109,7 +116,7 @@
 
 - type: salvageTemperatureMod
   id: Frozen
-  desc: Extreme cold
+  desc: salvage-temperature-mod-extreme-cold
   cost: 4
   temperature: 123.15 # -150C
   biomes:
@@ -118,7 +125,7 @@
 # Air mixtures
 - type: salvageAirMod
   id: Space
-  desc: No atmosphere
+  desc: salvage-air-mod-no-atmosphere
   space: true
   cost: 2
   biomes:
@@ -128,6 +135,7 @@
 - type: salvageAirMod
   id: Breathable
   cost: 0
+  desc: salvage-air-mod-breathable-atmosphere
   gases:
     - 21.824779 # oxygen
     - 82.10312 # nitrogen
@@ -135,7 +143,7 @@
 - type: salvageAirMod
   id: Sleepy
   cost: 1
-  desc: Dangerous atmosphere
+  desc: salvage-air-mod-dangerous-atmosphere
   gases:
     - 21.824779 # oxygen
     - 72.10312 # nitrogen
@@ -155,7 +163,7 @@
 - type: salvageAirMod
   id: Poisoned
   cost: 2
-  desc: Dangerous atmosphere
+  desc: salvage-air-mod-dangerous-atmosphere
   gases:
     - 21.824779 # oxygen
     - 77.10312 # nitrogen
@@ -170,7 +178,7 @@
 - type: salvageAirMod
   id: Poison
   cost: 3
-  desc: Toxic atmosphere
+  desc: salvage-air-mod-toxic-atmosphere
   gases:
     - 21.824779 # oxygen
     - 0
@@ -183,7 +191,7 @@
 - type: salvageAirMod
   id: Plasma
   cost: 4
-  desc: Toxic atmosphere
+  desc: salvage-air-mod-toxic-atmosphere
   gases:
     - 0
     - 0
@@ -196,7 +204,7 @@
 - type: salvageAirMod
   id: Burnable
   cost: 5
-  desc: Volatile atmosphere
+  desc: salvage-air-mod-volatile-atmosphere
   gases:
     - 21.824779 # oxygen
     - 0
@@ -220,6 +228,7 @@
 #  For now just simple 1-dungeon setups
 - type: salvageDungeonMod
   id: Experiment
+  desc: salvage-dungeon-mod-experiment
   proto: Experiment
   biomes:
     #- LowDesert
@@ -227,24 +236,28 @@
 
 - type: salvageDungeonMod
   id: LavaBrig
+  desc: salvage-dungeon-mod-lava-brig
   proto: LavaBrig
   biomes:
     - Lava
 
 - type: salvageDungeonMod
   id: Mineshaft
+  desc: salvage-dungeon-mod-mineshaft
   proto: Mineshaft
   biomes:
     - Caves
 
 - type: salvageDungeonMod
   id: SnowyLabs
+  desc: salvage-dungeon-mod-snowy-labs
   proto: SnowyLabs
   biomes:
     - Snow
-    
+
 - type: salvageDungeonMod
   id: Haunted
+  desc: salvage-dungeon-mod-haunted
   proto: Haunted
   biomes:
     - Caves
diff --git a/Resources/Prototypes/Procedural/vgroid.yml b/Resources/Prototypes/Procedural/vgroid.yml
new file mode 100644
index 00000000000..6e9fc6f3957
--- /dev/null
+++ b/Resources/Prototypes/Procedural/vgroid.yml
@@ -0,0 +1,197 @@
+# Okay so my general thought is this:
+# 1. Generate the large mass
+# 2. Generate smaller masses offset
+# 3. Generate N normal dungeons around the larger mass, preferably near the border
+# 4. Generate large paths / small paths around the place
+# 5. Spawn ores + fill the rest and the normal stuff
+
+# If you want mobs they needed to be added at specific steps due to how dungeons work at the moment.
+
+- type: dungeonConfig
+  id: VGRoid
+  layers:
+    - !type:PrototypeDunGen
+      proto: VGRoidBlob
+    - !type:PrototypeDunGen
+      proto: VGRoidExterior
+    - !type:PrototypeDunGen
+      proto: VGRoidSmaller
+    - !type:PrototypeDunGen
+      proto: VGRoidSmallPaths
+    # Fill
+    - !type:PrototypeDunGen
+      proto: VGRoidFill
+    # Ores
+    - !type:OreDunGen
+      replacement: IronRock
+      entity: IronRockIron
+      count: 50
+      minGroupSize: 20
+      maxGroupSize: 30
+    - !type:OreDunGen
+      replacement: IronRock
+      entity: IronRockCoal
+      count: 50
+      minGroupSize: 20
+      maxGroupSize: 30
+    - !type:OreDunGen
+      replacement: IronRock
+      entity: IronRockQuartz
+      count: 50
+      minGroupSize: 20
+      maxGroupSize: 30
+    - !type:OreDunGen
+      replacement: IronRock
+      entity: IronRockSalt
+      count: 50
+      minGroupSize: 20
+      maxGroupSize: 30
+    - !type:OreDunGen
+      replacement: IronRock
+      entity: IronRockGold
+      count: 50
+      minGroupSize: 10
+      maxGroupSize: 20
+    - !type:OreDunGen
+      replacement: IronRock
+      entity: IronRockSilver
+      count: 50
+      minGroupSize: 10
+      maxGroupSize: 20
+    - !type:OreDunGen
+      replacement: IronRock
+      entity: IronRockPlasma
+      count: 50
+      minGroupSize: 10
+      maxGroupSize: 20
+    - !type:OreDunGen
+      replacement: IronRock
+      entity: IronRockUranium
+      count: 50
+      minGroupSize: 10
+      maxGroupSize: 20
+    - !type:OreDunGen
+      replacement: IronRock
+      entity: IronRockBananium
+      count: 50
+      minGroupSize: 10
+      maxGroupSize: 20
+    - !type:OreDunGen
+      replacement: IronRock
+      entity: IronRockArtifactFragment
+      count: 50
+      minGroupSize: 2
+      maxGroupSize: 4
+    - !type:OreDunGen
+      replacement: IronRock
+      entity: IronRockDiamond
+      count: 15
+      minGroupSize: 1
+      maxGroupSize: 2
+
+# Configs
+- type: dungeonConfig
+  id: VGRoidBlob
+  layers:
+  - !type:NoiseDistanceDunGen
+    size: 272, 272
+    distanceConfig: !type:DunGenEuclideanSquaredDistance
+      blendWeight: 0.80
+    layers:
+    - tile: FloorAsteroidSand
+      threshold: 0.50
+      noise:
+        frequency: 0.010
+        noiseType: OpenSimplex2
+        fractalType: FBm
+        octaves: 5
+        lacunarity: 2
+        gain: 0.5
+
+- type: dungeonConfig
+  id: VGRoidSmaller
+  minOffset: 40
+  maxOffset: 60
+  layers:
+  - !type:NoiseDistanceDunGen
+    size: 150, 150
+    distanceConfig: !type:DunGenEuclideanSquaredDistance
+    layers:
+    - tile: FloorAsteroidSand
+      threshold: 0.50
+      noise:
+        frequency: 0.080
+        noiseType: OpenSimplex2
+        fractalType: FBm
+        octaves: 5
+        lacunarity: 1.5
+        gain: 0.5
+
+- type: dungeonConfig
+  id: VGRoidExterior
+  reserveTiles: true
+  data:
+    tiles:
+      FallbackTile: PlatingAsteroid
+      WidenTile: FloorAsteroidSand
+  layers:
+  - !type:PrototypeDunGen
+    proto: VGRoidExteriorDungeons
+  - !type:SplineDungeonConnectorDunGen
+
+- type: dungeonConfig
+  id: VGRoidExteriorDungeons
+  reserveTiles: true
+  minCount: 2
+  maxCount: 3
+  layers:
+  - !type:ExteriorDunGen
+    proto: Experiment
+  - !type:MobsDunGen
+    minCount: 5
+    maxCount: 8
+    groups:
+    - id: MobXeno
+      amount: 1
+
+#- type: dungeonConfig
+#  id: VGRoidInteriorDungeons
+#  minCount: 3
+#  maxCount: 5
+#  # Just randomly spawn these in bounds, doesn't really matter if they go out.
+
+- type: dungeonConfig
+  id: VGRoidSmallPaths
+  reserveTiles: true
+  layers:
+  - !type:ReplaceTileDunGen
+    layers:
+    - tile: FloorAsteroidSand
+      threshold: 0.75
+      noise:
+        frequency: 0.040
+        noiseType: OpenSimplex2
+        fractalType: Ridged
+        lacunarity: 1.5
+        octaves: 2
+        gain: 2.0
+  # Mobs
+  # If you want exterior dungeon mobs add them under the prototype.
+  - !type:MobsDunGen
+    minCount: 20
+    maxCount: 30
+    groups:
+    - id: MobXeno
+      amount: 1
+
+#- type: dungeonConfig
+#  id: VGRoidOres
+
+# Fill with rocks.
+- type: dungeonConfig
+  id: VGRoidFill
+  data:
+    entities:
+      Fill: IronRock
+  layers:
+  - !type:FillGridDunGen
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
index 72b8d681551..fac699baebe 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
@@ -1796,6 +1796,10 @@
         - !type:AdjustReagent
           reagent: Theobromine
           amount: 0.05
+        - !type:GenericStatusEffect
+          key: Drowsiness
+          time: 1.0
+          type: Remove
   fizziness: 0.25
 
 - type: reagent
@@ -1823,6 +1827,10 @@
         - !type:AdjustReagent
           reagent: Theobromine
           amount: 0.05
+        - !type:GenericStatusEffect
+          key: Drowsiness
+          time: 1.0
+          type: Remove
   fizziness: 0.15
 
 - type: reagent
@@ -1850,6 +1858,10 @@
         - !type:AdjustReagent
           reagent: Theobromine
           amount: 0.05
+        - !type:GenericStatusEffect
+          key: Drowsiness
+          time: 1.0
+          type: Remove
   fizziness: 0.15
 
 - type: reagent
@@ -1877,6 +1889,10 @@
         - !type:AdjustReagent
           reagent: Theobromine
           amount: 0.05
+        - !type:GenericStatusEffect
+          key: Drowsiness
+          time: 1.0
+          type: Remove
   fizziness: 0.25
 
 - type: reagent
@@ -1904,6 +1920,10 @@
         - !type:AdjustReagent
           reagent: Theobromine
           amount: 0.05
+        - !type:GenericStatusEffect
+          key: Drowsiness
+          time: 1.0
+          type: Remove
   fizziness: 0.15
 
 - type: reagent
@@ -1931,4 +1951,8 @@
         - !type:AdjustReagent
           reagent: Theobromine
           amount: 0.05
+        - !type:GenericStatusEffect
+          key: Drowsiness
+          time: 1.0
+          type: Remove
   fizziness: 0.25
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
index 52a01d973f6..3f9fb7b53d2 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
@@ -12,6 +12,10 @@
       effects:
       - !type:SatiateThirst
         factor: 2
+      - !type:GenericStatusEffect
+        key: Drowsiness
+        time: 2.0
+        type: Remove
       - !type:AdjustReagent
         reagent: Theobromine
         amount: 0.05
@@ -96,6 +100,15 @@
   metamorphicMaxFillLevels: 1
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:GenericStatusEffect
+        key: Drowsiness
+        time: 2.0
+        type: Remove
 
 - type: reagent
   id: GreenTea
@@ -145,6 +158,15 @@
   metamorphicMaxFillLevels: 5
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:GenericStatusEffect
+        key: Drowsiness
+        time: 2.0
+        type: Remove
 
 - type: reagent
   id: IcedGreenTea
@@ -322,6 +344,10 @@
       effects:
       - !type:SatiateThirst
         factor: 6
+      - !type:GenericStatusEffect
+        key: Drowsiness
+        time: 3.0
+        type: Remove
     Poison:
       effects:
       - !type:HealthChange
@@ -354,6 +380,15 @@
   metamorphicMaxFillLevels: 1
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:GenericStatusEffect
+        key: Drowsiness
+        time: 2.0
+        type: Remove
 
 - type: reagent
   id: Tea
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
index d78b0351cee..49290677a1e 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
@@ -13,6 +13,15 @@
   metamorphicMaxFillLevels: 5
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:GenericStatusEffect
+        key: Drowsiness
+        time: 1.0
+        type: Remove
 
 - type: reagent
   id: RoyRogers
@@ -68,6 +77,10 @@
       effects:
       - !type:SatiateThirst
         factor: 2
+      - !type:GenericStatusEffect
+        key: Drowsiness
+        time: 2.0
+        type: Remove
       - !type:AdjustReagent
         reagent: Theobromine
         amount: 0.1
diff --git a/Resources/Prototypes/Reagents/Materials/ores.yml b/Resources/Prototypes/Reagents/Materials/ores.yml
index 18f1d9ebb3a..1555ab9e234 100644
--- a/Resources/Prototypes/Reagents/Materials/ores.yml
+++ b/Resources/Prototypes/Reagents/Materials/ores.yml
@@ -24,6 +24,15 @@
   color: "#FFD700"
   price: 0.2
 
+- type: material
+  id: RawDiamond
+  stackEntity: DiamondOre1
+  name: materials-raw-diamond
+  unit: materials-unit-piece
+  icon: { sprite: Objects/Materials/ore.rsi, state: diamond }
+  color: "#C9D8F2"
+  price: 0.5
+
 - type: material
   id: RawSilver
   stackEntity: SilverOre1
diff --git a/Resources/Prototypes/Reagents/cleaning.yml b/Resources/Prototypes/Reagents/cleaning.yml
index da02fc666d8..a6b53be6883 100644
--- a/Resources/Prototypes/Reagents/cleaning.yml
+++ b/Resources/Prototypes/Reagents/cleaning.yml
@@ -77,8 +77,6 @@
   meltingPoint: 18.2
   tileReactions:
     - !type:SpillTileReaction
-      paralyzeTime: 3
-      launchForwardsMultiplier: 2
       requiredSlipSpeed: 1
       superSlippery: true
 
diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
index 12c694e09e4..defe4c1af38 100644
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@@ -900,6 +900,10 @@
       - !type:GenericStatusEffect
         key: Stutter
         component: StutteringAccent
+      - !type:GenericStatusEffect
+        key: Drowsiness
+        time: 10
+        type: Remove
       - !type:ResetNarcolepsy
         conditions:
         - !type:ReagentThreshold
@@ -921,6 +925,10 @@
   metabolisms:
     Medicine:
       effects:
+      - !type:GenericStatusEffect
+        key: Drowsiness
+        time: 10
+        type: Remove
       - !type:ResetNarcolepsy
         conditions:
         - !type:ReagentThreshold
@@ -1256,3 +1264,82 @@
         - "psicodine-effect-anxieties-wash-away"
         - "psicodine-effect-at-peace"
         probability: 0.2
+
+- type: reagent
+  id: PotassiumIodide
+  name: reagent-name-potassium-iodide
+  group: Medicine
+  desc: reagent-desc-potassium-iodide
+  physicalDesc: reagent-physical-desc-grainy
+  flavor: medicine
+  color: "#baa15d"
+  metabolisms:
+    Medicine:
+      effects:
+      - !type:GenericStatusEffect
+        key: RadiationProtection
+        component: RadiationProtection
+        time: 2
+        type: Add
+        refresh: false
+      - !type:HealthChange
+        conditions:
+          - !type:ReagentThreshold
+            min: 20
+        damage:
+          types:
+            Poison: 1
+
+- type: reagent
+  id: Haloperidol
+  name: reagent-name-haloperidol
+  group: Medicine
+  desc: reagent-desc-haloperidol
+  physicalDesc: reagent-physical-desc-crystalline
+  flavor: medicine
+  color: "#27870a"
+  metabolisms:
+    Medicine:
+      effects:
+      - !type:Emote
+        emote: Yawn
+        showInChat: true
+        probability: 0.1
+      - !type:GenericStatusEffect
+        key: Drowsiness
+        component: Drowsiness
+        time: 4
+        type: Add
+        refresh: false
+      - !type:GenericStatusEffect
+        key: Jitter
+        time: 4.0
+        type: Remove
+      - !type:GenericStatusEffect
+        key: SeeingRainbows
+        time: 10.0
+        type: Remove
+      - !type:AdjustReagent
+        reagent: Desoxyephedrine
+        amount: -3.0
+      - !type:AdjustReagent
+        reagent: Ephedrine
+        amount: -3.0
+      - !type:AdjustReagent
+        reagent: Stimulants
+        amount: -3.0
+      - !type:AdjustReagent
+        reagent: THC
+        amount: -3.0
+      - !type:AdjustReagent
+        reagent: SpaceDrugs
+        amount: -3.0
+      - !type:AdjustReagent
+        reagent: Bananadine
+        amount: -3.0
+      - !type:AdjustReagent
+        reagent: SpaceGlue
+        amount: -3.0
+      - !type:AdjustReagent
+        reagent: MindbreakerToxin
+        amount: -3.0
diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml
index e20fb5dd57e..ca4c613dae4 100644
--- a/Resources/Prototypes/Reagents/narcotics.yml
+++ b/Resources/Prototypes/Reagents/narcotics.yml
@@ -40,6 +40,14 @@
         key: KnockedDown
         time: 3
         type: Remove
+      - !type:GenericStatusEffect
+        conditions:
+        - !type:ReagentThreshold
+          reagent: Haloperidol
+          max: 0.01
+        key: Drowsiness
+        time: 10
+        type: Remove
       - !type:AdjustReagent # Delta-V - Addictive
         probability: 0.6 # Chance of Addiction rising per tick
         conditions:
@@ -90,6 +98,14 @@
         key: KnockedDown
         time: 1
         type: Remove
+      - !type:GenericStatusEffect
+        conditions:
+        - !type:ReagentThreshold
+          reagent: Haloperidol
+          max: 0.01
+        key: Drowsiness
+        time: 10
+        type: Remove
       - !type:PopupMessage
         visualType: Medium
         messages: ["ephedrine-effect-tight-pain", "ephedrine-effect-heart-pounds"]
@@ -150,6 +166,14 @@
         key: ForcedSleep
         time: 3
         type: Remove
+      - !type:GenericStatusEffect
+        conditions:
+        - !type:ReagentThreshold
+          reagent: Haloperidol
+          max: 0.01
+        key: Drowsiness
+        time: 10
+        type: Remove
     Medicine:
       metabolismRate: 1.0
       effects:
@@ -161,8 +185,7 @@
         - !type:HealthChange
           conditions:
           - !type:TotalDamage
-            min: 70
-            max: 120 # you've got a chance to get out of crit
+            min: 70 # only heals when you're more dead than alive
           damage: # heals at the same rate as tricordrazine, doesn't heal poison because if you OD'd I'm not giving you a safety net
             groups:
               Burn: -1
diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml
index 59d123aca05..a57aefd5a69 100644
--- a/Resources/Prototypes/Reagents/toxins.yml
+++ b/Resources/Prototypes/Reagents/toxins.yml
@@ -56,18 +56,19 @@
   metabolisms:
     Poison:
       effects:
+      - !type:Emote
+        emote: Yawn
+        showInChat: true
+        probability: 0.1
       - !type:MovespeedModifier
         walkSpeedModifier: 0.65
         sprintSpeedModifier: 0.65
       - !type:GenericStatusEffect
-        conditions:
-        - !type:ReagentThreshold
-          reagent: ChloralHydrate
-          min: 10
-        key: ForcedSleep
-        component: ForcedSleeping
-        refresh: false
+        key: Drowsiness
+        component: Drowsiness
+        time: 4
         type: Add
+        refresh: false
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/clown_banana.yml b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/clown_banana.yml
index 190293f9d15..1cada5018cb 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/clown_banana.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/clown_banana.yml
@@ -7,19 +7,19 @@
         - to: jumpsuit
           steps:
             - tag: BananaPeel
-              name: A Banana Peel
+              name: a banana peel
               icon:
                 sprite: Objects/Specific/Hydroponics/banana.rsi
                 state: peel
               doAfter: 1
             - tag: BananaPeel
-              name: A Banana Peel
+              name: a banana peel
               icon:
                 sprite: Objects/Specific/Hydroponics/banana.rsi
                 state: peel
               doAfter: 1
             - tag: BananaPeel
-              name: A Banana Peel
+              name: a banana peel
               icon:
                 sprite: Objects/Specific/Hydroponics/banana.rsi
                 state: peel
@@ -28,7 +28,7 @@
               amount: 1
               doAfter: 1
             - tag: ClownSuit
-              name: A Clown Suit
+              name: a clown suit
               icon:
                 sprite: Clothing/Uniforms/Jumpsuit/clown.rsi
                 state: icon
@@ -45,19 +45,19 @@
         - to: shoes
           steps:
             - tag: BananaPeel
-              name: A Banana Peel
+              name: a banana peel
               icon:
                 sprite: Objects/Specific/Hydroponics/banana.rsi
                 state: peel
               doAfter: 1
             - tag: BananaPeel
-              name: A Banana Peel
+              name: a banana peel
               icon:
                 sprite: Objects/Specific/Hydroponics/banana.rsi
                 state: peel
               doAfter: 1
             - tag: BananaPeel
-              name: A Banana Peel
+              name: a banana peel
               icon:
                 sprite: Objects/Specific/Hydroponics/banana.rsi
                 state: peel
@@ -66,7 +66,7 @@
               amount: 1
               doAfter: 1
             - tag: ClownShoes
-              name: Clown Shoes
+              name: clown shoes
               icon:
                 sprite: Clothing/Shoes/Specific/clown.rsi
                 state: icon
@@ -83,19 +83,19 @@
         - to: mask
           steps:
             - tag: BananaPeel
-              name: A Banana Peel
+              name: a banana peel
               icon:
                 sprite: Objects/Specific/Hydroponics/banana.rsi
                 state: peel
               doAfter: 1
             - tag: BananaPeel
-              name: A Banana Peel
+              name: a banana peel
               icon:
                 sprite: Objects/Specific/Hydroponics/banana.rsi
                 state: peel
               doAfter: 1
             - tag: BananaPeel
-              name: A Banana Peel
+              name: a banana peel
               icon:
                 sprite: Objects/Specific/Hydroponics/banana.rsi
                 state: peel
@@ -104,7 +104,7 @@
               amount: 1
               doAfter: 1
             - tag: ClownMask
-              name: A Clown Mask
+              name: a clown mask
               icon:
                 sprite: Clothing/Mask/clown.rsi
                 state: icon
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/clown_hardsuit.yml b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/clown_hardsuit.yml
index da5ea21edf5..1600cd4641f 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/clown_hardsuit.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/clown_hardsuit.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: ClownHardsuit
   start: start
   graph:
@@ -10,13 +10,13 @@
               amount: 5
               doAfter: 1
             - tag: SuitEVA
-              name: An EVA suit
+              name: an EVA suit
               icon:
                 sprite: Clothing/OuterClothing/Suits/eva.rsi
                 state: icon
               doAfter: 1
             - tag: HelmetEVA
-              name: An EVA helmet
+              name: an EVA helmet
               icon:
                 sprite: Clothing/Head/Helmets/eva.rsi
                 state: icon
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/mime_hardsuit.yml b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/mime_hardsuit.yml
index b74cf656391..a1621f44950 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/mime_hardsuit.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/mime_hardsuit.yml
@@ -10,13 +10,13 @@
               amount: 5
               doAfter: 1
             - tag: SuitEVA
-              name: An EVA suit
+              name: an EVA suit
               icon:
                 sprite: Clothing/OuterClothing/Suits/eva.rsi
                 state: icon
               doAfter: 1
             - tag: HelmetEVA
-              name: An EVA helmet
+              name: an EVA helmet
               icon:
                 sprite: Clothing/Head/Helmets/eva.rsi
                 state: icon
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/fun/bananium_horn.yml b/Resources/Prototypes/Recipes/Construction/Graphs/fun/bananium_horn.yml
index a4d0edc46a6..e8380d0d2db 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/fun/bananium_horn.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/fun/bananium_horn.yml
@@ -7,7 +7,7 @@
         - to: bananiumHorn
           steps:
             - tag: Pipe
-              name: Pipe
+              name: pipe
               icon:
                 sprite: Structures/Piping/Atmospherics/pipe.rsi
                 state: pipeStraight
@@ -16,7 +16,7 @@
               amount: 4
               doAfter: 1
             - tag: BikeHorn
-              name: Bike Horn
+              name: bike horn
               icon:
                 sprite: Objects/Fun/bikehorn.rsi
                 state: icon
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/mannequin.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/mannequin.yml
index f83a3b1e95e..45ac8cc7021 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/mannequin.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/mannequin.yml
@@ -20,6 +20,7 @@
       edges:
         - to: start
           completed:
+            - !type:EmptyAllContainers
             - !type:SpawnPrototype
               prototype: MaterialWoodPlank
               amount: 5
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml
new file mode 100644
index 00000000000..1a6492fd927
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml
@@ -0,0 +1,277 @@
+- type: constructionGraph
+  id: Shelf
+  start: start
+  graph:
+    - node: start
+      actions:
+        - !type:DeleteEntity {}
+      edges:
+# Normal
+        - to: ShelfWood
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: WoodPlank
+              amount: 4
+              doAfter: 2
+        - to: ShelfMetal
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: Steel
+              amount: 5
+              doAfter: 3
+        - to: ShelfGlass
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: Glass
+              amount: 4
+              doAfter: 2
+# Reinforced
+        - to: ShelfRWood
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: WoodPlank
+              amount: 8
+              doAfter: 3
+            - material: Cable
+              amount: 2
+              doAfter: 1
+        - to: ShelfRMetal
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: Plasteel
+              amount: 5
+              doAfter: 3
+            - material: ReinforcedGlass
+              amount: 5
+              doAfter: 2
+            - material: Cable
+              amount: 3
+              doAfter: 1
+        - to: ShelfRGlass
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: Plastic
+              amount: 5
+              doAfter: 2
+            - material: ReinforcedGlass
+              amount: 5
+              doAfter: 3
+            - material: Cable
+              amount: 2
+              doAfter: 1
+# Departmental
+        - to: ShelfBar
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: WoodPlank
+              amount: 6
+              doAfter: 2
+        - to: ShelfKitchen
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: MetalRod
+              amount: 2
+              doAfter: 1
+            - material: Steel
+              amount: 5
+            - material: WoodPlank
+              amount: 3
+              doAfter: 2
+        - to: ShelfChemistry
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: Plasteel
+              amount: 2
+              doAfter: 2
+            - material: ReinforcedGlass
+              amount: 5
+              doAfter: 2
+            - material: Plastic
+              amount: 5
+              doAfter: 2
+            - material: Cable
+              amount: 2
+              doAfter: 1
+
+# Normal deconstructs
+    - node: ShelfWood
+      entity: ShelfWood
+      edges:
+        - to: start
+          completed:
+            - !type:EmptyAllContainers
+            - !type:SpawnPrototype
+                prototype: MaterialWoodPlank1
+                amount: 4
+          steps:
+            - tool: Prying
+              doAfter: 2
+
+    - node: ShelfMetal
+      entity: ShelfMetal
+      edges:
+        - to: start
+          completed:
+            - !type:EmptyAllContainers
+            - !type:SpawnPrototype
+                prototype: SheetSteel1
+                amount: 5
+          steps:
+            - tool: Screwing
+              doAfter: 5
+
+    - node: ShelfGlass
+      entity: ShelfGlass
+      edges:
+        - to: start
+          completed:
+            - !type:EmptyAllContainers
+            - !type:SpawnPrototype
+                prototype: SheetGlass1
+                amount: 4
+          steps:
+            - tool: Screwing
+              doAfter: 2
+# Reinforced deconstructs
+    - node: ShelfRWood
+      entity: ShelfRWood
+      edges:
+        - to: start
+          completed:
+            - !type:EmptyAllContainers
+            - !type:SpawnPrototype
+                prototype: MaterialWoodPlank1
+                amount: 8
+            - !type:SpawnPrototype
+                prototype: CableApcStack1
+                amount: 2
+          steps:
+            - tool: Screwing
+              doAfter: 5
+            - tool: Prying
+              doAfter: 2
+
+    - node: ShelfRMetal
+      entity: ShelfRMetal
+      edges:
+        - to: start
+          completed:
+            - !type:EmptyAllContainers
+            - !type:SpawnPrototype
+                prototype: SheetPlasteel1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: SheetRGlass1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: CableApcStack1
+                amount: 3
+          steps:
+            - tool: Screwing
+              doAfter: 2
+            - tool: Welding
+              doAfter: 5
+
+    - node: ShelfRGlass
+      entity: ShelfRGlass
+      edges:
+        - to: start
+          completed:
+            - !type:EmptyAllContainers
+            - !type:SpawnPrototype
+                prototype: SheetPlastic1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: SheetRGlass1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: CableApcStack1
+                amount: 2
+          steps:
+            - tool: Welding
+              doAfter: 2
+            - tool: Screwing
+              doAfter: 4
+
+# Departmental deconstructs
+    - node: ShelfBar
+      entity: ShelfBar
+      edges:
+        - to: start
+          completed:
+            - !type:EmptyAllContainers
+            - !type:SpawnPrototype
+                prototype: MaterialWoodPlank1
+                amount: 6
+          steps:
+            - tool: Prying
+              doAfter: 3
+
+    - node: ShelfKitchen
+      entity: ShelfKitchen
+      edges:
+        - to: start
+          completed:
+            - !type:EmptyAllContainers
+            - !type:SpawnPrototype
+                prototype: PartRodMetal
+                amount: 2
+            - !type:SpawnPrototype
+                prototype: SheetSteel1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: MaterialWoodPlank1
+                amount: 3
+          steps:
+            - tool: Screwing
+              doAfter: 2
+            - tool: Welding
+              doAfter: 2
+            - tool: Prying
+              doAfter: 1
+
+    - node: ShelfChemistry
+      entity: ShelfChemistry
+      edges:
+        - to: start
+          completed:
+            - !type:EmptyAllContainers
+            - !type:SpawnPrototype
+                prototype: SheetPlasteel1
+                amount: 2
+            - !type:SpawnPrototype
+                prototype: SheetPlastic1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: SheetRGlass1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: CableApcStack1
+                amount: 2
+          steps:
+            - tool: Welding
+              doAfter: 2
+            - tool: Screwing
+              doAfter: 1
+            - tool: Anchoring
+              doAfter: 2
+            - tool: Prying
+              doAfter: 4
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/blast_door.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/blast_door.yml
index ad84d830a70..782e894fe73 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/blast_door.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/blast_door.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: BlastDoor
   start: start
   graph:
@@ -47,7 +47,7 @@
           steps:
             - tag: DoorElectronics
               store: board
-              name: Door Electronics
+              name: door electronics
               icon:
                 sprite: "Objects/Misc/module.rsi"
                 state: "door_electronics"
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml
index 0d7bdddd2f2..74ac16eabd2 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: Firelock
   start: start
   graph:
@@ -50,7 +50,7 @@
           steps:
             - tag: FirelockElectronics
               store: board
-              name: Firelock Electronics
+              name: firelock electronics
               icon:
                 sprite: "Objects/Misc/module.rsi"
                 state: "mainboard"
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/glassbox.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/glassbox.yml
index 081f22ea8dd..2a051b46d4e 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/glassbox.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/glassbox.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: GlassBox
   start: start
   graph:
@@ -42,7 +42,7 @@
             - !type:EntityAnchored
           steps:
             - tag: SignalTrigger
-              name: a Signal Trigger
+              name: a signal trigger
               icon:
                 sprite: Objects/Devices/signaltrigger.rsi
                 state: signaltrigger
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/railing.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/railing.yml
index f050c65c42c..1772bddea0b 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/railing.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/railing.yml
@@ -6,32 +6,28 @@
       edges:
         - to: railing
           completed:
-            - !type:SnapToGrid
-              southRotation: true
+            - !type:SnapToGrid { }
           steps:
             - material: MetalRod
               amount: 1
               doAfter: 2
         - to: railingCorner
           completed:
-            - !type:SnapToGrid
-              southRotation: true
+            - !type:SnapToGrid { }
           steps:
             - material: MetalRod
               amount: 2
               doAfter: 2.5
         - to: railingCornerSmall
           completed:
-            - !type:SnapToGrid
-              southRotation: true
+            - !type:SnapToGrid { }
           steps:
             - material: MetalRod
               amount: 1
               doAfter: 2
         - to: railingRound
           completed:
-            - !type:SnapToGrid
-              southRotation: true
+            - !type:SnapToGrid { }
           steps:
             - material: MetalRod
               amount: 2
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/shutter.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/shutter.yml
index db53de288a4..7086216cba3 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/shutter.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/shutter.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: Shutters
   start: start
   graph:
@@ -45,7 +45,7 @@
               anchored: true
           steps:
             - component: DoorElectronics
-              name: Door Electronics
+              name: door electronics
               icon:
                 sprite: "Objects/Misc/module.rsi"
                 state: "door_electronics"
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml b/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
index 6e64f061eb9..d366a2ea59a 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
@@ -34,7 +34,7 @@
           state: icon
         name: a multitool
   - node: logic_gate
-    entity: LogicGate
+    entity: LogicGateOr
   - node: edge_detector
     entity: EdgeDetector
   - node: power_sensor
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/disposal_machines.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/disposal_machines.yml
index 2f151336959..8c880d39641 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/disposal_machines.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/disposal_machines.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: DisposalMachine
   start: start
   graph:
@@ -64,7 +64,7 @@
         - to: frame_mailing
           steps:
             - tag: MailingUnitElectronics
-              name: Mailing Unit Electronics
+              name: mailing unit electronics
               icon:
                 sprite: "Objects/Misc/module.rsi"
                 state: "net_wired"
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/intercom.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/intercom.yml
index 2247860f892..ba29d72539a 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/intercom.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/intercom.yml
@@ -11,13 +11,17 @@
         doAfter: 2.0
 
   - node: assembly
-    entity: IntercomAssesmbly
+    entity: IntercomAssembly
     edges:
     - to: wired
       steps:
       - material: Cable
         amount: 2
         doAfter: 1
+      completed:
+      - !type:VisualizerDataInt
+        key: "enum.ConstructionVisuals.Layer"
+        data: 1
     - to: start
       completed:
       - !type:GivePrototype
@@ -29,7 +33,7 @@
         doAfter: 2
 
   - node: wired
-    entity: IntercomAssesmbly
+    entity: IntercomAssembly
     edges:
     - to: electronics
       steps:
@@ -45,6 +49,9 @@
       - !type:GivePrototype
         prototype: CableApcStack1
         amount: 2
+      - !type:VisualizerDataInt
+        key: "enum.ConstructionVisuals.Layer"
+        data: 0
       steps:
       - tool: Cutting
         doAfter: 1
@@ -57,7 +64,11 @@
         doAfter: 2
 
   - node: intercom
-    entity: IntercomCommon #TODO: make this work with encryption keys
+    entity: IntercomConstructed
+    doNotReplaceInheritingEntities: true
+    actions:
+    - !type:SetWiresPanelSecurity
+      wiresAccessible: true
     edges:
     - to: wired
       conditions:
@@ -72,3 +83,27 @@
       steps:
       - tool: Prying
         doAfter: 1
+    - to: intercomReinforced
+      conditions:
+      - !type:WirePanel
+      steps:
+      - material: Steel
+        amount: 1
+      - tool: Welding
+        doAfter: 1
+
+  - node: intercomReinforced
+    actions:
+    - !type:SetWiresPanelSecurity
+      examine: wires-panel-component-on-examine-security-level2
+      wiresAccessible: false
+    edges:
+    - to: intercom
+      conditions:
+      - !type:WirePanel
+      completed:
+      - !type:GivePrototype
+        prototype: SheetSteel1
+      steps:
+      - tool: Welding
+        doAfter: 5
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml
index 922e8857c92..f27b751572b 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml
@@ -7,7 +7,7 @@
         - to: solarassembly
           steps:
             - tag: SolarAssemblyFlatpack
-              name: Solar Assembly Parts
+              name: solar assembly parts
               icon:
                 sprite: Objects/Devices/flatpack.rsi
                 state: solar-assembly-part
@@ -39,7 +39,7 @@
             - !type:EntityAnchored
           steps:
             - tag: SolarTrackerElectronics
-              name: Solar Tracker Electronics
+              name: solar tracker electronics
               icon:
                 sprite: Objects/Misc/module.rsi
                 state: id_mod
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml
index 346b49cf2f7..04b94690467 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml
@@ -13,7 +13,7 @@
         amount: 1
         doAfter: 0.5
       - tag: GlassShard
-        name: Glass Shard
+        name: glass shard
         icon:
           sprite: Objects/Materials/Shards/shard.rsi
           state: shard1
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_grenade.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_grenade.yml
index 243a030c981..838a6cdb6c2 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_grenade.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_grenade.yml
@@ -48,13 +48,13 @@
       steps:
       - component: PayloadTrigger
         store: payloadTrigger
-        name: Trigger
+        name: trigger
         doAfter: 0.5
     - to: caseWithPayload
       steps:
       - tag: Payload
         store: payload
-        name: Payload
+        name: payload
         doAfter: 0.5
 
   - node: caseWithTrigger
@@ -74,7 +74,7 @@
       steps:
       - tag: Payload
         store: payload
-        name: Payload
+        name: payload
         doAfter: 0.5
 
   - node: caseWithPayload
@@ -94,7 +94,7 @@
       steps:
       - component: PayloadTrigger
         store: payloadTrigger
-        name: Trigger
+        name: trigger
         doAfter: 0.5
 
   - node: grenade
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_mine.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_mine.yml
index 820676d1737..39272a9b610 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_mine.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_mine.yml
@@ -52,7 +52,7 @@
       steps:
       - tag: Payload
         store: payload
-        name: Payload
+        name: payload
         doAfter: 0.5
 
   - node: mine
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml
index 28de8e7f7d4..51a1f9905e0 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml
@@ -22,7 +22,7 @@
     - to: icon
       steps:
       - tag: GlassShard
-        name: Glass Shard
+        name: glass shard
         icon:
           sprite: Objects/Materials/Shards/shard.rsi
           state: shard1
@@ -57,7 +57,7 @@
     - to: icon
       steps:
       - tag: ReinforcedGlassShard
-        name: Reinforced Glass Shard
+        name: reinforced glass shard
         icon:
           sprite: Objects/Materials/Shards/shard.rsi
           state: shard1
@@ -92,7 +92,7 @@
     - to: icon
       steps:
       - tag: PlasmaGlassShard
-        name: Plasma Glass Shard
+        name: plasma glass shard
         icon:
           sprite: Objects/Materials/Shards/shard.rsi
           state: shard1
@@ -127,7 +127,7 @@
     - to: icon
       steps:
       - tag: UraniumGlassShard
-        name: Uranium Glass Shard
+        name: uranium glass shard
         icon:
           sprite: Objects/Materials/Shards/shard.rsi
           state: shard1
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml
index f1efe63ff50..3d65c13fe26 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml
@@ -13,7 +13,7 @@
               amount: 3
               doAfter: 1
             - tag: GlassShard
-              name: Glass Shard
+              name: glass shard
               icon:
                 sprite: Objects/Materials/Shards/shard.rsi
                 state: shard1
@@ -36,7 +36,7 @@
               amount: 3
               doAfter: 1
             - tag: ReinforcedGlassShard
-              name: Reinforced Glass Shard
+              name: reinforced glass shard
               icon:
                 sprite: Objects/Materials/Shards/shard.rsi
                 state: shard1
@@ -59,7 +59,7 @@
               amount: 3
               doAfter: 1
             - tag: PlasmaGlassShard
-              name: Plasma Glass Shard
+              name: plasma glass shard
               icon:
                 sprite: Objects/Materials/Shards/shard.rsi
                 state: shard1
@@ -82,7 +82,7 @@
               amount: 3
               doAfter: 1
             - tag: UraniumGlassShard
-              name: Uranium Glass Shard
+              name: uranium glass shard
               icon:
                 sprite: Objects/Materials/Shards/shard.rsi
                 state: shard1
diff --git a/Resources/Prototypes/Recipes/Construction/furniture.yml b/Resources/Prototypes/Recipes/Construction/furniture.yml
index ea11a09b965..80e65fdac39 100644
--- a/Resources/Prototypes/Recipes/Construction/furniture.yml
+++ b/Resources/Prototypes/Recipes/Construction/furniture.yml
@@ -899,9 +899,9 @@
   objectType: Structure
   placementMode: SnapgridCenter
   canRotate: true
-  canBuildInImpassable: false
+  canBuildInImpassable: true
   conditions:
-    - !type:TileNotBlocked
+    - !type:WallmountCondition
 
 - type: construction
   id: Mannequin
diff --git a/Resources/Prototypes/Recipes/Construction/storage.yml b/Resources/Prototypes/Recipes/Construction/storage.yml
index c8edebc5096..7128c79eee8 100644
--- a/Resources/Prototypes/Recipes/Construction/storage.yml
+++ b/Resources/Prototypes/Recipes/Construction/storage.yml
@@ -67,3 +67,151 @@
   canBuildInImpassable: false
   conditions:
     - !type:TileNotBlocked
+
+# Shelfs
+# Normals
+- type: construction
+  id: ShelfWood
+  name: wooden shelf
+  description: A convenient place to place, well, anything really.
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfWood
+  icon:
+    sprite: Structures/Storage/Shelfs/wood.rsi
+    state: base
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+- type: construction
+  id: ShelfMetal
+  name: metal shelf
+  description: A sturdy place to place, well, anything really.
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfMetal
+  icon:
+    sprite: Structures/Storage/Shelfs/metal.rsi
+    state: base
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+- type: construction
+  id: ShelfGlass
+  name: glass shelf
+  description: Just like a normal shelf! But fragile and without the walls!
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfGlass
+  icon:
+    sprite: Structures/Storage/Shelfs/glass.rsi
+    state: base
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+# Reinforced
+- type: construction
+  id: ShelfRWood
+  name: sturdy wooden shelf
+  description: The perfect place to store all your vintage records.
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfRWood
+  icon:
+    sprite: Structures/Storage/Shelfs/wood.rsi
+    state: rbase
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+- type: construction
+  id: ShelfRMetal
+  name: sturdy metal shelf
+  description: Nice and strong, and keeps your maints loot secure.
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfRMetal
+  icon:
+    sprite: Structures/Storage/Shelfs/metal.rsi
+    state: rbase
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+- type: construction
+  id: ShelfRGlass
+  name: sturdy glass shelf
+  description: See through, decent strength, shiny plastic case. Whats not to love?
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfRGlass
+  icon:
+    sprite: Structures/Storage/Shelfs/glass.rsi
+    state: rbase
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+# Departmental
+- type: construction
+  id: ShelfBar
+  name: bar shelf
+  description: A convenient place for all your extra booze, specifically designed to hold more bottles!
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfBar
+  icon:
+    sprite: Structures/Storage/Shelfs/Departments/Service/bar.rsi
+    state: base
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+- type: construction
+  id: ShelfKitchen
+  name: cooking shelf
+  description: Holds your knifes, spice, and everything nice!
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfKitchen
+  icon:
+    sprite: Structures/Storage/Shelfs/Departments/Service/kitchen.rsi
+    state: base
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+- type: construction
+  id: ShelfChemistry
+  name: chemical shelf
+  description: Perfect for keeping the most important chemicals safe, and out of the clumsy clowns hands!
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfChemistry
+  icon:
+    sprite: Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi
+    state: base
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml
index ba4cdb27d66..74d749910c0 100644
--- a/Resources/Prototypes/Recipes/Construction/structures.yml
+++ b/Resources/Prototypes/Recipes/Construction/structures.yml
@@ -796,7 +796,7 @@
     - !type:TileNotBlocked
 
 - type: construction
-  name: Thin firelock
+  name: thin firelock
   id: FirelockEdge
   graph: Firelock
   startNode: start
diff --git a/Resources/Prototypes/Recipes/Construction/utilities.yml b/Resources/Prototypes/Recipes/Construction/utilities.yml
index 19f2fee1837..d07201bf7b3 100644
--- a/Resources/Prototypes/Recipes/Construction/utilities.yml
+++ b/Resources/Prototypes/Recipes/Construction/utilities.yml
@@ -394,7 +394,7 @@
   targetNode: half
   category: construction-category-utilities
   placementMode: SnapgridCenter
-  canBuildInImpassable: false
+  canBuildInImpassable: true
   icon:
     sprite: Structures/Piping/Atmospherics/pipe.rsi
     state: pipeHalf
@@ -408,7 +408,7 @@
   targetNode: straight
   category: construction-category-utilities
   placementMode: SnapgridCenter
-  canBuildInImpassable: false
+  canBuildInImpassable: true
   icon:
     sprite: Structures/Piping/Atmospherics/pipe.rsi
     state: pipeStraight
@@ -422,7 +422,7 @@
   targetNode: bend
   category: construction-category-utilities
   placementMode: SnapgridCenter
-  canBuildInImpassable: false
+  canBuildInImpassable: true
   icon:
     sprite: Structures/Piping/Atmospherics/pipe.rsi
     state: pipeBend
@@ -436,7 +436,7 @@
   targetNode: tjunction
   category: construction-category-utilities
   placementMode: SnapgridCenter
-  canBuildInImpassable: false
+  canBuildInImpassable: true
   icon:
     sprite: Structures/Piping/Atmospherics/pipe.rsi
     state: pipeTJunction
@@ -450,7 +450,7 @@
   targetNode: fourway
   category: construction-category-utilities
   placementMode: SnapgridCenter
-  canBuildInImpassable: false
+  canBuildInImpassable: true
   icon:
     sprite: Structures/Piping/Atmospherics/pipe.rsi
     state: pipeFourway
@@ -489,12 +489,12 @@
   canBuildInImpassable: false
   icon:
     sprite: Structures/Piping/Atmospherics/vent.rsi
-    state: vent_off
+    state: vent_passive
   layers:
   - sprite: Structures/Piping/Atmospherics/pipe.rsi
     state: pipeHalf
   - sprite: Structures/Piping/Atmospherics/vent.rsi
-    state: vent_off
+    state: vent_passive
   conditions:
     - !type:NoUnstackableInTile
 
@@ -790,7 +790,7 @@
 # INTERCOM
 - type: construction
   name: intercom
-  id: IntercomAssesmbly
+  id: IntercomAssembly
   graph: Intercom
   startNode: start
   targetNode: intercom
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index 0a8ff18aad8..1aace5896e6 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -457,7 +457,7 @@
   time: 5
   solids:
     FoodBreadPlainSlice: 1
-    FoodButter: 1
+    FoodButterSlice: 1
 
 - type: microwaveMealRecipe
   id: RecipeFrenchToast
@@ -478,7 +478,7 @@
   solids:
     FoodBreadPlainSlice: 1
     FoodGarlic: 1
-    FoodButter: 1
+    FoodButterSlice: 1
 
 - type: microwaveMealRecipe
   id: RecipeJellyToast
@@ -576,7 +576,7 @@
   time: 30
   solids:
     FoodDoughFlat: 1
-    FoodAmbrosiaVulgaris: 3
+    LeavesCannabis: 2
     FoodCheeseSlice: 1
     FoodTomato: 1
 
@@ -591,6 +591,17 @@
     FoodCheeseSlice: 1
     FoodTomato: 1
 
+- type: microwaveMealRecipe
+  id: RecipeUraniumPizza
+  name: spicy rock pizza recipe
+  result: FoodPizzaUranium
+  time: 30
+  solids:
+    FoodDoughFlat: 1
+    FoodChiliPepper: 2
+    FoodTomato: 2
+    SheetUranium1: 2
+
 #Italian
 - type: microwaveMealRecipe
   id: RecipeBoiledSpaghetti
@@ -635,12 +646,13 @@
   name: chow mein recipe
   result: FoodNoodlesChowmein
   time: 10
+  reagents:
+    Egg: 6
   solids:
     FoodNoodlesBoiled: 1
     FoodEggplant: 1
     FoodCarrot: 1
     FoodCorn: 1
-    FoodEgg: 1
 
 - type: microwaveMealRecipe
   id: RecipeOatmeal
@@ -700,9 +712,10 @@
   name: egg-fried rice recipe
   result: FoodRiceEgg
   time: 15
+  reagents:
+    Egg: 6
   solids:
     FoodRiceBoiled: 1
-    FoodEgg: 1
     FoodCarrot: 1
 
 - type: microwaveMealRecipe
@@ -1205,7 +1218,7 @@
     Flour: 5
     Sugar: 5
   solids:
-    FoodButter: 1
+    FoodButterSlice: 1
     FoodSnackChocolateBar: 1
 
 - type: microwaveMealRecipe
@@ -1217,7 +1230,7 @@
     Flour: 5
     Sugar: 10
   solids:
-    FoodButter: 1
+    FoodButterSlice: 1
 
 - type: microwaveMealRecipe
   id: RecipeRaisinCookie
@@ -1239,7 +1252,7 @@
     Oats: 5
     Sugar: 5
   solids:
-    FoodButter: 1
+    FoodButterSlice: 1
 
 - type: microwaveMealRecipe
   id: RecipeChocolateChipPancake
@@ -1436,10 +1449,10 @@
   reagents:
     Flour: 15
     Sugar: 30
+    Egg: 18
   solids:
     FoodButter: 2
     FoodSnackChocolateBar: 2
-    FoodEgg: 3
 
 #Donks i guess
 - type: microwaveMealRecipe
@@ -1876,10 +1889,10 @@
   reagents:
     Flour: 15
     Sugar: 30
+    Egg: 18
   solids:
     FoodCannabisButter: 2
     FoodSnackChocolateBar: 2
-    FoodEgg: 3
 
 - type: microwaveMealRecipe
   id: RecipeCornInButter
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml
index 024a7c58763..e928d159332 100644
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml
@@ -9,7 +9,7 @@
             - material: MetalRod
               amount: 1
             - tag: PowerCellSmall
-              name: Power Cell Small
+              name: power cell small
               icon:
                 sprite: Objects/Power/power_cells.rsi
                 state: small
@@ -20,7 +20,7 @@
                 color: red
               name: cuffs
             - tag: Igniter
-              name: Igniter
+              name: igniter
               icon:
                 sprite: Objects/Devices/igniter.rsi
                 state: icon
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/storage/foodboxpizza.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/foodboxpizza.yml
new file mode 100644
index 00000000000..b475289e11f
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/foodboxpizza.yml
@@ -0,0 +1,15 @@
+- type: constructionGraph
+  id: FoodBoxPizza
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: foodboxpizza
+          steps:
+            - material: Cardboard
+              amount: 1
+              doAfter: 4
+
+
+    - node: foodboxpizza
+      entity: FoodBoxPizza
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/strawhat.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/strawhat.yml
index 7203a4fdfb3..be429bb5648 100644
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/strawhat.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/strawhat.yml
@@ -7,22 +7,22 @@
         - to: strawhat
           steps:
             - tag: Wheat
-              name: Wheat Bushel
+              name: wheat bushel
               icon:
                 sprite: Objects/Specific/Hydroponics/wheat.rsi
                 state: produce
             - tag: Wheat
-              name: Wheat Bushel
+              name: wheat bushel
               icon:
                 sprite: Objects/Specific/Hydroponics/wheat.rsi
                 state: produce
             - tag: Wheat
-              name: Wheat Bushel
+              name: wheat bushel
               icon:
                 sprite: Objects/Specific/Hydroponics/wheat.rsi
                 state: produce
             - tag: Wheat
-              name: Wheat Bushel
+              name: wheat bushel
               icon:
                 sprite: Objects/Specific/Hydroponics/wheat.rsi
                 state: produce
diff --git a/Resources/Prototypes/Recipes/Crafting/crates.yml b/Resources/Prototypes/Recipes/Crafting/crates.yml
index 4177b3fa2a6..72fabc2221b 100644
--- a/Resources/Prototypes/Recipes/Crafting/crates.yml
+++ b/Resources/Prototypes/Recipes/Crafting/crates.yml
@@ -64,6 +64,19 @@
   icon: { sprite: Objects/Storage/boxes.rsi, state: box }
   objectType: Item
 
+- type: construction
+  name: pizza box
+  id: FoodBoxPizza
+  graph: FoodBoxPizza
+  startNode: start
+  targetNode: foodboxpizza
+  category: construction-category-storage
+  description: A box for pizza.
+  icon: 
+    sprite: Objects/Consumable/Food/Baked/pizza.rsi
+    state: box
+  objectType: Item
+
 - type: construction
   name: coffin
   id: CrateCoffin
diff --git a/Resources/Prototypes/Recipes/Crafting/web.yml b/Resources/Prototypes/Recipes/Crafting/web.yml
index 5fe9d1b85a3..55f73fef507 100644
--- a/Resources/Prototypes/Recipes/Crafting/web.yml
+++ b/Resources/Prototypes/Recipes/Crafting/web.yml
@@ -26,8 +26,8 @@
     tags:
     - SpiderCraft
   icon:
-    sprite: Clothing/OuterClothing/WinterCoats/coatweb.rsi
-    state: icon
+    sprite: Clothing/OuterClothing/WinterCoats/coat.rsi
+    state: WEB-icon
   objectType: Item
 
 - type: construction
diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml
index b78703942e1..4690055a9fd 100644
--- a/Resources/Prototypes/Recipes/Lathes/electronics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml
@@ -974,4 +974,12 @@
   completetime: 4
   materials:
     Steel: 100
-    Glass: 500
\ No newline at end of file
+    Glass: 500
+
+- type: latheRecipe
+  id: CutterMachineCircuitboard
+  result: CutterMachineCircuitboard
+  completetime: 4
+  materials:
+    Steel: 100
+    Glass: 500
diff --git a/Resources/Prototypes/Recipes/Lathes/medical.yml b/Resources/Prototypes/Recipes/Lathes/medical.yml
index 3c87d0090bc..f4c0da5de79 100644
--- a/Resources/Prototypes/Recipes/Lathes/medical.yml
+++ b/Resources/Prototypes/Recipes/Lathes/medical.yml
@@ -144,7 +144,7 @@
 - type: latheRecipe
   id: Medkit
   result: Medkit
-  name: first aid kit (empty)
+  name: lathe-recipe-Medkit-name
   completetime: 2
   materials:
     Plastic: 300
@@ -152,7 +152,7 @@
 - type: latheRecipe
   id: MedkitBurn
   result: MedkitBurn
-  name: burn treatment kit (empty)
+  name: lathe-recipe-MedkitBurn-name
   completetime: 2
   materials:
     Plastic: 300
@@ -160,7 +160,7 @@
 - type: latheRecipe
   id: MedkitToxin
   result: MedkitToxin
-  name: toxin treatment kit (empty)
+  name: lathe-recipe-MedkitToxin-name
   completetime: 2
   materials:
     Plastic: 300
@@ -168,7 +168,7 @@
 - type: latheRecipe
   id: MedkitO2
   result: MedkitO2
-  name: oxygen deprivation treatment kit (empty)
+  name: lathe-recipe-MedkitO2-name
   completetime: 2
   materials:
     Plastic: 300
@@ -176,7 +176,7 @@
 - type: latheRecipe
   id: MedkitBrute
   result: MedkitBrute
-  name: brute trauma treatment kit (empty)
+  name: lathe-recipe-MedkitBrute-name
   completetime: 2
   materials:
     Plastic: 300
@@ -184,7 +184,7 @@
 - type: latheRecipe
   id: MedkitAdvanced
   result: MedkitAdvanced
-  name: advanced first aid kit (empty)
+  name: lathe-recipe-MedkitAdvanced-name
   completetime: 2
   materials:
     Plastic: 300
@@ -192,7 +192,7 @@
 - type: latheRecipe
   id: MedkitRadiation
   result: MedkitRadiation
-  name: radiation treatment kit (empty)
+  name: lathe-recipe-MedkitRadiation-name
   completetime: 2
   materials:
     Plastic: 300
@@ -200,7 +200,7 @@
 - type: latheRecipe
   id: MedkitCombat
   result: MedkitCombat
-  name: combat medical kit (empty)
+  name: lathe-recipe-MedkitCombat-name
   completetime: 2
   materials:
     Plastic: 300
diff --git a/Resources/Prototypes/Recipes/Lathes/sheet.yml b/Resources/Prototypes/Recipes/Lathes/sheet.yml
index 053715a1811..3efaac95a72 100644
--- a/Resources/Prototypes/Recipes/Lathes/sheet.yml
+++ b/Resources/Prototypes/Recipes/Lathes/sheet.yml
@@ -127,6 +127,13 @@
   materials:
     RawBananium: 3000
 
+- type: latheRecipe
+  id: MaterialDiamond
+  result: MaterialDiamond1
+  completetime: 3
+  materials:
+    RawDiamond: 1000
+
 - type: latheRecipe
   id: SheetUranium1
   result: SheetUranium1
diff --git a/Resources/Prototypes/Recipes/Lathes/tiles.yml b/Resources/Prototypes/Recipes/Lathes/tiles.yml
new file mode 100644
index 00000000000..8773dd245cd
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Lathes/tiles.yml
@@ -0,0 +1,363 @@
+- type: latheRecipe
+  id: FloorTileItemDark
+  result: FloorTileItemDark
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemDarkDiagonalMini
+  result: FloorTileItemDarkDiagonalMini
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemDarkDiagonal
+  result: FloorTileItemDarkDiagonal
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemDarkHerringbone
+  result: FloorTileItemDarkHerringbone
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemDarkMini
+  result: FloorTileItemDarkMini
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemDarkMono
+  result: FloorTileItemDarkMono
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemDarkPavement
+  result: FloorTileItemDarkPavement
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemDarkPavementVertical
+  result: FloorTileItemDarkPavementVertical
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemDarkOffset
+  result: FloorTileItemDarkOffset
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemSteelCheckerDark
+  result: FloorTileItemSteelCheckerDark
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemSteel
+  result: FloorTileItemSteel
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemSteelOffset
+  result: FloorTileItemSteelOffset
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemSteelDiagonalMini
+  result: FloorTileItemSteelDiagonalMini
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemSteelDiagonal
+  result: FloorTileItemSteelDiagonal
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemSteelHerringbone
+  result: FloorTileItemSteelHerringbone
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemSteelMini
+  result: FloorTileItemSteelMini
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemSteelMono
+  result: FloorTileItemSteelMono
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemSteelPavement
+  result: FloorTileItemSteelPavement
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemSteelPavementVertical
+  result: FloorTileItemSteelPavementVertical
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemWhite
+  result: FloorTileItemWhite
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemWhiteOffset
+  result: FloorTileItemWhiteOffset
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemWhiteDiagonalMini
+  result: FloorTileItemWhiteDiagonalMini
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemWhiteDiagonal
+  result: FloorTileItemWhiteDiagonal
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemWhiteHerringbone
+  result: FloorTileItemWhiteHerringbone
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemWhiteMini
+  result: FloorTileItemWhiteMini
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemWhiteMono
+  result: FloorTileItemWhiteMono
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemWhitePavement
+  result: FloorTileItemWhitePavement
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemWhitePavementVertical
+  result: FloorTileItemWhitePavementVertical
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemSteelCheckerLight
+  result: FloorTileItemSteelCheckerLight
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+# Other steel
+- type: latheRecipe
+  id: FloorTileItemGratingMaint
+  result: FloorTileItemGratingMaint
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemTechmaint
+  result: FloorTileItemTechmaint
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: FloorTileItemSteelMaint
+  result: FloorTileItemSteelMaint
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+
+# Wood
+- type: latheRecipe
+  id: FloorTileItemWood
+  result: FloorTileItemWood
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Wood: 25
+
+- type: latheRecipe
+  id: FloorTileItemWoodLarge
+  result: FloorTileItemWoodLarge
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Wood: 25
+
+- type: latheRecipe
+  id: FloorTileItemWoodPattern
+  result: FloorTileItemWoodPattern
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Wood: 25
+
+# Concrete
+- type: latheRecipe
+  id: FloorTileItemConcrete
+  result: FloorTileItemConcrete
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+    Plastic: 25
+
+- type: latheRecipe
+  id: FloorTileItemConcreteMono
+  result: FloorTileItemConcreteMono
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+    Plastic: 25
+
+- type: latheRecipe
+  id: FloorTileItemConcreteSmooth
+  result: FloorTileItemConcreteSmooth
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+    Plastic: 25
+
+- type: latheRecipe
+  id: FloorTileItemGrayConcrete
+  result: FloorTileItemGrayConcrete
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+    Plastic: 25
+
+- type: latheRecipe
+  id: FloorTileItemGrayConcreteMono
+  result: FloorTileItemGrayConcreteMono
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+    Plastic: 25
+
+- type: latheRecipe
+  id: FloorTileItemGrayConcreteSmooth
+  result: FloorTileItemGrayConcreteSmooth
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+    Plastic: 25
+
+- type: latheRecipe
+  id: FloorTileItemOldConcrete
+  result: FloorTileItemOldConcrete
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+    Plastic: 25
+
+- type: latheRecipe
+  id: FloorTileItemOldConcreteMono
+  result: FloorTileItemOldConcreteMono
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+    Plastic: 25
+
+- type: latheRecipe
+  id: FloorTileItemOldConcreteSmooth
+  result: FloorTileItemOldConcreteSmooth
+  applyMaterialDiscount: false
+  completetime: 0.5
+  materials:
+    Steel: 25
+    Plastic: 25
diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml
index 2a14c0ecd29..96cc5b6aaa4 100644
--- a/Resources/Prototypes/Recipes/Reactions/drinks.yml
+++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml
@@ -10,6 +10,8 @@
 
 - type: reaction
   id: AlliesCocktail
+  requiredMixerCategories:
+  - Shake
   reactants:
     Martini:
       amount: 2
@@ -20,6 +22,8 @@
 
 - type: reaction
   id: Amasec
+  requiredMixerCategories:
+  - Shake
   reactants:
     Wine:
       amount: 2
@@ -32,6 +36,8 @@
 
 - type: reaction
   id: Andalusia
+  requiredMixerCategories:
+  - Stir
   reactants:
     Rum:
       amount: 1
@@ -98,6 +104,8 @@
 
 - type: reaction
   id: BlueHawaiian
+  requiredMixerCategories:
+  - Shake
   reactants:
     CoconutRum:
       amount: 2
@@ -126,6 +134,8 @@
 
 - type: reaction
   id: BahamaMama
+  requiredMixerCategories:
+  - Shake
   reactants:
     Ice:
       amount: 1
@@ -168,6 +178,8 @@
 
 - type: reaction
   id: BeepskySmash
+  requiredMixerCategories:
+  - Shake
   reactants:
     Iron:
       amount: 1
@@ -190,6 +202,8 @@
 
 - type: reaction
   id: BloodyMary
+  requiredMixerCategories:
+  - Stir
   reactants:
     JuiceLime:
       amount: 1
@@ -280,6 +294,8 @@
 
 - type: reaction
   id: DemonsBlood
+  requiredMixerCategories:
+  - Stir
   reactants:
     Rum:
       amount: 1
@@ -294,6 +310,8 @@
 
 - type: reaction
   id: DevilsKiss
+  requiredMixerCategories:
+  - Stir
   reactants:
     Rum:
       amount: 1
@@ -306,6 +324,8 @@
 
 - type: reaction
   id: DoctorsDelight
+  requiredMixerCategories:
+  - Stir
   reactants:
     Cream:
       amount: 2
@@ -322,6 +342,8 @@
 
 - type: reaction
   id: DriestMartini
+  requiredMixerCategories:
+  - Shake
   reactants:
     Gin:
       amount: 1
@@ -332,6 +354,8 @@
 
 - type: reaction
   id: ErikaSurprise
+  requiredMixerCategories:
+  - Shake
   reactants:
     Ale:
       amount: 2
@@ -373,6 +397,8 @@
 
 - type: reaction
   id: GargleBlaster
+  requiredMixerCategories:
+  - Shake
   reactants:
     Cognac:
       amount: 1
@@ -411,6 +437,8 @@
 
 - type: reaction
   id: Gildlager
+  requiredMixerCategories:
+  - Shake
   reactants:
     Gold:
       amount: 1
@@ -548,6 +576,8 @@
 
 - type: reaction
   id: IrishCoffee
+  requiredMixerCategories:
+  - Stir
   reactants:
     Coffee:
       amount: 1
@@ -568,6 +598,8 @@
 
 - type: reaction
   id: KiraSpecial
+  requiredMixerCategories:
+  - Stir
   reactants:
     JuiceLime:
       amount: 1
@@ -580,6 +612,8 @@
 
 - type: reaction
   id: Lemonade
+  requiredMixerCategories:
+  - Stir
   reactants:
     JuiceLemon:
       amount: 1
@@ -592,6 +626,8 @@
 
 - type: reaction
   id: LemonLime
+  requiredMixerCategories:
+  - Stir
   reactants:
     JuiceLemon:
       amount: 1
@@ -604,6 +640,8 @@
 
 - type: reaction
   id: LongIslandIcedTea
+  requiredMixerCategories:
+  - Stir
   reactants:
     CubaLibre:
       amount: 3
@@ -618,6 +656,8 @@
 
 - type: reaction
   id: Manhattan
+  requiredMixerCategories:
+  - Shake
   reactants:
     Whiskey:
       amount: 2
@@ -658,6 +698,8 @@
 
 - type: reaction
   id: Martini
+  requiredMixerCategories:
+  - Shake
   reactants:
     Gin:
       amount: 2
@@ -679,6 +721,8 @@
 
 - type: reaction
   id: Mojito
+  requiredMixerCategories:
+  - Shake
   reactants:
     JuiceLime:
       amount: 1
@@ -726,6 +770,8 @@
 
 - type: reaction
   id: Patron
+  requiredMixerCategories:
+  - Shake
   reactants:
     Tequila:
       amount: 10
@@ -736,6 +782,8 @@
 
 - type: reaction
   id: Painkiller
+  requiredMixerCategories:
+  - Shake
   reactants:
     JuicePineapple:
       amount: 3
@@ -838,6 +886,8 @@
 
 - type: reaction
   id: ScrewdriverCocktail
+  requiredMixerCategories:
+  - Shake
   reactants:
     JuiceOrange:
       amount: 2
@@ -955,6 +1005,8 @@
 
 - type: reaction
   id: ToxinsSpecial
+  requiredMixerCategories:
+  - Shake
   reactants:
     Rum:
       amount: 2
@@ -967,6 +1019,8 @@
 
 - type: reaction
   id: VodkaMartini
+  requiredMixerCategories:
+  - Shake
   reactants:
     Vermouth:
       amount: 1
diff --git a/Resources/Prototypes/Recipes/Reactions/food.yml b/Resources/Prototypes/Recipes/Reactions/food.yml
index 50800395698..ce89131c7b3 100644
--- a/Resources/Prototypes/Recipes/Reactions/food.yml
+++ b/Resources/Prototypes/Recipes/Reactions/food.yml
@@ -84,6 +84,8 @@
       amount: 12
     Sugar:
       amount: 5
+    Milk:
+      amount: 5
   effects:
     - !type:CreateEntityReactionEffect
       entity: FoodCakeBatter
diff --git a/Resources/Prototypes/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Recipes/Reactions/medicine.yml
index 2e9b1d4f854..a99015fe90b 100644
--- a/Resources/Prototypes/Recipes/Reactions/medicine.yml
+++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml
@@ -636,3 +636,29 @@
       catalyst: true
   products:
     Happiness: 4
+
+- type: reaction
+  id: PotassiumIodide
+  reactants:
+    Potassium:
+      amount: 1
+    Iodine:
+      amount: 1
+  products:
+    PotassiumIodide: 2
+
+- type: reaction
+  id: Haloperidol
+  reactants:
+    Aluminium:
+      amount: 1
+    Chlorine:
+      amount: 1
+    Fluorine:
+      amount: 1
+    Oil:
+      amount: 1
+    PotassiumIodide:
+      amount: 1
+  products:
+    Haloperidol: 5
diff --git a/Resources/Prototypes/Roles/Antags/Thief.yml b/Resources/Prototypes/Roles/Antags/Thief.yml
index 131db8cf1da..0ef54983741 100644
--- a/Resources/Prototypes/Roles/Antags/Thief.yml
+++ b/Resources/Prototypes/Roles/Antags/Thief.yml
@@ -4,3 +4,11 @@
   antagonist: true
   setPreference: true
   objective: roles-antag-thief-objective
+
+- type: startingGear
+  id: ThiefGear
+  storage:
+    back:
+    - ToolboxThief
+    - ClothingHandsChameleonThief
+    - ThiefBeacon
diff --git a/Resources/Prototypes/Roles/Antags/ninja.yml b/Resources/Prototypes/Roles/Antags/ninja.yml
index b7949516ead..c3ac119b6ef 100644
--- a/Resources/Prototypes/Roles/Antags/ninja.yml
+++ b/Resources/Prototypes/Roles/Antags/ninja.yml
@@ -8,3 +8,31 @@
   - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement
     time: 259200 # DeltaV - 72 hours
   guides: [ SpaceNinja ]
+
+#Ninja Gear
+- type: startingGear
+  id: SpaceNinjaGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitNinja
+    back: ClothingBackpackSatchel
+    mask: ClothingMaskNinja
+    head: ClothingHeadHelmetSpaceNinja
+    eyes: ClothingEyesVisorNinja
+    gloves: ClothingHandsGlovesSpaceNinja
+    outerClothing: ClothingOuterSuitSpaceNinja
+    shoes: ClothingShoesSpaceNinja
+    id: AgentIDCard
+    ears: ClothingHeadsetGrey
+    pocket1: SpiderCharge
+    pocket2: PinpointerStation
+    belt: EnergyKatana
+  inhand:
+    - JetpackBlackFilled
+  storage:
+    back: # belt holds katana so satchel has the tools for sabotaging things
+    - Crowbar
+    - Wrench
+    - Screwdriver
+    - Wirecutter
+    - Welder
+    - Multitool
diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml
index 0f4f161086d..311e5b5c094 100644
--- a/Resources/Prototypes/Roles/Antags/nukeops.yml
+++ b/Resources/Prototypes/Roles/Antags/nukeops.yml
@@ -44,8 +44,76 @@
     time: 216000 # DeltaV - 60 hours
   - !type:DepartmentTimeRequirement # DeltaV - Security dept time requirement
     department: Security
-    time: 36000 # DeltaV - 10 hours
+    time: 36000 # DeltaV - 10 hours, was 5
   - !type:DepartmentTimeRequirement # DeltaV - Command dept time requirement
     department: Command
     time: 36000 # DeltaV - 10 hours
   - !type:WhitelistRequirement # DeltaV - Whitelist requirement
+  # should be changed to nukie playtime when thats tracked (wyci)
+
+- type: startingGear
+  id: SyndicateOperativeGearFullNoUplink
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitOperative
+    back: ClothingBackpackDuffelSyndicate
+    mask: ClothingMaskGasSyndicate
+    eyes: ClothingEyesHudSyndicate
+    ears: ClothingHeadsetAltSyndicate
+    gloves: ClothingHandsGlovesCombat
+    outerClothing: ClothingOuterHardsuitSyndie
+    shoes: ClothingShoesBootsCombatFilled
+    id: SyndiPDA
+    pocket1: DoubleEmergencyOxygenTankFilled
+    pocket2: PlushieCarp
+    belt: ClothingBeltMilitaryWebbing
+  storage:
+    back:
+    - WeaponPistolViper
+    - PinpointerSyndicateNuclear
+    - DeathAcidifierImplanter
+
+#Nuclear Operative Gear
+- type: startingGear
+  id: SyndicateOperativeGearFull
+  parent: SyndicateOperativeGearFullNoUplink
+  equipment:
+    pocket2: BaseUplinkRadio40TC
+
+#Nuclear Operative Commander Gear
+- type: startingGear
+  id: SyndicateCommanderGearFull
+  parent: SyndicateOperativeGearFull
+  equipment:
+    neck: SyndicateWhistle
+    outerClothing: ClothingOuterHardsuitSyndieCommander
+  inhand:
+    - NukeOpsDeclarationOfWar
+
+#Nuclear Operative Medic Gear
+- type: startingGear
+  id: SyndicateOperativeMedicFull
+  parent: SyndicateOperativeGearFull
+  equipment:
+    eyes: ClothingEyesHudSyndicateAgent
+    outerClothing: ClothingOuterHardsuitSyndieMedic
+    shoes: ClothingShoesBootsMagSyndie
+    id: SyndiAgentPDA
+    belt: ClothingBeltMilitaryWebbingMedFilled
+  storage:
+    back:
+    - SyndiHypo
+    - SawAdvanced
+    - Cautery
+    - CombatKnife
+    - WeaponPistolViper
+    - PinpointerSyndicateNuclear
+    - HandheldHealthAnalyzer
+    - CombatMedipen
+    - DeathAcidifierImplanter
+
+#Lone Operative Gear
+- type: startingGear
+  id: SyndicateLoneOperativeGearFull
+  parent: SyndicateOperativeGearFull
+  equipment:
+    pocket2: BaseUplinkRadio60TC
diff --git a/Resources/Prototypes/Roles/Antags/pirate.yml b/Resources/Prototypes/Roles/Antags/pirate.yml
index 235ccfdab86..849e9dc1f28 100644
--- a/Resources/Prototypes/Roles/Antags/pirate.yml
+++ b/Resources/Prototypes/Roles/Antags/pirate.yml
@@ -2,7 +2,7 @@
   id: PirateGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitPirate
-    back: ClothingBackpackPirateFilled
+    back: ClothingBackpackSatchelLeather
     head: ClothingHeadBandBlack
     shoes: ClothingShoesBootsLaceup
     id: PiratePDA
@@ -11,25 +11,15 @@
 
 - type: startingGear
   id: PirateCaptainGear
+  parent: PirateGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitPirate
-    back: ClothingBackpackPirateFilled
     head: ClothingHeadHatPirate
-    shoes: ClothingShoesBootsLaceup
-    id: PiratePDA
-    belt: ClothingBeltUtility
-    pocket1: AppraisalTool
     pocket2: EnergyCutlass
     outerClothing: ClothingOuterCoatPirate
 
 - type: startingGear
   id: PirateFirstmateGear
+  parent: PirateGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitPirate
-    back: ClothingBackpackPirateFilled
     head: ClothingHeadHatPirateTricord
-    shoes: ClothingShoesBootsLaceup
-    id: PiratePDA
-    belt: ClothingBeltUtility
-    pocket1: AppraisalTool
     outerClothing: ClothingOuterCoatGentle
diff --git a/Resources/Prototypes/Roles/Antags/revolutionary.yml b/Resources/Prototypes/Roles/Antags/revolutionary.yml
index cc3abc5e13e..7e764c4f302 100644
--- a/Resources/Prototypes/Roles/Antags/revolutionary.yml
+++ b/Resources/Prototypes/Roles/Antags/revolutionary.yml
@@ -19,3 +19,10 @@
   setPreference: false
   objective: roles-antag-rev-objective
   guides: [ Revolutionaries ]
+
+- type: startingGear
+  id: HeadRevGear
+  storage:
+    back:
+    - Flash
+    - ClothingEyesGlassesSunglasses
diff --git a/Resources/Prototypes/Roles/Antags/traitor.yml b/Resources/Prototypes/Roles/Antags/traitor.yml
index 3e0c5a2cae8..bbcb42826b1 100644
--- a/Resources/Prototypes/Roles/Antags/traitor.yml
+++ b/Resources/Prototypes/Roles/Antags/traitor.yml
@@ -15,3 +15,70 @@
   antagonist: true
   setPreference: true
   objective: roles-antag-syndicate-agent-sleeper-objective
+
+# Syndicate Operative Outfit - Monkey
+- type: startingGear
+  id: SyndicateOperativeGearMonkey
+  equipment:
+    head: ClothingHeadHatOutlawHat
+    jumpsuit: ClothingUniformJumpsuitOperative
+    mask: CigaretteSyndicate
+
+# Syndicate Operative Outfit - Barratry
+- type: startingGear
+  id: SyndicateOperativeGearExtremelyBasic
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitOperative
+    back: ClothingBackpackSyndicate
+    shoes: ClothingShoesBootsCombatFilled
+    gloves: ClothingHandsGlovesColorBlack
+  storage:
+    back:
+    - WeaponPistolViper
+    - PinpointerSyndicateNuclear
+    - DeathAcidifierImplanter
+
+- type: startingGear
+  id: SyndicateOperativeClothing
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitOperative
+    back: ClothingBackpackSyndicate
+    shoes: ClothingShoesBootsSyndieFilled
+    gloves: ClothingHandsGlovesColorBlack
+
+- type: startingGear
+  id: SyndicateReinforcementMedic
+  parent: SyndicateOperativeClothing
+  equipment:
+    pocket1: WeaponPistolViper
+  inhand:
+    - MedkitCombatFilled
+
+- type: startingGear
+  id: SyndicateReinforcementSpy
+  parent: SyndicateOperativeClothing
+  equipment:
+    id: AgentIDCard
+    mask: ClothingMaskGasVoiceChameleon
+    pocket1: WeaponPistolViper
+
+- type: startingGear
+  id: SyndicateReinforcementThief
+  parent: SyndicateOperativeClothing
+  equipment:
+    pocket1: WeaponPistolViper
+  inhand:
+    - ToolboxSyndicateFilled
+  storage:
+    back:
+    - SyndicateJawsOfLife
+
+#Syndicate Operative Outfit - Basic
+- type: startingGear
+  id: SyndicateOperativeGearBasic
+  parent: SyndicateOperativeGearExtremelyBasic
+  equipment:
+    ears: ClothingHeadsetAltSyndicate
+    gloves: ClothingHandsGlovesCombat
+    pocket1: BaseUplinkRadio40TC
+    id: SyndiPDA
diff --git a/Resources/Prototypes/Roles/Ghostroles/syndicate.yml b/Resources/Prototypes/Roles/Ghostroles/syndicate.yml
index 24c0d8b3e3b..8e1827e81bf 100644
--- a/Resources/Prototypes/Roles/Ghostroles/syndicate.yml
+++ b/Resources/Prototypes/Roles/Ghostroles/syndicate.yml
@@ -24,4 +24,28 @@
   name: ghost-role-information-syndicate-monkey-reinforcement-name
   description: ghost-role-information-syndicate-monkey-reinforcement-description
   rules: ghost-role-information-syndicate-monkey-reinforcement-name
-  entityPrototype: MobMonkeySyndicateAgentNukeops
\ No newline at end of file
+  entityPrototype: MobMonkeySyndicateAgentNukeops
+
+- type: ghostRole
+  id: SyndicateAgentMedic
+  name: ghost-role-information-syndicate-reinforcement-medic-name
+  description: ghost-role-information-syndicate-reinforcement-medic-description
+  rules: ghost-role-information-syndicate-monkey-reinforcement-rules
+  entityPrototype: MobHumanSyndicateAgentMedic
+  iconPrototype: MedkitCombat
+
+- type: ghostRole
+  id: SyndicateAgentSpy
+  name: ghost-role-information-syndicate-reinforcement-spy-name
+  description: ghost-role-information-syndicate-reinforcement-spy-description
+  rules: ghost-role-information-syndicate-monkey-reinforcement-rules
+  entityPrototype: MobHumanSyndicateAgentSpy
+  iconPrototype: ClothingMaskGasVoiceChameleon
+
+- type: ghostRole
+  id: SyndicateAgentThief
+  name: ghost-role-information-syndicate-reinforcement-thief-name
+  description: ghost-role-information-syndicate-reinforcement-thief-description
+  rules: ghost-role-information-syndicate-monkey-reinforcement-rules
+  entityPrototype: MobHumanSyndicateAgentThief
+  iconPrototype: SyndicateJawsOfLife
diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
index 1ff07c319c3..7e6aaa527c9 100644
--- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
@@ -19,3 +19,6 @@
     #id: CargoPDA # DeltaV: different PDAs in loadouts
     ears: ClothingHeadsetCargo
     pocket1: AppraisalTool
+  #storage:
+    #back:
+    #- Stuff
diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
index 89ee5629087..1d318de251e 100644
--- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
@@ -19,6 +19,8 @@
       time: 43200 #DeltaV 12 hours
     - !type:OverallPlaytimeRequirement
       time: 144000 #40 hrs
+    - !type:AgeRequirement
+      requiredAge: 20
   weight: 10
   startingGear: QuartermasterGear
   icon: "JobIconQuarterMaster"
@@ -48,3 +50,6 @@
     ears: ClothingHeadsetQM
     belt: BoxFolderClipboard
     pocket1: AppraisalTool
+  storage:
+    back:
+    - Flash
diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
index ec793d4f52e..83f1ec96111 100644
--- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
@@ -25,3 +25,6 @@
     jumpsuit: ClothingUniformJumpsuitSalvageSpecialist
     #id: SalvagePDA # DeltaV: different PDAs in loadouts
     ears: ClothingHeadsetCargo
+  #storage:
+    #back:
+    #- Stuff
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
index 5c4e2edfeae..d4594520b0a 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
@@ -14,3 +14,6 @@
   equipment:
     #id: PassengerPDA # DeltaV: different PDAs in loadouts
     ears: ClothingHeadsetGrey
+  #storage:
+    #back:
+    #- Stuff
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
index 0e41aa5edc0..52adf84e10b 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
@@ -25,3 +25,6 @@
     shoes: ClothingShoesColorBlack
     #id: BartenderPDA # DeltaV - different PDAs in loadouts
     ears: ClothingHeadsetService
+  #storage:
+    #back:
+    #- Stuff
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml
index feed9e7e6bf..dd25a2abe2e 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml
@@ -21,3 +21,6 @@
     id: BotanistPDA
     ears: ClothingHeadsetService
     belt: ClothingBeltPlantFilled
+  #storage:
+    #back:
+    #- Stuff
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
index 655bd29ed45..face6c2310a 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
@@ -30,3 +30,7 @@
     shoes: ClothingShoesColorBlack
     id: ChaplainPDA
     ears: ClothingHeadsetScience # DeltaV - Move Chaplain into Epistemics
+  storage:
+    back:
+    - Bible
+    - RubberStampChaplain
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
index f4305262310..6a4c9140176 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
@@ -29,3 +29,6 @@
     #id: ChefPDA # DeltaV: different PDAs in loadouts
     ears: ClothingHeadsetService
     belt: ClothingBeltChefFilled
+  #storage:
+    #back:
+    #- Stuff
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
index 6cd8ff655c9..6c53530b185 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
@@ -38,3 +38,7 @@
     pocket2: ClownRecorder
     #id: ClownPDA # DeltaV: different PDAs in loadouts
     ears: ClothingHeadsetService
+  storage:
+    back:
+    - RubberStampClown
+    - CrayonRainbow
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
index 83fd9ae5d2e..05abd97ac46 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
@@ -22,9 +22,9 @@
     id: JanitorPDA
     ears: ClothingHeadsetService
     belt: ClothingBeltJanitorFilled
-  storage:
-    back:
-    - BoxSurvival
+  #storage:
+    #back:
+    #- Stuff
 
 - type: startingGear
   id: JanitorMaidGear
@@ -35,3 +35,6 @@
     head: ClothingHeadHatCatEars
     ears: ClothingHeadsetService
     belt: ClothingBeltJanitorFilled
+  storage:
+    back:
+    - BoxSurvival
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
index c8c19968536..3c3a8c39f33 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
@@ -25,6 +25,9 @@
     shoes: ClothingShoesBootsLaceup
     id: LawyerPDA
     ears: ClothingHeadsetJustice # DeltaV - Added lawyer to justice department
-    # TODO add copy of space law
   inhand:
     - BriefcaseBrownFilled
+  storage:
+    back:
+    - RubberStampLawyer
+    - BookSpaceLaw
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
index 7200bfa94f8..a0d73320faf 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
@@ -22,3 +22,6 @@
     ears: ClothingHeadsetService
     pocket1: d10Dice
     pocket2: HandLabeler # for making named bestsellers
+  storage:
+    back:
+    - BookRandom
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
index 252b43460cc..d0fe8f199ee 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
@@ -30,6 +30,9 @@
     pocket2: Paper
     id: MimePDA
     ears: ClothingHeadsetService
+  storage:
+    back:
+    - RubberStampMime
 
 - type: entity
   id: ActionMimeInvisibleWall
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
index d382e494dc9..61780a0781a 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
@@ -25,6 +25,6 @@
     shoes: ClothingShoesBootsLaceup
     id: MusicianPDA
     ears: ClothingHeadsetService
-  storage:
-    back:
-    - BoxSurvival
+  #storage:
+    #back:
+    #- Stuff
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
index 2c51cbfd3bc..93a62876a72 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
@@ -21,3 +21,6 @@
     shoes: ClothingShoesColorBlack
     id: ServiceWorkerPDA
     ears: ClothingHeadsetService
+  #storage:
+    #back:
+    #- Stuff
diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
index fe736ad7ca1..548fa516e74 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
@@ -21,10 +21,12 @@
       time: 18000 # 5 hours
     - !type:DepartmentTimeRequirement
       department: Command
-      time: 108000 # DeltaV - 30 hours
+      time: 108000 # DeltaV - 30 hours, was 15
     - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement
       time: 108000 # 30 hours
     - !type:WhitelistRequirement # DeltaV - Whitelist requirement
+    - !type:AgeRequirement
+      requiredAge: 20
   weight: 20
   startingGear: CaptainGear
   icon: "JobIconCaptain"
@@ -53,3 +55,7 @@
     #gloves: ClothingHandsGlovesCaptain - DeltaV - Commented out for loadout options
     id: CaptainPDA
     ears: ClothingHeadsetAltCommand
+  storage:
+    back:
+    - Flash
+    # - StationCharter
diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
index fd87a865067..9e6e9525727 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@@ -19,6 +19,8 @@
       time: 72000 # 20 hours
     - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement
       time: 90000 # 25 hours
+    - !type:AgeRequirement
+      requiredAge: 20
   weight: 10 # DeltaV - Changed HoP weight from 20 to 10 due to them not being more important than other Heads
   startingGear: HoPGear
   icon: "JobIconHeadOfPersonnel"
@@ -79,3 +81,6 @@
     #gloves: ClothingHandsGlovesHop # DeltaV - Commented for Loadouts
     ears: ClothingHeadsetHoP # DeltaV - HoP is now a service role, replaces their all channels headset.
     belt: BoxFolderClipboard
+  storage:
+    back:
+    - Flash
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
index ef969f9b844..d37f06dbd12 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
@@ -24,3 +24,6 @@
     #id: AtmosPDA # DeltaV: different PDAs in loadouts
     belt: ClothingBeltUtilityEngineering
     ears: ClothingHeadsetEngineering
+  #storage:
+    #back:
+    #- Stuff
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
index 40970a7b4b2..25926fc1e46 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
@@ -12,9 +12,11 @@
 #      time: 21600 #6 hrs
     - !type:DepartmentTimeRequirement
       department: Engineering
-      time: 90000 # DeltaV - 25 hours
+      time: 90000 # DeltaV - 25 hours, was 10
 #    - !type:OverallPlaytimeRequirement
-#      time: 72000 # DeltaV - 20 hours
+#      time: 144000 # DeltaV - was 40 hours upstream
+    - !type:AgeRequirement
+      requiredAge: 20
   weight: 10
   startingGear: ChiefEngineerGear
   icon: "JobIconChiefEngineer"
@@ -47,3 +49,6 @@
     eyes: ClothingEyesGlassesMeson
     ears: ClothingHeadsetCE
     belt: ClothingBeltUtilityEngineering
+  storage:
+    back:
+    - Flash
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
index 15aabc4ab86..aa436642d85 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
@@ -24,3 +24,6 @@
     eyes: ClothingEyesGlassesMeson
     belt: ClothingBeltUtilityEngineering
     ears: ClothingHeadsetEngineering
+  #storage:
+    #back:
+    #- Stuff
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
index 0bb4665e3f4..583e784b4ba 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
@@ -28,3 +28,6 @@
     belt: ClothingBeltUtilityEngineering
     ears: ClothingHeadsetEngineering
     pocket2: BookEngineersHandbook
+  #storage:
+    #back:
+    #- Stuff
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml
index 8748367830b..5542a7a69dd 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml
@@ -3,21 +3,27 @@
   id: CultLeaderGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorBlack
-    back: ClothingBackpackFilled
+    back: ClothingBackpack
     head: ClothingHeadHelmetCult
     neck: BedsheetCult
     outerClothing: ClothingOuterArmorCult
     shoes: ClothingShoesCult
     id: PassengerPDA
     ears: ClothingHeadsetService
+  storage:
+    back:
+    - BoxSurvival
 
 - type: startingGear
   id: CultistGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorBlack
-    back: ClothingBackpackFilled
+    back: ClothingBackpack
     head: ClothingHeadHatHoodCulthood
     outerClothing: ClothingOuterRobesCult
     shoes: ClothingShoesColorRed
     id: PassengerPDA
     ears: ClothingHeadsetService
+  storage:
+    back:
+    - BoxSurvival
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
index 22d0a4d77ff..211a2347907 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
@@ -18,7 +18,7 @@
   id: ERTLeaderGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTLeader
-    back: ClothingBackpackERTLeaderFilled
+    back: ClothingBackpackERTLeader
     shoes: ClothingShoesBootsCombatFilled
     head: ClothingHeadHelmetERTLeader
     eyes: ClothingEyesGlassesSecurity
@@ -27,44 +27,66 @@
     id: ERTLeaderPDA
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolN1984Nonlethal
+    pocket1: WeaponPistolN1984
     pocket2: FlashlightSeclite
+  storage:
+    back:
+    - WeaponDisabler
+    - MedicatedSuture
+    - RegenerativeMesh
+    - BoxZiptie
+    - CrowbarRed
+    - MagazineMagnum
 
 - type: startingGear
   id: ERTLeaderGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTLeader
-    back: ClothingBackpackERTLeaderFilled
+    back: ClothingBackpackERTLeader
     shoes: ClothingShoesBootsMagAdv
     mask: ClothingMaskGasERT
     eyes: ClothingEyesGlassesSecurity
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitERTLeader
-    suitstorage: AirTankFilled
     id: ERTLeaderPDA
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolN1984Nonlethal
+    pocket1: WeaponPistolN1984
     pocket2: FlashlightSeclite
+  storage:
+    back:
+    - WeaponDisabler
+    - MedicatedSuture
+    - RegenerativeMesh
+    - BoxZiptie
+    - CrowbarRed
+    - MagazineMagnum
 
 - type: startingGear
   id: ERTLeaderGearEVALecter
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTLeader
-    back: ClothingBackpackERTLeaderFilled
+    back: ClothingBackpackERTLeader
     shoes: ClothingShoesBootsMagAdv
     mask: ClothingMaskGasERT
     eyes: ClothingEyesGlassesSecurity
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitERTLeader
-    suitstorage: WeaponRifleLecter
     id: ERTLeaderPDA
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltSecurityFilled
     pocket1: MagazineRifle
     pocket2: MagazineRifle
   inhand:
-    - AirTankFilled
+  - WeaponRifleLecter
+  storage:
+    back:
+    - WeaponDisabler
+    - MedicatedSuture
+    - RegenerativeMesh
+    - BoxZiptie
+    - CrowbarRed
+    - MagazineMagnum
 
 # Chaplain
 - type: job
@@ -90,7 +112,7 @@
   id: ERTChaplainGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTChaplain
-    back: ClothingBackpackERTChaplainFilled
+    back: ClothingBackpackERTChaplain
     shoes: ClothingShoesLeather
     head: ClothingHeadHatFez
     eyes: ClothingEyesGlasses
@@ -102,24 +124,51 @@
     belt: ClothingBeltStorageWaistbag
     pocket1: Flare
     pocket2: DrinkWaterBottleFull
+  storage:
+    back:
+    - BoxCandle
+    - BoxBodyBag
+    - DrinkWaterMelonJuiceJug
+    - Lantern
+    - Lantern
+    - Bible
+    - CrowbarRed
+    - FoodBakedBunHotX
+    - FoodBakedBunHotX
+    - FoodBakedBunHotX
+    - FoodBakedBunHotX
+    - Lighter
 
 - type: startingGear
   id: ERTChaplainGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTChaplain
-    back: ClothingBackpackERTChaplainFilled
+    back: ClothingBackpackERTChaplain
     shoes: ClothingShoesBootsMagAdv
     mask: ClothingMaskGasERT
     eyes: ClothingEyesGlasses
     neck: ClothingNeckStoleChaplain
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitERTChaplain
-    suitstorage: AirTankFilled
     id: ERTChaplainPDA
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltStorageWaistbag
     pocket1: Flare
     pocket2: DrinkWaterBottleFull
+  storage:
+    back:
+    - BoxCandle
+    - BoxBodyBag
+    - DrinkWaterMelonJuiceJug
+    - Lantern
+    - Lantern
+    - Bible
+    - CrowbarRed
+    - FoodBakedBunHotX
+    - FoodBakedBunHotX
+    - FoodBakedBunHotX
+    - FoodBakedBunHotX
+    - Lighter
 
 # Engineer
 - type: job
@@ -141,7 +190,7 @@
   id: ERTEngineerGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTEngineer
-    back: ClothingBackpackERTEngineerFilled
+    back: ClothingBackpackERTEngineer
     shoes: ClothingShoesBootsWork
     head: ClothingHeadHelmetERTEngineer
     eyes: ClothingEyesGlassesMeson
@@ -152,23 +201,46 @@
     belt: ClothingBeltChiefEngineerFilled
     pocket1: Flare
     pocket2: GasAnalyzer
+  storage:
+    back:
+    - trayScanner
+    - RCD
+    - RCDAmmo
+    - RCDAmmo
+    - CableMVStack
+    - CableHVStack
+    - CableApcStack
+    - SheetPlasteel
+    - SheetSteel
+    - SheetGlass
 
 - type: startingGear
   id: ERTEngineerGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTEngineer
-    back: ClothingBackpackERTEngineerFilled
+    back: ClothingBackpackERTEngineer
     shoes: ClothingShoesBootsMagAdv
     mask: ClothingMaskGasERT
     eyes: ClothingEyesGlassesMeson
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitERTEngineer
-    suitstorage: AirTankFilled
     id: ERTEngineerPDA
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltChiefEngineerFilled
     pocket1: Flare
     pocket2: GasAnalyzer
+  storage:
+    back:
+    - trayScanner
+    - RCD
+    - RCDAmmo
+    - RCDAmmo
+    - CableMVStack
+    - CableHVStack
+    - CableApcStack
+    - SheetPlasteel
+    - SheetSteel
+    - SheetGlass
 
 # Security
 - type: job
@@ -190,7 +262,7 @@
   id: ERTSecurityGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTSecurity
-    back: ClothingBackpackERTSecurityFilled
+    back: ClothingBackpackERTSecurity
     shoes: ClothingShoesBootsCombatFilled
     head: ClothingHeadHelmetERTSecurity
     eyes: ClothingEyesGlassesSecurity
@@ -199,44 +271,66 @@
     id: ERTSecurityPDA
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58Nonlethal
+    pocket1: WeaponPistolMk58
     pocket2: FlashlightSeclite
+  storage:
+    back:
+    - WeaponDisabler
+    - MedicatedSuture
+    - RegenerativeMesh
+    - BoxZiptie
+    - CrowbarRed
+    - MagazinePistol
 
 - type: startingGear
   id: ERTSecurityGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTSecurity
-    back: ClothingBackpackERTSecurityFilled
+    back: ClothingBackpackERTSecurity
     shoes: ClothingShoesBootsMag
     mask: ClothingMaskGasERT
     eyes: ClothingEyesGlassesSecurity
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitERTSecurity
-    suitstorage: AirTankFilled
     id: ERTSecurityPDA
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58Nonlethal
+    pocket1: WeaponPistolMk58
     pocket2: FlashlightSeclite
+  storage:
+    back:
+    - WeaponDisabler
+    - MedicatedSuture
+    - RegenerativeMesh
+    - BoxZiptie
+    - CrowbarRed
+    - MagazinePistol
 
 - type: startingGear
   id: ERTSecurityGearEVALecter
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTSecurity
-    back: ClothingBackpackERTSecurityFilled
+    back: ClothingBackpackERTSecurity
     shoes: ClothingShoesBootsMag
     mask: ClothingMaskGasERT
     eyes: ClothingEyesGlassesSecurity
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitERTSecurity
-    suitstorage: WeaponRifleLecter
     id: ERTSecurityPDA
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltSecurityFilled
     pocket1: MagazineRifle
     pocket2: MagazineRifle
   inhand:
-    - AirTankFilled
+    - WeaponRifleLecter
+  storage:
+    back:
+    - WeaponDisabler
+    - MedicatedSuture
+    - RegenerativeMesh
+    - BoxZiptie
+    - CrowbarRed
+    - MagazinePistol
 
 # Medical
 - type: job
@@ -258,7 +352,7 @@
   id: ERTMedicalGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTMedic
-    back: ClothingBackpackERTMedicalFilled
+    back: ClothingBackpackERTMedical
     shoes: ClothingShoesBootsCombatFilled
     head: ClothingHeadHelmetERTMedic
     eyes: ClothingEyesHudMedical
@@ -268,22 +362,37 @@
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltMedicalFilled
     pocket1: Flare
+  storage:
+    back:
+    - Hypospray
+    - MedkitAdvancedFilled
+    - CrowbarRed
+    - OmnizineChemistryBottle
+    - EpinephrineChemistryBottle
+    - EpinephrineChemistryBottle
 
 - type: startingGear
   id: ERTMedicalGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTMedic
-    back: ClothingBackpackERTMedicalFilled
+    back: ClothingBackpackERTMedical
     shoes: ClothingShoesBootsMag
     mask: ClothingMaskGasERT
     eyes: ClothingEyesHudMedical
     gloves: ClothingHandsGlovesNitrile
     outerClothing: ClothingOuterHardsuitERTMedical
-    suitstorage: AirTankFilled
     id: ERTMedicPDA
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltMedicalFilled
     pocket1: Flare
+  storage:
+    back:
+    - Hypospray
+    - MedkitAdvancedFilled
+    - CrowbarRed
+    - OmnizineChemistryBottle
+    - EpinephrineChemistryBottle
+    - EpinephrineChemistryBottle
 
 # Janitor
 - type: job
@@ -305,7 +414,7 @@
   id: ERTJanitorGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTJanitor
-    back: ClothingBackpackERTJanitorFilled
+    back: ClothingBackpackERTJanitor
     shoes: ClothingShoesGaloshes
     head: ClothingHeadHelmetERTJanitor
     gloves: ClothingHandsGlovesColorPurple
@@ -314,18 +423,33 @@
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltJanitorFilled
     pocket1: Flare
+  storage:
+    back:
+    - LightReplacer
+    - BoxLightMixed
+    - BoxLightMixed
+    - Soap
+    - CrowbarRed
+    - AdvMopItem
 
 - type: startingGear
   id: ERTJanitorGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTJanitor
-    back: ClothingBackpackERTJanitorFilled
+    back: ClothingBackpackERTJanitor
     shoes: ClothingShoesBootsMag
     mask: ClothingMaskGasERT
     gloves: ClothingHandsGlovesColorPurple
     outerClothing: ClothingOuterHardsuitERTJanitor
-    suitstorage: AirTankFilled
     id: ERTJanitorPDA
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltJanitorFilled
     pocket1: Flare
+  storage:
+    back:
+    - LightReplacer
+    - BoxLightMixed
+    - BoxLightMixed
+    - Soap
+    - CrowbarRed
+    - AdvMopItem
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
index 11bffaa9009..f2291e492ee 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
@@ -5,7 +5,7 @@
   id: SkeletonBiker
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorBlack
-    back: ClothingBackpackFilled
+    back: ClothingBackpack
     head: ClothingHeadBandSkull
     eyes: ClothingEyesGlassesSunglasses
     outerClothing: ClothingOuterCoatGentle
@@ -13,63 +13,40 @@
     shoes: ClothingShoesBootsJack
     id: PassengerPDA
     ears: ClothingHeadsetGrey
-
-#Space Ninja Outfit
-- type: startingGear
-  id: SpaceNinjaGear
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitNinja
-    # belt holds katana so satchel has the tools for sabotaging things
-    back: ClothingBackpackSatchelTools
-    mask: ClothingMaskNinja
-    head: ClothingHeadHelmetSpaceNinja
-    eyes: ClothingEyesVisorNinja
-    gloves: ClothingHandsGlovesSpaceNinja
-    outerClothing: ClothingOuterSuitSpaceNinja
-    shoes: ClothingShoesSpaceNinja
-    id: AgentIDCard
-    ears: ClothingHeadsetGrey
-    pocket1: SpiderCharge
-    pocket2: PinpointerStation
-    belt: EnergyKatana
-    suitstorage: OxygenTankFilled
-  inhand:
-    - JetpackBlackFilled
+  storage:
+    back:
+    - BoxSurvival
 
 #Deathsquad Outfit
 - type: startingGear
   id: DeathSquadGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitDeathSquad
-    back: ClothingBackpackDeathSquadFilled
+    back: ClothingBackpackDeathSquad
     mask: ClothingMaskGasDeathSquad
     eyes: ClothingEyesHudSecurity
     ears: ClothingHeadsetAltCentCom
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitDeathsquad
-    suitstorage: AirTankFilled
     shoes: ClothingShoesBootsMagAdv
     id: DeathsquadPDA
     pocket1: EnergySword
     pocket2: EnergyShield
     belt: ClothingBeltMilitaryWebbingMedFilled
-
-# Syndicate Operative Outfit - Monkey
-- type: startingGear
-  id: SyndicateOperativeGearMonkey
-  equipment:
-    head: ClothingHeadHatOutlawHat
-    jumpsuit: ClothingUniformJumpsuitOperative
-    mask: CigaretteSyndicate
-
-# Syndicate Operative Outfit - Barratry
-- type: startingGear
-  id: SyndicateOperativeGearExtremelyBasic
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    back: ClothingBackpackDuffelSyndicateOperative
-    shoes: ClothingShoesBootsCombatFilled
-    gloves: ClothingHandsGlovesColorBlack
+  storage:
+    back:
+    - WeaponPulsePistol
+    - WeaponRevolverMateba
+    - SpeedLoaderMagnumAP
+    - SpeedLoaderMagnumAP
+    - BoxFlashbang
+    - ToolDebug # spanish army knife
+    - WelderExperimental
+    - Hypospray
+    - DeathAcidifierImplanter # crew will try to steal their amazing hardsuits
+    - FreedomImplanter
+  inhand:
+  - WeaponPulseRifle
 
 # Syndicate Operative Outfit - Civilian
 - type: startingGear
@@ -82,122 +59,35 @@
     id: SyndiPDA
     ears: ClothingHeadsetAltSyndicate
 
-#Syndicate Operative Outfit - Basic
-- type: startingGear
-  id: SyndicateOperativeGearBasic
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    back: ClothingBackpackDuffelSyndicateOperative
-    ears: ClothingHeadsetAltSyndicate
-    gloves: ClothingHandsGlovesCombat
-    shoes: ClothingShoesBootsCombatFilled
-    pocket1: BaseUplinkRadio40TC
-    id: SyndiPDA
-
-#Syndicate Operative Outfit - Full Kit
-- type: startingGear
-  id: SyndicateOperativeGearFull
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    back: ClothingBackpackDuffelSyndicateOperative
-    mask: ClothingMaskGasSyndicate
-    eyes: ClothingEyesHudSyndicate
-    ears: ClothingHeadsetAltSyndicate
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitSyndie
-    shoes: ClothingShoesBootsCombatFilled
-    id: SyndiPDA
-    pocket1: DoubleEmergencyOxygenTankFilled
-    pocket2: BaseUplinkRadio40TC
-    belt: ClothingBeltMilitaryWebbing
-
-#Nuclear Operative Commander Gear
-- type: startingGear
-  id: SyndicateCommanderGearFull
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    back: ClothingBackpackDuffelSyndicateOperative
-    mask: ClothingMaskGasSyndicate
-    eyes: ClothingEyesHudSyndicate
-    ears: ClothingHeadsetAltSyndicate
-    neck: SyndicateWhistle
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitSyndieCommander
-    shoes: ClothingShoesBootsCombatFilled
-    id: SyndiPDA
-    pocket1: DoubleEmergencyOxygenTankFilled
-    pocket2: BaseUplinkRadio40TC
-    belt: ClothingBeltMilitaryWebbing
-  inhand:
-    - NukeOpsDeclarationOfWar
-
-#Nuclear Operative Medic Gear
-- type: startingGear
-  id: SyndicateOperativeMedicFull
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    back: ClothingBackpackDuffelSyndicateOperativeMedic
-    mask: ClothingMaskGasSyndicate
-    eyes: ClothingEyesHudSyndicateAgent
-    ears: ClothingHeadsetAltSyndicate
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitSyndieMedic
-    shoes: ClothingShoesBootsMagSyndie
-    id: SyndiAgentPDA
-    pocket1: DoubleEmergencyOxygenTankFilled
-    pocket2: BaseUplinkRadio40TC
-    belt: ClothingBeltMilitaryWebbingMedFilled
-
-#Syndicate Lone Operative Outfit - Full Kit
-- type: startingGear
-  id: SyndicateLoneOperativeGearFull
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    back: ClothingBackpackDuffelSyndicateOperative
-    mask: ClothingMaskGasSyndicate
-    eyes: ClothingEyesHudSyndicate
-    ears: ClothingHeadsetAltSyndicate
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitSyndie
-    shoes: ClothingShoesBootsCombatFilled
-    id: SyndiPDA
-    pocket1: DoubleEmergencyOxygenTankFilled
-    pocket2: BaseUplinkRadio40TC
-    belt: ClothingBeltMilitaryWebbing
-
-# Syndicate Footsoldier Gear
+# Syndicate Footsoldier Gear - No Headset
 - type: startingGear
-  id: SyndicateFootsoldierGear
+  id: SyndicateFootsoldierGearRuin
   equipment:
     jumpsuit: ClothingUniformJumpsuitOperative
     head: ClothingHeadHelmetSwatSyndicate
     mask: ClothingMaskGas
     outerClothing: ClothingOuterArmorBasic
-    ears: ClothingHeadsetAltSyndicate
     gloves: ClothingHandsGlovesCombat
-    back: ClothingBackpackFilled
+    back: ClothingBackpack
     shoes: ClothingShoesBootsCombat
     id: SyndiPDA
+  storage:
+    back:
+    - BoxSurvival
 
-# Syndicate Footsoldier Gear - No Headset
+# Syndicate Footsoldier Gear
 - type: startingGear
-  id: SyndicateFootsoldierGearRuin
+  id: SyndicateFootsoldierGear
+  parent: SyndicateFootsoldierGearRuin
   equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    head: ClothingHeadHelmetSwatSyndicate
-    mask: ClothingMaskGas
-    outerClothing: ClothingOuterArmorBasic
-    gloves: ClothingHandsGlovesCombat
-    back: ClothingBackpackFilled
-    shoes: ClothingShoesBootsCombat
-    id: SyndiPDA
+    ears: ClothingHeadsetAltSyndicate
 
 # Nanotrasen Paramilitary Unit Gear
 - type: startingGear
   id: NanotrasenParamilitaryGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitSec
-    back: ClothingBackpackSecurityFilled
+    back: ClothingBackpackSecurity
     shoes: ClothingShoesBootsCombatFilled
     eyes: ClothingEyesGlassesSecurity
     head: ClothingHeadHelmetSwat
@@ -205,13 +95,18 @@
     outerClothing: ClothingOuterArmorBasicSlim
     ears: ClothingHeadsetSecurity
     gloves: ClothingHandsGlovesCombat
+  storage:
+    back:
+    - BoxSurvivalSecurity
+    - Flash
+    - MagazinePistol
 
 #CBURN Unit Gear - Full Kit
 - type: startingGear
   id: CBURNGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorBrown
-    back: ClothingBackpackDuffelCBURNFilled
+    back: ClothingBackpackDuffelCBURN
     mask: ClothingMaskGasERT
     eyes: ClothingEyesGlassesSecurity
     ears: ClothingHeadsetAltCentCom
@@ -221,8 +116,14 @@
     id: CBURNPDA
     pocket1: RadioHandheld
     pocket2: WeaponLaserGun
-    suitstorage: OxygenTankFilled
     belt: ClothingBeltBandolier
+  storage:
+    back:
+    - WeaponShotgunDoubleBarreled
+    - BoxShotgunIncendiary
+    - GrenadeFlashBang
+    - PillAmbuzolPlus
+    - PillAmbuzol
 
 - type: startingGear
   id: BoxingKangarooGear
@@ -237,14 +138,6 @@
     jumpsuit: ClothingUniformJumpsuitJacketMonkey
     id: PunPunIDCard
 
-# Passenger but without the ID, bag, or headset
-
-- type: startingGear
-  id: LimitedPassengerGear
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitColorGrey
-    shoes: ClothingShoesColorBlack
-
 # DeathMatch Gear
 
 - type: startingGear
@@ -278,24 +171,13 @@
 - type: startingGear
   id: MobAghostGear
   equipment:
-    back: ClothingBackpackSatchelHoldingAdmin
+    back: ClothingBackpackSatchelHolding
     id: AdminPDA
-
-#Head Rev Gear
-- type: startingGear
-  id: HeadRevGear
   storage:
     back:
-    - Flash
-    - ClothingEyesGlassesSunglasses
-
-#Thief Gear
-- type: startingGear
-  id: ThiefGear
-  storage:
-    back:
-    - ToolboxThief
-    - ClothingHandsChameleonThief
+    - GasAnalyzer
+    - trayScanner
+    - AccessConfiguratorUniversal
 
 #Gladiator with spear
 - type: startingGear
@@ -325,10 +207,16 @@
     shoes: ClothingShoesClownBanana
     jumpsuit: ClothingUniformJumpsuitClownBanana
     mask: ClothingMaskClownBanana
-    ears: ClothingHeadsetService
     pocket1: BikeHorn
     pocket2: ClownRecorder
 
+# Passenger but without the ID, bag, or headset
+- type: startingGear
+  id: LimitedPassengerGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitColorGrey
+    shoes: ClothingShoesColorBlack
+
 #Clown Troupe
 - type: startingGear
   id: ClownTroupe
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml
index 596e42776b7..a4e5e3c3ab8 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml
@@ -3,41 +3,33 @@
   id: WizardBlueGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorDarkBlue
-    back: ClothingBackpackFilled
     head: ClothingHeadHatWizard
     outerClothing: ClothingOuterWizard
     shoes: ClothingShoesWizard
     id: PassengerPDA
     ears: ClothingHeadsetService
+  storage:
+    back:
+    - BoxSurvival
 
 - type: startingGear
   id: WizardRedGear
+  parent: WizardBlueGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorRed
-    back: ClothingBackpackFilled
     head: ClothingHeadHatRedwizard
     outerClothing: ClothingOuterWizardRed
-    shoes: ClothingShoesWizard
-    id: PassengerPDA
-    ears: ClothingHeadsetService
 
 - type: startingGear
   id: WizardVioletGear
+  parent: WizardBlueGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorPurple
-    back: ClothingBackpackFilled
     head: ClothingHeadHatVioletwizard
     outerClothing: ClothingOuterWizardViolet
-    shoes: ClothingShoesWizard
-    id: PassengerPDA
-    ears: ClothingHeadsetService
 
 - type: startingGear
   id: WizardHardsuitGear
+  parent: WizardVioletGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitColorPurple
-    back: ClothingBackpackFilled
     outerClothing: ClothingOuterHardsuitWizard
-    shoes: ClothingShoesWizard
-    id: PassengerPDA
-    ears: ClothingHeadsetService
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
index 1b33bc3c287..a40c134927f 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
@@ -24,3 +24,6 @@
     belt: ChemBag
     pocket1: HandLabeler
     eyes: ClothingEyesGlassesChemical
+  #storage:
+    #back:
+    #- Stuff
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
index 995442a9b74..b92c94fda3a 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -17,7 +17,9 @@
       department: Medical
       time: 43200 # DeltaV - 12 hours
     - !type:OverallPlaytimeRequirement
-      time: 72000 # DeltaV - 20 hours
+      time: 72000 # DeltaV - 20 hours, was 40
+    - !type:AgeRequirement
+      requiredAge: 20
   weight: 10
   startingGear: CMOGear
   icon: "JobIconChiefMedicalOfficer"
@@ -51,3 +53,6 @@
     id: CMOPDA
     ears: ClothingHeadsetCMO
     belt: ClothingBeltMedicalFilled
+  storage:
+    back:
+    - Flash
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
index daed73984fe..2ecbcfbadcf 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
@@ -22,3 +22,6 @@
   equipment:
     ears: ClothingHeadsetMedical
     belt: ClothingBeltMedicalFilled
+  #storage:
+    #back:
+    #- Stuff
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
index f379445049a..624303e4060 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
@@ -26,3 +26,6 @@
     ears: ClothingHeadsetMedical
     belt: ClothingBeltMedicalFilled
     pocket2: BookMedicalReferenceBook
+  #storage:
+    #back:
+    #- Stuff
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
index 5988ff7c35f..27b21dd28a9 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
@@ -32,4 +32,6 @@
     belt: ClothingBeltMedicalEMTFilled
     pocket1: HandheldGPSBasic # DeltaV - Give Paramedics useful tools on spawn
     pocket2: HandheldCrewMonitor # DeltaV - Give Paramedics useful tools on spawn
-
+  storage:
+    back:
+    - EmergencyRollerBedSpawnFolded
diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
index 9480ace15bc..37affe776b5 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
@@ -22,8 +22,10 @@
 - type: startingGear
   id: ResearchAssistantGear
   equipment:
-    back: ClothingBackpackScienceFilled
     shoes: ClothingShoesColorWhite
     id: ResearchAssistantPDA
     ears: ClothingHeadsetScience
     pocket2: BookScientistsGuidebook
+  #storage:
+    #back:
+    #- Stuff
diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
index 1f20842c012..3893679ca1c 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -9,7 +9,9 @@
       department: Epistemics # DeltaV - Epistemics Department replacing Science
       time: 54000 # DeltaV - 15 hours
     - !type:OverallPlaytimeRequirement
-      time: 72000 # DeltaV - 20 hours
+      time: 72000 # DeltaV - 20 hours, was 40
+    - !type:AgeRequirement
+      requiredAge: 20
   weight: 10
   startingGear: ResearchDirectorGear
   icon: "JobIconResearchDirector"
@@ -42,3 +44,6 @@
     id: RnDPDA
     ears: ClothingHeadsetRD
     belt: BibleMystagogue # Nyanotrasen - Mystagogue book for their Ifrit
+  storage:
+    back:
+    - Flash
diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml
index b005accc79f..0f1ec0ec7a3 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml
@@ -19,4 +19,6 @@
   id: ScientistGear
   equipment:
     ears: ClothingHeadsetScience
-
+  #storage:
+    #back:
+    #- Stuff
diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml
index d3ae13d79f9..e81e81095a6 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml
@@ -29,3 +29,8 @@
     id: DetectivePDA
     ears: ClothingHeadsetSecurity
     belt: ClothingBeltHolsterFilled
+  storage:
+    back:
+    - Flash
+    - ForensicPad
+    - ForensicScanner
diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
index 09186b660b1..de57faadd7b 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -14,8 +14,10 @@
       department: Command
       time: 36000 # 10 hours
     - !type:OverallPlaytimeRequirement
-      time: 90000 # DeltaV - 25 hours
+      time: 90000 # DeltaV - 25 hours, was 40
     - !type:WhitelistRequirement # DeltaV - Whitelist requirement
+    - !type:AgeRequirement
+      requiredAge: 20
   weight: 10
   startingGear: HoSGear
   icon: "JobIconHeadOfSecurity"
@@ -53,3 +55,7 @@
     gloves: ClothingHandsGlovesCombat
     ears: ClothingHeadsetAltSecurity
     pocket1: WeaponPistolMk58Nonlethal
+  storage:
+    back:
+    - Flash
+    - MagazinePistol
diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
index 2eac551ac3d..b3a4087f469 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
@@ -35,3 +35,7 @@
     belt: ClothingBeltSecurityFilled
 #    pocket1: WeaponPistolMk58Nonlethal # DeltaV - Security Cadet doesn't spawn with a gun
     pocket2: BookSecurity
+  storage:
+    back:
+    - Flash
+#    - MagazinePistol # DeltaV - no
diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
index 166d2a0b8ba..dc8da68f50a 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
@@ -28,3 +28,7 @@
     eyes: ClothingEyesGlassesSecurity
     ears: ClothingHeadsetSecurity
     pocket1: WeaponPistolMk58Nonlethal
+  storage:
+    back:
+    - Flash
+    - MagazinePistol
diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
index 75c97200e4a..92cfe00602d 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
@@ -12,6 +12,7 @@
       time: 21600 # DeltaV - 6 hours
   startingGear: WardenGear
   icon: "JobIconWarden"
+  requireAdminNotify: true
   supervisors: job-supervisors-hos
   canBeAntag: false
   access:
@@ -34,3 +35,7 @@
     id: WardenPDA
     ears: ClothingHeadsetSecurity
     pocket1: WeaponPistolMk58Nonlethal
+  storage:
+    back:
+    - Flash
+    - MagazinePistol
diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml
index 11df8ac2e9c..227afdf01f7 100644
--- a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml
@@ -30,3 +30,6 @@
     ears: ClothingHeadsetService
     shoes: ClothingShoesColorRed
     belt: ClothingBeltChampion
+  #storage:
+    #back:
+    #- Stuff
diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
index 90fd06f48d8..cd60020ece3 100644
--- a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
@@ -27,3 +27,6 @@
     id: PsychologistPDA
     ears: ClothingHeadsetMedical
     pocket1: RubberStampPsychologist
+  #storage:
+    #back:
+    #- Stuff
diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml
index 28c5945c22b..4fe57726c24 100644
--- a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml
+++ b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml
@@ -21,3 +21,6 @@
     shoes: ClothingShoesColorWhite
     id: ReporterPDA
     ears: ClothingHeadsetService
+  #storage:
+    #back:
+    #- Stuff
diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml
index 5a4a965eadc..310c4bf90a6 100644
--- a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml
+++ b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml
@@ -22,3 +22,6 @@
     shoes: ClothingShoesColorWhite
     id: ZookeeperPDA
     ears: ClothingHeadsetService
+  #storage:
+    #back:
+    #- Stuff
diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
index 664687576a5..08b21ba3ab7 100644
--- a/Resources/Prototypes/Roles/Jobs/departments.yml
+++ b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -1,16 +1,17 @@
 - type: department
   id: Logistics # DeltaV - Logistics Department replacing Cargo
-  description: department-Cargo-description
+  name: department-Logistics # DeltaV
+  description: department-Logistics-description # DeltaV
   color: "#A46106"
   roles:
   - CargoTechnician
   - Quartermaster
   - SalvageSpecialist
-  - MailCarrier # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml
   - Courier # DeltaV - Courier, see Resources/Prototypes/DeltaV/Roles/Jobs/Cargo/courier.yml
 
 - type: department
   id: Civilian
+  name: department-Civilian
   description: department-Civilian-description
   color: "#9FED58"
   weight: -10
@@ -39,6 +40,7 @@
 
 - type: department
   id: Command
+  name: department-Command
   description: department-Command-description
   color: "#334E6D"
   roles:
@@ -56,6 +58,7 @@
 
 - type: department
   id: Engineering
+  name: department-Engineering
   description: department-Engineering-description
   color: "#EFB341"
   roles:
@@ -66,6 +69,7 @@
 
 - type: department
   id: Medical
+  name: department-Medical
   description: department-Medical-description
   color: "#52B4E9"
   roles:
@@ -79,6 +83,7 @@
 
 - type: department
   id: Security
+  name: department-Security
   description: department-Security-description
   color: "#DE3A3A"
   weight: 20
@@ -94,7 +99,8 @@
 
 - type: department
   id: Epistemics # DeltaV - Epistemics Department replacing Science
-  description: department-Science-description
+  name: department-Epistemics # DeltaV
+  description: department-Epistemics-description # DeltaV
   color: "#D381C9"
   roles:
   - ResearchDirector
@@ -105,6 +111,7 @@
 
 - type: department
   id: Specific
+  name: department-Specific
   description: department-Specific-description
   color: "#9FED58"
   weight: 10
diff --git a/Resources/Prototypes/Shaders/shaders.yml b/Resources/Prototypes/Shaders/shaders.yml
index e286dcb7a41..136821efbb8 100644
--- a/Resources/Prototypes/Shaders/shaders.yml
+++ b/Resources/Prototypes/Shaders/shaders.yml
@@ -57,6 +57,11 @@
   kind: source
   path: "/Textures/Shaders/drunk.swsl"
 
+- type: shader
+  id: Drowsiness
+  kind: source
+  path: "/Textures/Shaders/radial_blur.swsl"
+
 - type: shader
   id: Texture
   kind: source
diff --git a/Resources/Prototypes/Species/vox.yml b/Resources/Prototypes/Species/vox.yml
index e3fdb2bf08f..7419f3f277e 100644
--- a/Resources/Prototypes/Species/vox.yml
+++ b/Resources/Prototypes/Species/vox.yml
@@ -1,7 +1,7 @@
 - type: species
   id: Vox
   name: species-name-vox
-  roundStart: false # sad
+  roundStart: true
   prototype: MobVox
   sprites: MobVoxSprites
   markingLimits: MobVoxMarkingLimits
diff --git a/Resources/Prototypes/Stacks/Materials/ore.yml b/Resources/Prototypes/Stacks/Materials/ore.yml
index 51254b5a7a6..3aaa04601aa 100644
--- a/Resources/Prototypes/Stacks/Materials/ore.yml
+++ b/Resources/Prototypes/Stacks/Materials/ore.yml
@@ -4,6 +4,13 @@
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: gold }
   spawn: GoldOre1
   maxCount: 30
+  
+- type: stack
+  id: DiamondOre
+  name: rough diamond
+  icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: diamond }
+  spawn: DiamondOre1
+  maxCount: 30
 
 - type: stack
   id: SteelOre
diff --git a/Resources/Prototypes/Stacks/consumable_stacks.yml b/Resources/Prototypes/Stacks/consumable_stacks.yml
index e7feab7b520..e2abbcbf089 100644
--- a/Resources/Prototypes/Stacks/consumable_stacks.yml
+++ b/Resources/Prototypes/Stacks/consumable_stacks.yml
@@ -4,6 +4,18 @@
   id: Pancake
   name: pancake
   spawn: FoodBakedPancake
+  maxCount: 9
+
+- type: stack
+  id: PancakeBb
+  name: blueberry pancake
+  spawn: FoodBakedPancakeBb
+  maxCount: 3
+
+- type: stack
+  id: PancakeCc
+  name: chocolate chip pancake
+  spawn: FoodBakedPancakeCc
   maxCount: 3
 
 # Food Containers
diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
index 01bd916a672..de03fcba196 100644
--- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml
+++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
@@ -1,19 +1,109 @@
 - type: stack
+  id: FloorTileDark
+  name: dark tile
+  spawn: FloorTileItemDark
+  maxCount: 30
+
+- type: stack
+  id: FloorTileDarkDiagonalMini
+  name: dark steel diagonal mini tile
+  spawn: FloorTileItemDarkDiagonalMini
+  maxCount: 30
+
+- type: stack
+  id: FloorTileDarkDiagonal
+  name: dark steel diagonal tile
+  spawn: FloorTileItemDarkDiagonal
+  maxCount: 30
+
+- type: stack
+  id: FloorTileDarkHerringbone
+  name: dark steel herringbone
+  spawn: FloorTileItemDarkHerringbone
+  maxCount: 30
+
+- type: stack
+  id: FloorTileDarkMini
+  name: dark steel mini tile
+  spawn: FloorTileItemDarkMini
+  maxCount: 30
+
+- type: stack
+  id: FloorTileDarkMono
+  name: dark steel mono tile
+  spawn: FloorTileItemDarkMono
+  maxCount: 30
+
+- type: stack
+  id: FloorTileDarkPavement
+  name: dark steel pavement
+  spawn: FloorTileItemDarkPavement
+  maxCount: 30
+
+- type: stack
+  id: FloorTileDarkPavementVertical
+  name: dark steel vertical pavement
+  spawn: FloorTileItemDarkPavementVertical
+  maxCount: 30
+
+- type: stack
+  id: FloorTileDarkOffset
+  name: offset dark steel tile
+  spawn: FloorTileItemDarkOffset
+  maxCount: 30
+
+- type: stack
   id: FloorTileSteel
   name: steel tile
   spawn: FloorTileItemSteel
   maxCount: 30
 
 - type: stack
-  id: FloorTileMetalDiamond
-  name: steel tile
-  spawn: FloorTileItemMetalDiamond
+  id: FloorTileSteelOffset
+  name: offset steel tile
+  spawn: FloorTileItemSteelOffset
   maxCount: 30
 
 - type: stack
-  id: FloorTileWood
-  name: wood floor
-  spawn: FloorTileItemWood
+  id: FloorTileSteelDiagonalMini
+  name: steel diagonal mini tile
+  spawn: FloorTileItemSteelDiagonalMini
+  maxCount: 30
+
+- type: stack
+  id: FloorTileSteelDiagonal
+  name: steel diagonal tile
+  spawn: FloorTileItemSteelDiagonal
+  maxCount: 30
+
+- type: stack
+  id: FloorTileSteelHerringbone
+  name: steel herringbone
+  spawn: FloorTileItemSteelHerringbone
+  maxCount: 30
+
+- type: stack
+  id: FloorTileSteelMini
+  name: steel mini tile
+  spawn: FloorTileItemSteelMini
+  maxCount: 30
+
+- type: stack
+  id: FloorTileSteelMono
+  name: steel mono tile
+  spawn: FloorTileItemSteelMono
+  maxCount: 30
+
+- type: stack
+  id: FloorTileSteelPavement
+  name: steel pavement
+  spawn: FloorTileItemSteelPavement
+  maxCount: 30
+
+- type: stack
+  id: FloorTileSteelPavementVertical
+  name: steel vertical pavement
+  spawn: FloorTileItemSteelPavementVertical
   maxCount: 30
 
 - type: stack
@@ -23,9 +113,75 @@
   maxCount: 30
 
 - type: stack
-  id: FloorTileDark
-  name: dark tile
-  spawn: FloorTileItemDark
+  id: FloorTileWhiteOffset
+  name: offset white steel tile
+  spawn: FloorTileItemWhiteOffset
+  maxCount: 30
+
+- type: stack
+  id: FloorTileWhiteDiagonalMini
+  name: white steel diagonal mini tile
+  spawn: FloorTileItemWhiteDiagonalMini
+  maxCount: 30
+
+- type: stack
+  id: FloorTileWhiteDiagonal
+  name: white steel diagonal tile
+  spawn: FloorTileItemWhiteDiagonal
+  maxCount: 30
+
+- type: stack
+  id: FloorTileWhiteHerringbone
+  name: white steel herringbone
+  spawn: FloorTileItemWhiteHerringbone
+  maxCount: 30
+
+- type: stack
+  id: FloorTileWhiteMini
+  name: white steel mini tile
+  spawn: FloorTileItemWhiteMini
+  maxCount: 30
+
+- type: stack
+  id: FloorTileWhiteMono
+  name: white steel mono tile
+  spawn: FloorTileItemWhiteMono
+  maxCount: 30
+
+- type: stack
+  id: FloorTileWhitePavement
+  name: white steel pavement
+  spawn: FloorTileItemWhitePavement
+  maxCount: 30
+
+- type: stack
+  id: FloorTileWhitePavementVertical
+  name: white steel vertical pavement
+  spawn: FloorTileItemWhitePavementVertical
+  maxCount: 30
+
+- type: stack
+  id: FloorTileSteelCheckerDark
+  name: steel dark checker tile
+  spawn: FloorTileItemSteelCheckerDark
+  maxCount: 30
+
+- type: stack
+  id: FloorTileSteelCheckerLight
+  name: steel light checker tile
+  spawn: FloorTileItemSteelCheckerLight
+  maxCount: 30
+
+- type: stack
+  id: FloorTileMetalDiamond
+  name: steel tile
+  spawn: FloorTileItemMetalDiamond
+  maxCount: 30
+
+- type: stack
+  id: FloorTileWood
+  name: wood floor
+  spawn: FloorTileItemWood
   maxCount: 30
 
 - type: stack
@@ -322,10 +478,34 @@
   spawn: FloorTileItemGrayConcrete
   maxCount: 30
 
+- type: stack
+  id: FloorTileConcreteMono
+  name: concrete mono tile
+  spawn: FloorTileItemConcreteMono
+  maxCount: 30
+
+- type: stack
+  id: FloorTileConcreteSmooth
+  name: concrete smooth
+  spawn: FloorTileItemConcreteSmooth
+  maxCount: 30
+
 - type: stack
   id: FloorTileGrayConcrete
   name: gray concrete tile
-  spawn: FloorTileItemLaundry
+  spawn: FloorTileItemGrayConcrete
+  maxCount: 30
+
+- type: stack
+  id: FloorTileGrayConcreteMono
+  name: gray concrete mono tile
+  spawn: FloorTileItemGrayConcreteMono
+  maxCount: 30
+
+- type: stack
+  id: FloorTileGrayConcreteSmooth
+  name: gray concrete smooth
+  spawn: FloorTileItemGrayConcreteSmooth
   maxCount: 30
 
 - type: stack
@@ -334,6 +514,18 @@
   spawn: FloorTileItemOldConcrete
   maxCount: 30
 
+- type: stack
+  id: FloorTileOldConcreteMono
+  name: old concrete mono tile
+  spawn: FloorTileItemOldConcreteMono
+  maxCount: 30
+
+- type: stack
+  id: FloorTileOldConcreteSmooth
+  name: old concrete smooth
+  spawn: FloorTileItemOldConcreteSmooth
+  maxCount: 30
+
 - type: stack
   id: FloorTileSilver
   name: silver floor tile
diff --git a/Resources/Prototypes/StatusIcon/StatusEffects/health.yml b/Resources/Prototypes/StatusIcon/StatusEffects/health.yml
index 073b03a2aeb..de1b6684809 100644
--- a/Resources/Prototypes/StatusIcon/StatusEffects/health.yml
+++ b/Resources/Prototypes/StatusIcon/StatusEffects/health.yml
@@ -1,32 +1,32 @@
-- type: statusIcon
+- type: healthIcon
   id: HealthIcon
   abstract: true
   priority: 3
   locationPreference: Left
   isShaded: true
 
-- type: statusIcon
+- type: healthIcon
   parent: HealthIcon
   id: HealthIconFine
   icon:
     sprite: /Textures/Interface/Misc/health_icons.rsi
     state: Fine
 
-- type: statusIcon
+- type: healthIcon
   id: HealthIconCritical
   parent: HealthIcon
   icon:
     sprite: /Textures/Interface/Misc/health_icons.rsi
     state: Critical
 
-- type: statusIcon
+- type: healthIcon
   id: HealthIconDead
   parent: HealthIcon
   icon:
     sprite: /Textures/Interface/Misc/health_icons.rsi
     state: Dead
 
-- type: statusIcon
+- type: healthIcon
   id: HealthIconRotting
   parent: HealthIcon
   icon:
diff --git a/Resources/Prototypes/StatusIcon/StatusEffects/hunger.yml b/Resources/Prototypes/StatusIcon/StatusEffects/satiation.yml
similarity index 84%
rename from Resources/Prototypes/StatusIcon/StatusEffects/hunger.yml
rename to Resources/Prototypes/StatusIcon/StatusEffects/satiation.yml
index 9af246e06ee..749d1f88f18 100644
--- a/Resources/Prototypes/StatusIcon/StatusEffects/hunger.yml
+++ b/Resources/Prototypes/StatusIcon/StatusEffects/satiation.yml
@@ -1,26 +1,26 @@
 #Hunger
-- type: statusIcon
+- type: satiationIcon
   id: HungerIcon
   abstract: true
   priority: 5
   locationPreference: Right
   isShaded: true
 
-- type: statusIcon
+- type: satiationIcon
   id: HungerIconOverfed
   parent: HungerIcon
   icon:
     sprite: /Textures/Interface/Misc/food_icons.rsi
     state: overfed
 
-- type: statusIcon
+- type: satiationIcon
   id: HungerIconPeckish
   parent: HungerIcon
   icon:
     sprite: /Textures/Interface/Misc/food_icons.rsi
     state: peckish
 
-- type: statusIcon
+- type: satiationIcon
   id: HungerIconStarving
   parent: HungerIcon
   icon:
@@ -28,28 +28,28 @@
     state: starving
 
 #Thirst
-- type: statusIcon
+- type: satiationIcon
   id: ThirstIcon
   abstract: true
   priority: 5
   locationPreference: Left
   isShaded: true
 
-- type: statusIcon
+- type: satiationIcon
   id: ThirstIconOverhydrated
   parent: ThirstIcon
   icon:
     sprite: /Textures/Interface/Misc/food_icons.rsi
     state: overhydrated
 
-- type: statusIcon
+- type: satiationIcon
   id: ThirstIconThirsty
   parent: ThirstIcon
   icon:
     sprite: /Textures/Interface/Misc/food_icons.rsi
     state: thirsty
 
-- type: statusIcon
+- type: satiationIcon
   id: ThirstIconParched
   parent: ThirstIcon
   icon:
diff --git a/Resources/Prototypes/StatusIcon/StatusEffects/ssd.yml b/Resources/Prototypes/StatusIcon/StatusEffects/ssd.yml
index 70253cc6b19..1d04a5349ef 100644
--- a/Resources/Prototypes/StatusIcon/StatusEffects/ssd.yml
+++ b/Resources/Prototypes/StatusIcon/StatusEffects/ssd.yml
@@ -1,4 +1,4 @@
-- type: statusIcon
+- type: ssdIcon
   id: SSDIcon
   icon:
     sprite: /Textures/Effects/ssd.rsi
diff --git a/Resources/Prototypes/StatusIcon/debug.yml b/Resources/Prototypes/StatusIcon/debug.yml
index 2011c6ceeae..24981746e7e 100644
--- a/Resources/Prototypes/StatusIcon/debug.yml
+++ b/Resources/Prototypes/StatusIcon/debug.yml
@@ -1,17 +1,17 @@
-- type: statusIcon
+- type: debugIcon
   id: DebugStatus
   icon:
     sprite: /Textures/Interface/Misc/research_disciplines.rsi
     state: civilianservices
 
-- type: statusIcon
+- type: debugIcon
   id: DebugStatus2
   priority: 1
   icon:
     sprite: /Textures/Interface/Misc/research_disciplines.rsi
     state: arsenal
 
-- type: statusIcon
+- type: debugIcon
   id: DebugStatus3
   priority: 5
   icon:
diff --git a/Resources/Prototypes/StatusIcon/antag.yml b/Resources/Prototypes/StatusIcon/faction.yml
similarity index 77%
rename from Resources/Prototypes/StatusIcon/antag.yml
rename to Resources/Prototypes/StatusIcon/faction.yml
index 0da545b8a20..0b3bbe491c7 100644
--- a/Resources/Prototypes/StatusIcon/antag.yml
+++ b/Resources/Prototypes/StatusIcon/faction.yml
@@ -1,4 +1,4 @@
-- type: statusIcon
+- type: factionIcon
   id: ZombieFaction
   priority: 11
   showTo:
@@ -10,7 +10,7 @@
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Zombie
 
-- type: statusIcon
+- type: factionIcon
   id: InitialInfectedFaction
   priority: 11
   showTo:
@@ -21,8 +21,9 @@
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: InitialInfected
 
-- type: statusIcon
+- type: factionIcon
   id: RevolutionaryFaction
+  isShaded: true
   priority: 11
   showTo:
     components:
@@ -32,8 +33,9 @@
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Revolutionary
 
-- type: statusIcon
+- type: factionIcon
   id: HeadRevolutionaryFaction
+  isShaded: true
   priority: 11
   showTo:
     components:
@@ -43,17 +45,7 @@
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: HeadRevolutionary
 
-- type: statusIcon
-  id: MindShieldIcon
-  priority: 2
-  locationPreference: Right
-  layer: Mod
-  isShaded: true
-  icon:
-    sprite: /Textures/Interface/Misc/job_icons.rsi
-    state: MindShield
-
-- type: statusIcon
+- type: factionIcon
   id: SyndicateFaction
   priority: 0
   locationPreference: Left
diff --git a/Resources/Prototypes/StatusIcon/job.yml b/Resources/Prototypes/StatusIcon/job.yml
index 975d944bb2d..bb2ae3b64d0 100644
--- a/Resources/Prototypes/StatusIcon/job.yml
+++ b/Resources/Prototypes/StatusIcon/job.yml
@@ -1,384 +1,446 @@
-- type: statusIcon
+- type: jobIcon
   id: JobIcon
   abstract: true
   priority: 1
   locationPreference: Right
   isShaded: true
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconDetective
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Detective
+  jobName: job-name-detective
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconQuarterMaster
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: QuarterMaster
+  jobName: job-name-qm
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconBorg
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Borg
+  jobName: job-name-borg
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconBotanist
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Botanist
+  jobName: job-name-botanist
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconBoxer
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Boxer
+  jobName: job-name-boxer
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconAtmosphericTechnician
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: AtmosphericTechnician
+  jobName: job-name-atmostech
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconNanotrasen
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Nanotrasen
+  jobName: job-name-centcomoff
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconPrisoner
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Prisoner
+  jobName: job-name-prisoner
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconJanitor
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Janitor
+  jobName: job-name-janitor
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconChemist
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Chemist
+  jobName: job-name-chemist
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconStationEngineer
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: StationEngineer
+  jobName: job-name-engineer
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconSecurityOfficer
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: SecurityOfficer
+  jobName: job-name-security
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconNoId
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: NoId
+  jobName: job-name-no-id
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconChiefMedicalOfficer
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: ChiefMedicalOfficer
+  jobName: job-name-cmo
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconRoboticist
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Roboticist
+  jobName: job-name-roboticist
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconChaplain
   icon:
     sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi # DeltaV - Move Chaplain into Epistemics
     state: Chaplain # DeltaV - Move Chaplain into Epistemics
+  jobName: job-name-chaplain
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconLawyer
   icon:
     sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi # DeltaV - Move Lawyer into Justice
     state: Lawyer # DeltaV - Move Lawyer into Justice
+  jobName: job-name-lawyer
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconUnknown
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Unknown
+  jobName: job-name-unknown
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconLibrarian
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Librarian
+  jobName: job-name-librarian
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconCargoTechnician
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: CargoTechnician
+  jobName: job-name-cargotech
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconScientist
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Scientist
+  jobName: job-name-scientist
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconResearchAssistant
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: ResearchAssistant
+  jobName: job-name-research-assistant
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconGeneticist
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Geneticist
+  jobName: job-name-geneticist
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconClown
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Clown
+  jobName: job-name-clown
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconCaptain
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Captain
+  jobName: job-name-captain
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconHeadOfPersonnel
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: HeadOfPersonnel
+  jobName: job-name-hop
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconVirologist
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Virologist
+  jobName: job-name-virologist
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconShaftMiner
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: ShaftMiner
+  jobName: job-name-salvagespec
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconPassenger
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Passenger
+  jobName: job-name-passenger
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconChiefEngineer
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: ChiefEngineer
+  jobName: job-name-ce
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconBartender
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Bartender
+  jobName: job-name-bartender
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconHeadOfSecurity
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: HeadOfSecurity
+  jobName: job-name-hos
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconBrigmedic
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Brigmedic
+  jobName: job-name-brigmedic
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconMedicalDoctor
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: MedicalDoctor
+  jobName: job-name-doctor
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconParamedic
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Paramedic
+  jobName: job-name-paramedic
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconChef
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Chef
+  jobName: job-name-chef
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconWarden
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Warden
+  jobName: job-name-warden
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconResearchDirector
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: ResearchDirector
+  jobName: job-name-rd
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconMime
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Mime
+  jobName: job-name-mime
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconMusician
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Musician
+  jobName: job-name-musician
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconReporter
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Reporter
+  jobName: job-name-reporter
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconPsychologist
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Psychologist
+  jobName: job-name-psychologist
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconMedicalIntern
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: MedicalIntern
+  jobName: job-name-intern
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconTechnicalAssistant
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: TechnicalAssistant
+  jobName: job-name-technical-assistant
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconServiceWorker
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: ServiceWorker
+  jobName: job-name-serviceworker
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconSecurityCadet
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: SecurityCadet
+  jobName: job-name-cadet
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconZombie # This is a perfectly legitimate profession to pursue
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Zombie
+  jobName: job-name-zombie
 
-- type: statusIcon
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconSyndicate # Just in case you want to make it official which side you are on
+  icon:
+    sprite: /Textures/Interface/Misc/job_icons.rsi
+    state: Syndicate
+  jobName: job-name-syndicate
+
+- type: jobIcon
   parent: JobIcon
   id: JobIconZookeeper
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Zookeeper
+  jobName: job-name-zookeeper
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconSeniorPhysician
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: SeniorPhysician
+  allowSelection: false
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconSeniorOfficer
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: SeniorOfficer
+  allowSelection: false
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconSeniorEngineer
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: SeniorEngineer
+  allowSelection: false
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconSeniorResearcher
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: SeniorResearcher
+  allowSelection: false
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconVisitor
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Visitor
+  jobName: job-name-visitor
 
-- type: statusIcon
+- type: jobIcon
   parent: JobIcon
   id: JobIconAdmin
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Admin
+  allowSelection: false
diff --git a/Resources/Prototypes/StatusIcon/security.yml b/Resources/Prototypes/StatusIcon/security.yml
index 00119fb44d2..430e9c4f98e 100644
--- a/Resources/Prototypes/StatusIcon/security.yml
+++ b/Resources/Prototypes/StatusIcon/security.yml
@@ -1,4 +1,4 @@
-- type: statusIcon
+- type: securityIcon
   id: SecurityIcon
   abstract: true
   priority: 3
@@ -6,37 +6,47 @@
   locationPreference: Right
   isShaded: true
 
-- type: statusIcon
+- type: securityIcon
   parent: SecurityIcon
   id: SecurityIconDischarged
   icon:
     sprite: /Textures/Interface/Misc/security_icons.rsi
     state: hud_discharged
 
-- type: statusIcon
+- type: securityIcon
   parent: SecurityIcon
   id: SecurityIconIncarcerated
   icon:
     sprite: /Textures/Interface/Misc/security_icons.rsi
     state: hud_incarcerated
 
-- type: statusIcon
+- type: securityIcon
   parent: SecurityIcon
   id: SecurityIconParoled
   icon:
     sprite: /Textures/Interface/Misc/security_icons.rsi
     state: hud_paroled
 
-- type: statusIcon
+- type: securityIcon
   parent: SecurityIcon
   id: SecurityIconSuspected
   icon:
     sprite: /Textures/Interface/Misc/security_icons.rsi
     state: hud_suspected
 
-- type: statusIcon
+- type: securityIcon
   parent: SecurityIcon
   id: SecurityIconWanted
   icon:
     sprite: /Textures/Interface/Misc/security_icons.rsi
     state: hud_wanted
+
+- type: securityIcon
+  id: MindShieldIcon
+  priority: 2
+  locationPreference: Right
+  layer: Mod
+  isShaded: true
+  icon:
+    sprite: /Textures/Interface/Misc/job_icons.rsi
+    state: MindShield
diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml
index 1fc6de09358..53aa394e080 100644
--- a/Resources/Prototypes/Tiles/floors.yml
+++ b/Resources/Prototypes/Tiles/floors.yml
@@ -67,7 +67,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepFloor
-  itemDrop: FloorTileItemSteel
+  itemDrop: FloorTileItemSteelMini
   heatCapacity: 10000
 
 - type: tile
@@ -85,7 +85,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepFloor
-  itemDrop: FloorTileItemSteel
+  itemDrop: FloorTileItemSteelPavement
   heatCapacity: 10000
 
 - type: tile
@@ -103,7 +103,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepFloor
-  itemDrop: FloorTileItemSteel
+  itemDrop: FloorTileItemSteelDiagonal
   heatCapacity: 10000
 
 - type: tile
@@ -115,7 +115,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepFloor
-  itemDrop: FloorTileItemSteel
+  itemDrop: FloorTileItemSteelOffset
   heatCapacity: 10000
 
 - type: tile
@@ -133,7 +133,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemSteel
+  itemDrop: FloorTileItemSteelMono
   heatCapacity: 10000
 
 - type: tile
@@ -151,7 +151,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemSteel
+  itemDrop: FloorTileItemSteelPavementVertical
   heatCapacity: 10000
 
 - type: tile
@@ -169,7 +169,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemSteel
+  itemDrop: FloorTileItemSteelHerringbone
   heatCapacity: 10000
 
 - type: tile
@@ -187,7 +187,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemSteel
+  itemDrop: FloorTileItemSteelDiagonalMini
   heatCapacity: 10000
 
 - type: tile
@@ -285,7 +285,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemWhite
+  itemDrop: FloorTileItemWhiteMini
   heatCapacity: 10000
 
 - type: tile
@@ -303,7 +303,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemWhite
+  itemDrop: FloorTileItemWhitePavement
   heatCapacity: 10000
 
 - type: tile
@@ -321,7 +321,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemWhite
+  itemDrop: FloorTileItemWhiteDiagonal
   heatCapacity: 10000
 
 - type: tile
@@ -333,7 +333,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemWhite
+  itemDrop: FloorTileItemWhiteOffset
   heatCapacity: 10000
 
 - type: tile
@@ -351,7 +351,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemWhite
+  itemDrop: FloorTileItemWhiteMono
   heatCapacity: 10000
 
 - type: tile
@@ -369,7 +369,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemWhite
+  itemDrop: FloorTileItemWhitePavementVertical
   heatCapacity: 10000
 
 - type: tile
@@ -387,7 +387,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemWhite
+  itemDrop: FloorTileItemWhiteHerringbone
   heatCapacity: 10000
 
 - type: tile
@@ -405,7 +405,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemWhite
+  itemDrop: FloorTileItemWhiteDiagonalMini
   heatCapacity: 10000
 
 - type: tile
@@ -459,7 +459,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemDark
+  itemDrop: FloorTileItemDarkMini
   heatCapacity: 10000
 
 - type: tile
@@ -477,7 +477,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemDark
+  itemDrop: FloorTileItemDarkPavement
   heatCapacity: 10000
 
 - type: tile
@@ -495,7 +495,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemDark
+  itemDrop: FloorTileItemDarkDiagonal
   heatCapacity: 10000
 
 - type: tile
@@ -507,7 +507,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemDark
+  itemDrop: FloorTileItemDarkOffset
   heatCapacity: 10000
 
 - type: tile
@@ -525,7 +525,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemDark
+  itemDrop: FloorTileItemDarkMono
   heatCapacity: 10000
 
 - type: tile
@@ -543,7 +543,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemDark
+  itemDrop: FloorTileItemDarkPavementVertical
   heatCapacity: 10000
 
 - type: tile
@@ -561,7 +561,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemDark
+  itemDrop: FloorTileItemDarkHerringbone
   heatCapacity: 10000
 
 - type: tile
@@ -579,7 +579,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemDark
+  itemDrop: FloorTileItemDarkDiagonalMini
   heatCapacity: 10000
 
 - type: tile
@@ -936,7 +936,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemConcrete
+  itemDrop: FloorTileItemConcreteMono
   heatCapacity: 10000
   weather: true
 
@@ -955,7 +955,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemConcrete
+  itemDrop: FloorTileItemConcreteSmooth
   heatCapacity: 10000
   weather: true
 
@@ -993,7 +993,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemGrayConcrete
+  itemDrop: FloorTileItemGrayConcreteMono
   heatCapacity: 10000
   weather: true
 
@@ -1012,7 +1012,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemGrayConcrete
+  itemDrop: FloorTileItemGrayConcreteSmooth
   heatCapacity: 10000
   weather: true
 
@@ -1050,7 +1050,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemOldConcrete
+  itemDrop: FloorTileItemOldConcreteMono
   heatCapacity: 10000
   weather: true
 
@@ -1069,7 +1069,7 @@
   deconstructTools: [ Prying ]
   footstepSounds:
     collection: FootstepTile
-  itemDrop: FloorTileItemOldConcrete
+  itemDrop: FloorTileItemOldConcreteSmooth
   heatCapacity: 10000
   weather: true
 
@@ -1391,6 +1391,21 @@
   itemDrop: SheetRGlass1
   heatCapacity: 10000
 
+- type: tile
+  id: FloorMetalFoam
+  name: tiles-metal-foam
+  sprite: /Textures/Tiles/foammetal.png
+  variants: 1
+  placementVariants:
+  - 1.0
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepHull
+  itemDrop: SheetSteel1
+  heatCapacity: 10000
+
 # Circuits
 - type: tile
   id: FloorGreenCircuit
diff --git a/Resources/Prototypes/Traits/categories.yml b/Resources/Prototypes/Traits/categories.yml
index a3621648a43..d024b3fcff3 100644
--- a/Resources/Prototypes/Traits/categories.yml
+++ b/Resources/Prototypes/Traits/categories.yml
@@ -6,3 +6,7 @@
   id: SpeechTraits
   name: trait-category-speech
   maxTraitPoints: 2
+
+- type: traitCategory
+  id: Quirks
+  name: trait-category-quirks
diff --git a/Resources/Prototypes/Traits/disabilities.yml b/Resources/Prototypes/Traits/disabilities.yml
index e39f3a60136..c562c2fec0e 100644
--- a/Resources/Prototypes/Traits/disabilities.yml
+++ b/Resources/Prototypes/Traits/disabilities.yml
@@ -33,14 +33,6 @@
       timeBetweenIncidents: 300, 600
       durationOfIncident: 10, 30
 
-- type: trait
-  id: Pacifist
-  name: trait-pacifist-name
-  description: trait-pacifist-desc
-  category: Disabilities
-  components:
-    - type: Pacified
-
 - type: trait
   id: Unrevivable
   name: trait-unrevivable-name
@@ -60,22 +52,6 @@
   components:
     - type: Muted
 
-- type: trait
-  id: Uncloneable
-  name: trait-uncloneable-name
-  description: trait-uncloneable-desc
-  components:
-    - type: Uncloneable
-
-- type: trait
-  id: LightweightDrunk
-  name: trait-lightweight-name
-  description: trait-lightweight-desc
-  category: Disabilities
-  components:
-    - type: LightweightDrunk
-      boozeStrengthMultiplier: 2
-
 - type: trait
   id: Paracusia
   name: trait-paracusia-name
@@ -88,11 +64,3 @@
       maxSoundDistance: 7
       sounds:
         collection: Paracusia
-
-- type: trait
-  id: Snoring
-  name: trait-snoring-name
-  description: trait-snoring-desc
-  category: Disabilities
-  components:
-    - type: Snoring
diff --git a/Resources/Prototypes/Traits/quirks.yml b/Resources/Prototypes/Traits/quirks.yml
new file mode 100644
index 00000000000..d01bf6218ab
--- /dev/null
+++ b/Resources/Prototypes/Traits/quirks.yml
@@ -0,0 +1,24 @@
+- type: trait
+  id: Pacifist
+  name: trait-pacifist-name
+  description: trait-pacifist-desc
+  category: Quirks
+  components:
+  - type: Pacified
+
+- type: trait
+  id: LightweightDrunk
+  name: trait-lightweight-name
+  description: trait-lightweight-desc
+  category: Quirks
+  components:
+  - type: LightweightDrunk
+    boozeStrengthMultiplier: 2
+
+- type: trait
+  id: Snoring
+  name: trait-snoring-name
+  description: trait-snoring-desc
+  category: Quirks
+  components:
+  - type: Snoring
diff --git a/Resources/Prototypes/XenoArch/Effects/utility_effects.yml b/Resources/Prototypes/XenoArch/Effects/utility_effects.yml
index a8967080579..8cf7fb0b360 100644
--- a/Resources/Prototypes/XenoArch/Effects/utility_effects.yml
+++ b/Resources/Prototypes/XenoArch/Effects/utility_effects.yml
@@ -199,6 +199,9 @@
     makeSentient: true
     name: ghost-role-information-artifact-name
     description: ghost-role-information-artifact-description
+    rules: ghost-role-information-freeagent-rules
+    raffle:
+      settings: default
   - type: GhostTakeoverAvailable
   - type: MovementSpeedModifier
     baseWalkSpeed: 0.25
diff --git a/Resources/Prototypes/edge_spreaders.yml b/Resources/Prototypes/edge_spreaders.yml
index 061932c706d..c93cc02ba97 100644
--- a/Resources/Prototypes/edge_spreaders.yml
+++ b/Resources/Prototypes/edge_spreaders.yml
@@ -9,3 +9,8 @@
 - type: edgeSpreader
   id: Smoke
   updatesPerSecond: 8
+
+- type: edgeSpreader
+  id: MetalFoam
+  updatesPerSecond: 16
+  preventSpreadOnSpaced: false
diff --git a/Resources/Prototypes/holidays.yml b/Resources/Prototypes/holidays.yml
index 173999d156b..fae9c13adbd 100644
--- a/Resources/Prototypes/holidays.yml
+++ b/Resources/Prototypes/holidays.yml
@@ -68,8 +68,8 @@
   beginMonth: March
 
 - type: holiday
-  id: holiday-name-easter
-  name: Easter
+  id: Easter
+  name: holiday-name-easter
   shouldCelebrate:
     !type:Computus { }
 
@@ -320,8 +320,8 @@
     weekday: Thursday
 
 - type: holiday
-  id: holiday-name-halloween
-  name: Halloween
+  id: Halloween
+  name: holiday-name-halloween
   beginDay: 31
   beginMonth: October
   greet:
@@ -383,8 +383,8 @@
     weekday: Thursday
 
 - type: holiday
-  id: holiday-name-sinterklaas
-  name: Sinterklaas
+  id: Sinterklaas
+  name: holiday-name-sinterklaas
   beginDay: 5
   beginMonth: December
 
@@ -407,8 +407,8 @@
   beginMonth: December
 
 - type: holiday
-  id: holiday-name-christmas
-  name: Christmas
+  id: Christmas
+  name: holiday-name-christmas
   beginDay: 24
   endDay: 26
   beginMonth: December
diff --git a/Resources/Prototypes/ore.yml b/Resources/Prototypes/ore.yml
index 9f97ef2cf79..218f327ac58 100644
--- a/Resources/Prototypes/ore.yml
+++ b/Resources/Prototypes/ore.yml
@@ -58,6 +58,12 @@
   minOreYield: 1
   maxOreYield: 3
 
+- type: ore
+  id: OreDiamond
+  oreEntity: DiamondOre1
+  minOreYield: 1
+  maxOreYield: 2
+
 - type: ore
   id: OreQuartzCrab
   oreEntity: MobSpawnCrabQuartz
diff --git a/Resources/Prototypes/radio_channels.yml b/Resources/Prototypes/radio_channels.yml
index 48cc0872a1a..1c69bbe7e66 100644
--- a/Resources/Prototypes/radio_channels.yml
+++ b/Resources/Prototypes/radio_channels.yml
@@ -3,7 +3,7 @@
   name: chat-radio-common
   keycode: ";"
   frequency: 1459
-  color: "#32cd32"
+  color: "#2cdb2c"
 
 - type: radioChannel
   id: CentCom
@@ -25,7 +25,7 @@
   name: chat-radio-engineering
   keycode: 'e'
   frequency: 1357
-  color: "#f37746"
+  color: "#ff733c"
 
 - type: radioChannel
   id: Medical
@@ -39,28 +39,28 @@
   name: chat-radio-science
   keycode: 'n'
   frequency: 1351
-  color: "#c68cfa"
+  color: "#b05efa"
 
 - type: radioChannel
   id: Security
   name: chat-radio-security
   keycode: 's'
   frequency: 1359
-  color: "#dd3535"
+  color: "#ff4242"
 
 - type: radioChannel
   id: Service
   name: chat-radio-service
   keycode: 'v'
   frequency: 1349
-  color: "#6ca729"
+  color: "#539c00"
 
 - type: radioChannel
   id: Supply
   name: chat-radio-supply
   keycode: 'u'
   frequency: 1347
-  color: "#b88646"
+  color: "#b48b57"
 
 - type: radioChannel
   id: Syndicate
@@ -74,7 +74,7 @@
   id: Handheld
   name: chat-radio-handheld
   frequency: 1330
-  color: "#d39f01"
+  color: "#967101"
   # long range since otherwise it'd defeat the point of a handheld radio independent of telecomms
   longRange: true
 
diff --git a/Resources/Prototypes/status_effects.yml b/Resources/Prototypes/status_effects.yml
index 27609b1bb54..96379323fd1 100644
--- a/Resources/Prototypes/status_effects.yml
+++ b/Resources/Prototypes/status_effects.yml
@@ -62,3 +62,9 @@
 
 - type: statusEffect
   id: Flashed
+
+- type: statusEffect
+  id: RadiationProtection
+
+- type: statusEffect
+  id: Drowsiness #blurs your vision and makes you randomly fall asleep
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index ede344eeaba..9fdfbcb0794 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -509,6 +509,9 @@
 - type: Tag
   id: DiscreteHealthAnalyzer #So construction recipes don't eat medical PDAs
 
+- type: Tag
+  id: DNASolutionScannable
+
 - type: Tag
   id: DockArrivals
 
@@ -542,9 +545,15 @@
 - type: Tag
   id: DrinkCan
 
+- type: Tag
+  id: DrinkGlass
+
 - type: Tag
   id: DrinkSpaceGlue
 
+- type: Tag 
+  id: Dropper
+
 - type: Tag
   id: Duck
 
@@ -620,6 +629,9 @@
 - type: Tag
   id: GasScrubber
 
+- type: Tag
+  id: GasTank
+
 - type: Tag
   id: GasVent
 
@@ -758,6 +770,9 @@
 - type: Tag
   id: Igniter
 
+- type: Tag
+  id: Ingredient
+
 - type: Tag #Drop this innate tool instead of deleting it.
   id: InnateDontDelete
 
@@ -1102,6 +1117,9 @@
 - type: Tag
   id: SalvageExperiment
 
+- type: Tag
+  id: Scarf
+
 - type: Tag
   id: Screwdriver
 
diff --git a/Resources/ServerInfo/Guidebook/Engineering/TEG.xml b/Resources/ServerInfo/Guidebook/Engineering/TEG.xml
index 63a62fecf80..786990c92f8 100644
--- a/Resources/ServerInfo/Guidebook/Engineering/TEG.xml
+++ b/Resources/ServerInfo/Guidebook/Engineering/TEG.xml
@@ -70,7 +70,7 @@
   - The Space Vent
   - The Scrubber Array
 
-  Here is one layer of an example setup: (pipes can and do need to be layered under the scrubbers below to connect them!)
+  Here is one layer of an example setup:
   <Box>
     <GuideEntityEmbed Entity="WallReinforced" Rotation="0" Caption="" Margin="0"/>
     <GuideEntityEmbed Entity="WallReinforced" Rotation="0" Caption="" Margin="0"/>
@@ -81,15 +81,15 @@
   <Box>
     <GuideEntityEmbed Entity="ReinforcedPlasmaWindow" Rotation="0" Caption="" Margin="0"/>
     <GuideEntityEmbed Entity="GasVentScrubber" Rotation="90" Caption="" Margin="0"/>
-    <GuideEntityEmbed Entity="GasVentScrubber" Rotation="90" Caption="" Margin="0"/>
-    <GuideEntityEmbed Entity="GasVentScrubber" Rotation="0" Caption="" Margin="0"/>
+    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="0" Caption="" Margin="0"/>
+    <GuideEntityEmbed Entity="GasVentScrubber" Rotation="-90" Caption="" Margin="0"/>
     <GuideEntityEmbed Entity="ReinforcedPlasmaWindow" Rotation="0" Caption="" Margin="0"/>
   </Box>
   <Box>
     <GuideEntityEmbed Entity="ReinforcedPlasmaWindow" Rotation="0" Caption="" Margin="0"/>
     <GuideEntityEmbed Entity="GasPassiveVent" Rotation="0" Caption="" Margin="0"/>
-    <GuideEntityEmbed Entity="GasVentScrubber" Rotation="90" Caption="" Margin="0"/>
-    <GuideEntityEmbed Entity="GasVentScrubber" Rotation="0" Caption="" Margin="0"/>
+    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="90" Caption="" Margin="0"/>
+    <GuideEntityEmbed Entity="GasVentScrubber" Rotation="-90" Caption="" Margin="0"/>
     <GuideEntityEmbed Entity="ReinforcedPlasmaWindow" Rotation="0" Caption="" Margin="0"/>
   </Box>
   <Box>
diff --git a/Resources/ServerInfo/Guidebook/Glossary.xml b/Resources/ServerInfo/Guidebook/Glossary.xml
index 05d8d3e97c2..94e6e0bd932 100644
--- a/Resources/ServerInfo/Guidebook/Glossary.xml
+++ b/Resources/ServerInfo/Guidebook/Glossary.xml
@@ -43,6 +43,15 @@ Refers to the health state at which you fall unconscious and unable to move. Whi
 ## ERT
 An Emergency Response Team. These may be dispatched by Central Command for a number of purposes.
 
+## Flukie
+A portmanteau of "Fluke" and "Nukie" used to (usually derogatorily) refer to a team of Nuclear Operatives who fail their objective. May also appear as "Fluke Ops".
+
+## God(s)
+An IC term representing a Server Administrator. CentComm is also sometimes used in this manner.
+
+## Greytide/Greyshirt/Tider/Assistant
+Typically utilized to refer to a Passenger due to the color of their standard uniform, though this may be used to negatively refer to other crew members (not only passengers) who act unruly or commit various minor crimes.
+
 ## HoP
 Short for Head of Personnel, head of the Service Department.
 
@@ -64,12 +73,6 @@ Short for Mystagogue, the head of the Epistemics 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.
-
-## God
-An IC term representing a Server Administrator. CentCom is also sometimes used in this manner.
-
 ## Nukie
 A slang/shorthand term of a Nuclear Operative. May sometimes also appear as "Nuke Op".
 
@@ -91,9 +94,6 @@ Short for Sudden Sleep Disorder or Space Sleep Disorder. This is an in-character
 ## Syndie/Syndi/Syndicate
 A catch-all reference to anyone employed by the Syndicate. This ranges from (suspected) Syndicate Agents to Nuclear Operatives.
 
-## Flukie
-A portmanteau of "Fluke" and "Nukie" used to (usually derogatorily) refer to a team of Nuclear Operatives who fail their objective. May also appear as "Fluke Ops".
-
 ## Nanotrasen/NT
 Nanotrasen is the company which owns the space station you inhabit.
 
@@ -125,8 +125,9 @@ Short for Antagonists, which are specifically picked individuals designed to dri
 ## Bwoink
 The noise made when an admin-help is received. Pray this isn't a ban.
 
-## Upstream
-The baseline version of the game. Any changes to Upstream will "flow" down to all other forks of the game. All official Wizard's Den servers work off of Upstream.
+
+## LOOC/OOC
+Local out-of-character and (global) out-of-character respectively. They are text channels that allow players to talk to other players outside of roleplay. LOOC is enabled during rounds, while OOC is typically only on after the round ends.
 
 ## LRP
 Low Roleplay. Servers marked LRP typically have relaxed roleplaying rules.
@@ -140,7 +141,10 @@ High Roleplay. Servers marked HRP generally have extensive rules on what is and
 ##Self-Antag
 A term for a player who engages in antagonist-like activity without actually being an antagonist. This encompasses a wide variety of behavior, but is typically used to describe annoying behavior or actions which are greatly detrimental to other players for no purpose. Self-antagonism is a bannable offense. Sometimes used in IC. DO NOT DO THIS.
 
-## Validhunting
+## Upstream
+The baseline version of the game. Any changes to Upstream will "flow" down to all other forks of the game. All official Wizard's Den servers work off of Upstream.
+
+## Validhunter
 A player who hunts down "valids", as in people that are valid to kill, even though this person isn't security.
 
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Mobs/Diona.xml b/Resources/ServerInfo/Guidebook/Mobs/Diona.xml
index 575fae561ad..eedf23b14f2 100644
--- a/Resources/ServerInfo/Guidebook/Mobs/Diona.xml
+++ b/Resources/ServerInfo/Guidebook/Mobs/Diona.xml
@@ -7,7 +7,7 @@
 
   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.
+  Their "blood" is tree sap 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];
diff --git a/Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml b/Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml
index 0374d4cb958..976ab472a9c 100644
--- a/Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml
+++ b/Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml
@@ -10,16 +10,8 @@
   They exhale nitrous oxide and are unaffected by it.
   Their body can process 6 reagents at the same time instead of just 2.
 
-  Slimepeople can morph into a [bold]"geras"[/bold] (an archaic slimefolk term), which is a smaller slime form that can [bold]pass through grilles[/bold],
-  but forces them to drop their inventory and held items. It's handy for a quick getaway. A geras is small enough to pick up (with two hands)
-  and fits in a duffelbag.
-
-  <Box>
-    <GuideEntityEmbed Entity="MobSlimesGeras" Caption="A typical geras."/>
-  </Box>
-
-  Slimepeople have an [bold]internal 2x2 storage inventory[/bold] inside of their slime membrane. Anyone can see what's inside and take it out of you without asking,
-  so be careful. They [bold]don't drop their internal storage when they morph into a geras, however![/bold]
+  Slimepeople have an [bold]internal 2x3 storage inventory[/bold] inside of their slime membrane. Anyone can see what's inside and take it out of you without asking,
+  so be careful.
 
   Slimepeople have slight accelerated regeneration compared to other humanoids. They're also capable of hardening their fists, and as such have stronger punches,
   although they punch a little slower.
diff --git a/Resources/ServerInfo/Guidebook/Mobs/Species.xml b/Resources/ServerInfo/Guidebook/Mobs/Species.xml
index aa7b824250a..e6b489817fe 100644
--- a/Resources/ServerInfo/Guidebook/Mobs/Species.xml
+++ b/Resources/ServerInfo/Guidebook/Mobs/Species.xml
@@ -13,6 +13,7 @@
   <GuideEntityEmbed Entity="MobMoth" Caption="Moth Person"/>
   <GuideEntityEmbed Entity="MobReptilian" Caption="Reptilian"/>
   <GuideEntityEmbed Entity="MobSlimePerson" Caption="Slime Person"/>
+  <GuideEntityEmbed Entity="MobVox" Caption="Vox"/>
   </Box>
 
   # Delta-V specific species
diff --git a/Resources/ServerInfo/Guidebook/Mobs/Vox.xml b/Resources/ServerInfo/Guidebook/Mobs/Vox.xml
new file mode 100644
index 00000000000..173ba89b411
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Mobs/Vox.xml
@@ -0,0 +1,16 @@
+<Document>
+  # Vox
+
+  <Box>
+    <GuideEntityEmbed Entity="MobVox" Caption=""/>
+  </Box>
+
+  [color=#ffa500]Caution! This species has a severely limiting game mechanic and is not recommended for new players. [/color]
+
+  They breathe nitrogen, and [color=#ffa500] oxygen is very toxic to them.[/color]
+  They need to be on internals at all times to avoid being poisoned by the station's oxygen.
+  Eating or drinking will require you to remove your breath mask, although injecting liquid food is an option.
+
+  Their unarmed claw attacks deal Slash damage instead of Blunt.
+
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/Science/Science.xml b/Resources/ServerInfo/Guidebook/Science/Science.xml
index 0e28557dd93..5c6271e5eb6 100644
--- a/Resources/ServerInfo/Guidebook/Science/Science.xml
+++ b/Resources/ServerInfo/Guidebook/Science/Science.xml
@@ -15,14 +15,13 @@ Each technology costs [color=#a4885c]Research Points[/color] and unlocks recipes
 Information about the different technologies can be viewed [textlink="on the technology guidebook page" link="Technologies"].
 
 ## Disciplines
-Technologies are spread over 5 different Disciplines:
-<Box>
-<GuideEntityEmbed Entity="Wrench" Caption="Industrial"/>
-<GuideEntityEmbed Entity="Syringe" Caption="Biochemical"/>
-<GuideEntityEmbed Entity="WeaponTetherGun" Caption="Experimental"/>
-<GuideEntityEmbed Entity="ComputerTelevision" Caption="Civil Services"/>
-<GuideEntityEmbed Entity="WeaponXrayCannon" Caption="Arsenal"/>
-</Box>
+Technologies are spread over 4 different Disciplines:
+  <Box>
+    <GuideEntityEmbed Entity="Wrench" Caption="Industrial"/>
+    <GuideEntityEmbed Entity="WeaponTetherGun" Caption="Experimental"/>
+    <GuideEntityEmbed Entity="ComputerTelevision" Caption="Civil Services"/>
+    <GuideEntityEmbed Entity="WeaponXrayCannon" Caption="Arsenal"/>
+  </Box>
 
 <GuideEntityEmbed Entity="ComputerResearchAndDevelopment"/> Use your nearest R&D console to take note of which kind of research is locked behind each Discipline tree.
 
diff --git a/Resources/ServerInfo/Guidebook/Science/Technologies.xml b/Resources/ServerInfo/Guidebook/Science/Technologies.xml
index 7f0feaca420..ef89c80269a 100644
--- a/Resources/ServerInfo/Guidebook/Science/Technologies.xml
+++ b/Resources/ServerInfo/Guidebook/Science/Technologies.xml
@@ -8,9 +8,6 @@ The different technologies and their respective discipline are listed below.
 ## Industrial
 <GuideTechDisciplineEmbed Discipline="Industrial"/>
 
-## Biochemical
-<GuideTechDisciplineEmbed Discipline="Biochemical"/>
-
 ## Arsenal
 <GuideTechDisciplineEmbed Discipline="Arsenal"/>
 
diff --git a/Resources/ServerInfo/Guidebook/Service/Chef.xml b/Resources/ServerInfo/Guidebook/Service/Chef.xml
index 7d077ca269b..370c1db5c3f 100644
--- a/Resources/ServerInfo/Guidebook/Service/Chef.xml
+++ b/Resources/ServerInfo/Guidebook/Service/Chef.xml
@@ -51,7 +51,6 @@ Ask Botany for what you need, without a botanist, you may need to grow more plan
 <GuideEntityEmbed Entity="SignHydro1" Caption=" "/>
 <GuideEntityEmbed Entity="hydroponicsTray"/>
 <GuideEntityEmbed Entity="WheatBushel"/>
-<GuideEntityEmbed Entity="SignHydro2" Caption=" "/>
 </Box>
 ## Gathering Milk:
 Alt-Click on a Cow with a container in your hand. (Beakers, Buckets, Milk Jugs, ect.)
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/equipped-HAND-vox.png b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/equipped-HAND-vox.png
deleted file mode 100644
index b7f2122c19f..00000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/equipped-HAND-vox.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json
index ccb1c5dcaf3..88e3ebd509d 100644
--- a/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json
+++ b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json
@@ -1 +1,26 @@
-{"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-HAND", "directions": 4}, {"name": "inhand-left", "directions": 4}, {"name": "inhand-right", "directions": 4}, {"name": "equipped-HAND-vox", "directions": 4}]}
+{
+  "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-HAND",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Head/Hardhats/armored.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardhats/armored.rsi/icon.png
index 7adc2b13859..fc2328e7d14 100644
Binary files a/Resources/Textures/Clothing/Head/Hardhats/armored.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardhats/armored.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardhats/armored.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/armored.rsi/light-icon.png
index 3a850ef0d89..a0bef065159 100644
Binary files a/Resources/Textures/Clothing/Head/Hardhats/armored.rsi/light-icon.png and b/Resources/Textures/Clothing/Head/Hardhats/armored.rsi/light-icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png
index fee14e7a8cd..f3d81549e3d 100644
Binary files a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png
index 3a850ef0d89..f385d0187d3 100644
Binary files a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png and b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/icon.png
index 3d3aa75958d..2728bf501bd 100644
Binary files a/Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/light-icon.png
index 3a850ef0d89..f385d0187d3 100644
Binary files a/Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/light-icon.png and b/Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/light-icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png
index ba88c23f723..b4bbfa0e09e 100644
Binary files a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png
index 316cf7a9bcc..f385d0187d3 100644
Binary files a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png and b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png
index 011962037d6..5a8fb92ef91 100644
Binary files a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png
index 3a850ef0d89..f385d0187d3 100644
Binary files a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png and b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png
index 2a5093d619e..06af0dcd0ae 100644
Binary files a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png
index 316cf7a9bcc..f385d0187d3 100644
Binary files a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png and b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png
index 1a3f49cc1b3..0978e7886c6 100644
Binary files a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png
index 3a850ef0d89..f385d0187d3 100644
Binary files a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png and b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/equipped-HELMET-vox.png
new file mode 100644
index 00000000000..f5a8cf7c054
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/meta.json
index a470e009443..cec1961dce8 100644
--- a/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hats/cardborg_h.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/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. vox state by Flareguy",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-HELMET",
       "directions": 4
     },
+    {
+      "name": "equipped-HELMET-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/Head/Hats/papersack.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hats/papersack.rsi/equipped-HELMET-vox.png
new file mode 100644
index 00000000000..10f06b436de
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/papersack.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/papersack.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/papersack.rsi/meta.json
index ab1f7a4abf6..c6887def720 100644
--- a/Resources/Textures/Clothing/Head/Hats/papersack.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hats/papersack.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from Beestation at commit https://github.com/BeeStation/BeeStation-Hornet/commit/0bb49b1a97488349ee89308ad6a0904066e1c6f3",
+  "copyright": "Taken from Beestation at commit https://github.com/BeeStation/BeeStation-Hornet/commit/0bb49b1a97488349ee89308ad6a0904066e1c6f3. vox states by Flareguy",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-HELMET",
       "directions": 4
     },
+    {
+      "name": "equipped-HELMET-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/Head/Hats/santahat.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/equipped-HELMET-vox.png
new file mode 100644
index 00000000000..9e7eca032cd
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/santahat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/meta.json
index a470e009443..cec1961dce8 100644
--- a/Resources/Textures/Clothing/Head/Hats/santahat.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hats/santahat.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/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. vox state by Flareguy",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-HELMET",
       "directions": 4
     },
+    {
+      "name": "equipped-HELMET-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET-vox.png
new file mode 100644
index 00000000000..4d8b97d11ed
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json
index 3d0b7be1265..84dd751a6a0 100644
--- a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser",
+  "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser. vox state by Flareguy",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-HELMET",
       "directions": 4
     },
+    {
+      "name": "equipped-HELMET-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/equipped-HELMET-vox.png
new file mode 100644
index 00000000000..c7ab17e261d
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/equipped-HELMET.png
new file mode 100644
index 00000000000..d13b5d9acb2
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/icon.png
new file mode 100644
index 00000000000..7baca16fb42
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/inhand-left.png
new file mode 100644
index 00000000000..e8db961b770
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/inhand-right.png
new file mode 100644
index 00000000000..1580937e762
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/meta.json
similarity index 60%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/meta.json
rename to Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/meta.json
index eadf9c61d48..2faf18830d9 100644
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprited by belay5 (Discord)",
+  "copyright": "Made by alzore_(Discord) for SS14 using the colors of the blood-red hardsuit",
   "size": {
     "x": 32,
     "y": 32
@@ -11,7 +11,11 @@
       "name": "icon"
     },
     {
-      "name": "equipped-OUTERCLOTHING",
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "equipped-HELMET-vox",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/coatybits-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/coatybits-equipped-HELMET.png
new file mode 100644
index 00000000000..ea6575dbbb8
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/coatybits-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/coatybits-icon.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/coatybits-icon.png
new file mode 100644
index 00000000000..8e8b13f4334
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/coatybits-icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/meta.json
index 7867b11a028..df3e9f284f7 100644
--- a/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "By Gotimanga for SS14",
+    "copyright": "By Gotimanga for SS14, grayscale layering by IProduceWidgets (Github)",
     "size": {
         "x": 32,
         "y": 32
@@ -10,9 +10,30 @@
         {
             "name": "icon"
         },
+        {
+            "name": "coatybits-icon"
+        },
+        {
+            "name": "winterbits-icon"
+        },
+        {
+            "name": "winterbits-tan-icon"
+        },
         {
             "name": "equipped-HELMET",
             "directions": 4
+        },
+		{
+            "name": "coatybits-equipped-HELMET",
+            "directions": 4
+        },
+		{
+            "name": "winterbits-equipped-HELMET",
+            "directions": 4
+        },
+		{
+            "name": "winterbits-tan-equipped-HELMET",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/winterbits-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/winterbits-equipped-HELMET.png
new file mode 100644
index 00000000000..882e3ed5f79
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/winterbits-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/winterbits-icon.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/winterbits-icon.png
new file mode 100644
index 00000000000..d0b9a774d08
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/winterbits-icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/winterbits-tan-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/winterbits-tan-equipped-HELMET.png
new file mode 100644
index 00000000000..923d7363b61
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/winterbits-tan-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/winterbits-tan-icon.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/winterbits-tan-icon.png
new file mode 100644
index 00000000000..93136b687c5
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/winterbits-tan-icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET-vox.png
new file mode 100644
index 00000000000..ab6cf612af6
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json
index 702e66d8a33..e69f89cead0 100644
--- a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae. vox state by Flareguy | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d",
   "size": {
     "x": 32,
     "y": 32
@@ -17,6 +17,10 @@
     {
       "name": "equipped-HELMET-vulpkanin",
       "directions": 4
+    },
+    {
+      "name": "equipped-HELMET-vox",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/meta.json
index 5e4c46c8688..d9cecd0392d 100644
--- a/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Misc/pumpkin.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/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. vox states by Flareguy",
   "size": {
     "x": 32,
     "y": 32
@@ -24,6 +24,14 @@
       "name": "on-equipped-HELMET",
       "directions": 4
     },
+    {
+      "name": "off-equipped-HELMET-vox",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-HELMET-vox",
+      "directions": 4
+    },
     {
       "name": "off-inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/off-equipped-HELMET-vox.png
new file mode 100644
index 00000000000..93ead059afe
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/off-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/on-equipped-HELMET-vox.png
new file mode 100644
index 00000000000..7518548bf25
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/on-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Misc/skubhead.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Misc/skubhead.rsi/equipped-HELMET-vox.png
new file mode 100644
index 00000000000..b8f85bb15a3
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/skubhead.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Misc/skubhead.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/skubhead.rsi/meta.json
index 5868e6f365c..2ef7973a394 100644
--- a/Resources/Textures/Clothing/Head/Misc/skubhead.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Misc/skubhead.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation",
+  "copyright": "Taken from tgstation, equipped-HELMET-vox state by Flareguy",
   "size": {
     "x": 32,
     "y": 32
@@ -13,6 +13,10 @@
     {
       "name": "equipped-HELMET",
       "directions": 4
+    },
+    {
+      "name": "equipped-HELMET-vox",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-hamster.png b/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-hamster.png
new file mode 100644
index 00000000000..27efed7a1c2
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-hamster.png differ
diff --git a/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-reptilian.png
new file mode 100644
index 00000000000..f41daaa15a0
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-reptilian.png differ
diff --git a/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-vox.png
new file mode 100644
index 00000000000..924520c2a89
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-vox.png differ
diff --git a/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK.png
new file mode 100644
index 00000000000..01013b3e5a2
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK.png differ
diff --git a/Resources/Textures/Clothing/Mask/clown_security.rsi/icon.png b/Resources/Textures/Clothing/Mask/clown_security.rsi/icon.png
new file mode 100644
index 00000000000..90e9e2e1f02
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_security.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Mask/clown_security.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/clown_security.rsi/inhand-left.png
new file mode 100644
index 00000000000..60f46602d7e
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_security.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Mask/clown_security.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/clown_security.rsi/inhand-right.png
new file mode 100644
index 00000000000..bb3c306586a
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_security.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Mask/clown_security.rsi/meta.json b/Resources/Textures/Clothing/Mask/clown_security.rsi/meta.json
new file mode 100644
index 00000000000..6f5cb2dc1e8
--- /dev/null
+++ b/Resources/Textures/Clothing/Mask/clown_security.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Modified version of clown mask by GoldenCan(github) (Copyright for clown mask: Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e and slightly modified by Flareguy)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-MASK",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-hamster",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-reptilian",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-vox",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-vox.png
new file mode 100644
index 00000000000..4c94f2c0915
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-vox.png differ
diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/up-equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/medical.rsi/up-equipped-MASK-vox.png
new file mode 100644
index 00000000000..c3d8d0fd57e
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medical.rsi/up-equipped-MASK-vox.png differ
diff --git a/Resources/Textures/Clothing/Mask/sadmime.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/sadmime.rsi/equipped-MASK-vox.png
new file mode 100644
index 00000000000..c8b2504d85b
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/sadmime.rsi/equipped-MASK-vox.png differ
diff --git a/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json b/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
index 7e61b10f346..572b3649043 100644
--- a/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
+++ b/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github)  | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers",
+  "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github).Vox edit by foboscheshir (github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers",
   "size": {
     "x": 32,
     "y": 32
@@ -21,6 +21,10 @@
     {
       "name": "equipped-MASK-reptilian",
       "directions": 4
+    },
+    {
+      "name":"equipped-MASK-vox",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Mask/scaredmime.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/scaredmime.rsi/equipped-MASK-vox.png
new file mode 100644
index 00000000000..3591f30f92b
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/scaredmime.rsi/equipped-MASK-vox.png differ
diff --git a/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json b/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
index 5579d1b23a8..a21dbca9615 100644
--- a/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
+++ b/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github)  | vulpkanin version taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/091d9ec00f186052b87bd65125e896f78faefe38 edited by Floofers",
+  "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github). . Vox edit by foboscheshir (github) | vulpkanin version taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/091d9ec00f186052b87bd65125e896f78faefe38 edited by Floofers",
   "size": {
     "x": 32,
     "y": 32
@@ -21,6 +21,10 @@
     {
       "name": "equipped-MASK-reptilian",
       "directions": 4
+    },
+    {
+      "name":"equipped-MASK-vox",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png
index eb9216dea1e..5ce495c1570 100644
Binary files a/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json
index fde00d61167..afe57c8d17c 100644
--- a/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/Cloaks/cmo.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/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875, fixed by @mishutka09",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-light-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-light-vox.png
new file mode 100644
index 00000000000..6833f250275
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-light-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-light.png b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-light.png
new file mode 100644
index 00000000000..58ba92e53fc
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-light.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..1ab6e6cfefe
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..e6a0733e3e7
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/icon.png
new file mode 100644
index 00000000000..54665d7a0e5
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-left.png
new file mode 100644
index 00000000000..64d25308ab6
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-right.png
new file mode 100644
index 00000000000..fd3c44d4ad0
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/light-overlay.png b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/light-overlay.png
new file mode 100644
index 00000000000..c98170b7e1d
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/light-overlay.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/meta.json
new file mode 100644
index 00000000000..ff590848daa
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/meta.json
@@ -0,0 +1,41 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by alzore_(Discord) for SS14 using the colors of the blood-red hardsuit",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "light-overlay"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-OUTERCLOTHING-light",
+      "directions": 4
+    },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "equipped-OUTERCLOTHING-light-vox",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..a6546c46557
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..2ecf1e68e01
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..7d73e554619
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..bcf14c7791d
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..eaef9455081
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..b9da47830b3
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..03a4e52f7b9
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..1824ac30a7f
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..f99be74a5a9
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..d4813efe64e
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..38b48d0a2d4
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..ca6d049a1fd
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/tankharness.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Vests/tankharness.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..712a04c614c
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Vests/tankharness.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/tankharness.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Vests/tankharness.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..51708c386a6
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Vests/tankharness.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/tankharness.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Vests/tankharness.rsi/icon.png
new file mode 100644
index 00000000000..7e7ff0f64e3
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Vests/tankharness.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/tankharness.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Vests/tankharness.rsi/inhand-left.png
new file mode 100644
index 00000000000..e31fe4b59b9
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Vests/tankharness.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/tankharness.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Vests/tankharness.rsi/inhand-right.png
new file mode 100644
index 00000000000..56e13c98e63
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Vests/tankharness.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/tankharness.rsi/meta.json
similarity index 57%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/Vests/tankharness.rsi/meta.json
index 154194f564a..80cd5e0bd88 100644
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Vests/tankharness.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/77cff42b6c514e73881a885036be4b4dd2949f62, recolored by Github user Dutch-VanDerLinde.",
+  "copyright": "Modified from tgstation vest sprite at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e by Errant for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ARMOR-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ARMOR-equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..4d42db5aa06
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ARMOR-equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ARMOR-icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ARMOR-icon.png
new file mode 100644
index 00000000000..34725dcae12
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ARMOR-icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ARMOR-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ARMOR-inhand-left.png
new file mode 100644
index 00000000000..f83377858a2
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ARMOR-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ARMOR-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ARMOR-inhand-right.png
new file mode 100644
index 00000000000..12781db9f2f
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ARMOR-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..1d755313177
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..092d66ea3ef
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..0fca4396ea0
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..f4427249ec8
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..29002eaf6b1
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CENTCOM-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CENTCOM-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CENTCOM-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CENTCOM-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CENTCOM-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CENTCOM-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CENTCOM-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CENTCOM-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEF-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEF-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEF-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEF-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEF-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEF-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEF-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEF-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEM-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEM-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEM-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEM-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEM-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEM-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEM-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEM-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CMO-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CMO-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CMO-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CMO-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CMO-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CMO-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CMO-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CMO-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..015e3250235
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/GENE-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/GENE-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/GENE-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/GENE-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/GENE-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/GENE-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/GENE-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/GENE-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOP-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOP-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOP-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOP-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOP-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOP-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOP-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOP-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOS-ARMORED-icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOS-ARMORED-icon.png
new file mode 100644
index 00000000000..6f7573420d0
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOS-ARMORED-icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOS-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOS-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOS-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOS-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOS-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOS-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOS-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOS-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HYDRO-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HYDRO-equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..334e1e8fe8b
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HYDRO-equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HYDRO-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HYDRO-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HYDRO-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HYDRO-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HYDRO-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HYDRO-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HYDRO-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HYDRO-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/JANI-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/JANI-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/JANI-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/JANI-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/JANI-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/JANI-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/JANI-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/JANI-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MED-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MED-equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..7b1b9d883c1
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MED-equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MED-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MED-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MED-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MED-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MED-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MED-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MED-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MED-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MIME-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MIME-equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..f713d3c8464
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MIME-equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MIME-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MIME-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MIME-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MIME-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MIME-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MIME-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MIME-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MIME-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MINER-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MINER-equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..438eced1b5e
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MINER-equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MINER-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MINER-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MINER-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MINER-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MINER-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MINER-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MINER-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MINER-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/PARA-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/PARA-equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..a7ff1040664
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/PARA-equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/PARA-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/PARA-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/PARA-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/PARA-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/PARA-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/PARA-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/PARA-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/PARA-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/QM-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/QM-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/QM-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/QM-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/QM-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/QM-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/QM-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/QM-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/RD-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/RD-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/RD-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/RD-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/RD-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/RD-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/RD-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/RD-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ROBO-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ROBO-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ROBO-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ROBO-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ROBO-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ROBO-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ROBO-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ROBO-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SCI-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SCI-equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..1634304d137
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SCI-equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SCI-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SCI-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SCI-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SCI-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SCI-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SCI-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SCI-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SCI-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SEC-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SEC-equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..e67c55f114d
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SEC-equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SEC-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SEC-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SEC-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SEC-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SEC-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SEC-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SEC-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SEC-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-ARMORED-icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-ARMORED-icon.png
new file mode 100644
index 00000000000..58ddc0afc5c
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-ARMORED-icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIECAP-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIECAP-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIECAP-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIECAP-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIECAP-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIECAP-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIECAP-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIECAP-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/VIRO-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/VIRO-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/VIRO-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/VIRO-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/VIRO-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/VIRO-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/VIRO-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/VIRO-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARD-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARD-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARD-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARD-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARD-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARD-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARD-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARD-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARDEN-ARMORED-icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARDEN-ARMORED-icon.png
new file mode 100644
index 00000000000..eaf984f4378
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARDEN-ARMORED-icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WEB-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WEB-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WEB-icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WEB-icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WEB-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WEB-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WEB-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WEB-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..d453b039c53
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..25c72cf26f6
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-icon.png
new file mode 100644
index 00000000000..0bea4ba42fc
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-inhand-left.png
new file mode 100644
index 00000000000..34e9a603ab8
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-inhand-right.png
new file mode 100644
index 00000000000..3627bf8c8d1
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json
index 146bd662b49..53233114a28 100644
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.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/77cff42b6c514e73881a885036be4b4dd2949f62",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62 recolored by Github user Dutch-VanDerLinde, CAP edited by Skarletto (github), equipped-OUTERCLOTHING-vox states taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79 and repaletted to match by Flareguy, grayscale layering & armor by IProduceWidgets (Github)",
   "size": {
     "x": 32,
     "y": 32
@@ -21,6 +21,562 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+	{
+      "name": "ATMOS-icon"
+    },
+    {
+      "name": "ATMOS-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "ATMOS-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "ATMOS-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "ATMOS-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "SCI-icon"
+    },
+    {
+      "name": "SCI-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "SCI-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "SCI-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "SCI-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "CHEM-icon"
+    },
+    {
+      "name": "CHEM-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "CHEM-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "CHEM-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "MIME-icon"
+    },
+    {
+      "name": "MIME-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "MIME-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "MIME-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "MIME-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "BAR-icon"
+    },
+    {
+      "name": "BAR-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "BAR-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "BAR-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "BAR-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "PARA-icon"
+    },
+    {
+      "name": "PARA-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "PARA-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "PARA-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "PARA-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "MINER-icon"
+    },
+    {
+      "name": "MINER-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "MINER-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "MINER-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "MINER-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "CARGO-icon"
+    },
+    {
+      "name": "CARGO-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "CARGO-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "CARGO-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "CARGO-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "HYDRO-icon"
+    },
+    {
+      "name": "HYDRO-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "HYDRO-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "HYDRO-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "HYDRO-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "CHEF-icon"
+    },
+    {
+      "name": "CHEF-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "CHEF-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "CHEF-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "GENE-icon"
+    },
+    {
+      "name": "GENE-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "GENE-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "GENE-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "ENGI-icon"
+    },
+    {
+      "name": "ENGI-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "ENGI-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "ENGI-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "ENGI-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "CAP-icon"
+    },
+    {
+      "name": "CAP-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "CAP-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "CAP-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "CAP-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "WARD-icon"
+    },
+    {
+      "name": "WARD-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "WARD-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "WARD-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "JANI-icon"
+    },
+    {
+      "name": "JANI-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "JANI-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "JANI-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "HOP-icon"
+    },
+    {
+      "name": "HOP-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "HOP-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "HOP-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "MED-icon"
+    },
+    {
+      "name": "MED-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "MED-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "MED-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "MED-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "SEC-icon"
+    },
+    {
+      "name": "SEC-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "SEC-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "SEC-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "SEC-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "SYNDIECAP-icon"
+    },
+    {
+      "name": "SYNDIECAP-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "SYNDIECAP-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "SYNDIECAP-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "SYNDIE-icon"
+    },
+    {
+      "name": "SYNDIE-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "SYNDIE-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "SYNDIE-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "CMO-icon"
+    },
+    {
+      "name": "CMO-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "CMO-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "CMO-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "CE-icon"
+    },
+    {
+      "name": "CE-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "CE-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "CE-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "CE-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "ROBO-icon"
+    },
+    {
+      "name": "ROBO-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "ROBO-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "ROBO-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "HOS-icon"
+    },
+    {
+      "name": "HOS-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "HOS-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "HOS-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "CENTCOM-icon"
+    },
+    {
+      "name": "CENTCOM-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "CENTCOM-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "CENTCOM-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "VIRO-icon"
+    },
+    {
+      "name": "VIRO-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "VIRO-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "VIRO-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "QM-icon"
+    },
+    {
+      "name": "QM-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "QM-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "QM-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "WEB-icon"
+    },
+    {
+      "name": "WEB-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "WEB-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "WEB-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "RD-icon"
+    },
+    {
+      "name": "RD-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "RD-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "RD-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "coatybits-icon"
+    },
+	{
+      "name": "winterbits-icon"
+    },
+	{
+      "name": "winterbits-tan-icon"
+    },
+	{
+      "name": "coatybits-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+	{
+      "name": "winterbits-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+	{
+      "name": "winterbits-tan-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+	{
+      "name": "coatybits-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+	{
+      "name": "winterbits-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+	{
+      "name": "coatybits-inhand-left",
+      "directions": 4
+    },
+	{
+      "name": "winterbits-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "coatybits-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "winterbits-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "ARMOR-equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+	{
+      "name": "ARMOR-inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "ARMOR-inhand-left",
+      "directions": 4
+    },
+	{
+      "name": "WARDEN-ARMORED-icon"
+    },
+	{
+      "name": "HOS-ARMORED-icon"
+    },
+	{
+      "name": "SYNDIE-ARMORED-icon"
+    },
+	{
+      "name": "ARMOR-icon"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000..a597167d9f6
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..b0bb27edca3
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-icon.png
new file mode 100644
index 00000000000..c3c25154f20
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-inhand-left.png
new file mode 100644
index 00000000000..09c187e3fe6
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-inhand-right.png
new file mode 100644
index 00000000000..77201839c7b
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-tan-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-tan-equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..7e401cdd7b4
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-tan-equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-tan-icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-tan-icon.png
new file mode 100644
index 00000000000..41b3123ef4a
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-tan-icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json
deleted file mode 100644
index 146bd662b49..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.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/77cff42b6c514e73881a885036be4b4dd2949f62",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/meta.json
deleted file mode 100644
index c9f0d90ea13..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json
deleted file mode 100644
index c9a1729262f..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.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/77cff42b6c514e73881a885036be4b4dd2949f62 , edited by Skarletto (github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json
deleted file mode 100644
index 146bd662b49..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.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/77cff42b6c514e73881a885036be4b4dd2949f62",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json
deleted file mode 100644
index 146bd662b49..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.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/77cff42b6c514e73881a885036be4b4dd2949f62",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json
deleted file mode 100644
index 146bd662b49..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.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/77cff42b6c514e73881a885036be4b4dd2949f62",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/meta.json
deleted file mode 100644
index 146bd662b49..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.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/77cff42b6c514e73881a885036be4b4dd2949f62",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json
deleted file mode 100644
index 146bd662b49..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.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/77cff42b6c514e73881a885036be4b4dd2949f62",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json
deleted file mode 100644
index 146bd662b49..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.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/77cff42b6c514e73881a885036be4b4dd2949f62",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json
deleted file mode 100644
index 146bd662b49..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.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/77cff42b6c514e73881a885036be4b4dd2949f62",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json
deleted file mode 100644
index 146bd662b49..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.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/77cff42b6c514e73881a885036be4b4dd2949f62",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json
deleted file mode 100644
index 146bd662b49..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.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/77cff42b6c514e73881a885036be4b4dd2949f62",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json
deleted file mode 100644
index 146bd662b49..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.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/77cff42b6c514e73881a885036be4b4dd2949f62",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json
deleted file mode 100644
index 146bd662b49..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.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/77cff42b6c514e73881a885036be4b4dd2949f62",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json
deleted file mode 100644
index 146bd662b49..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.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/77cff42b6c514e73881a885036be4b4dd2949f62",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json
deleted file mode 100644
index 146bd662b49..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.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/77cff42b6c514e73881a885036be4b4dd2949f62",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json
deleted file mode 100644
index c9f0d90ea13..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json
deleted file mode 100644
index 146bd662b49..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.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/77cff42b6c514e73881a885036be4b4dd2949f62",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json
deleted file mode 100644
index 146bd662b49..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.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/77cff42b6c514e73881a885036be4b4dd2949f62",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json
deleted file mode 100644
index 146bd662b49..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.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/77cff42b6c514e73881a885036be4b4dd2949f62",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json
deleted file mode 100644
index 146bd662b49..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.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/77cff42b6c514e73881a885036be4b4dd2949f62",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json
deleted file mode 100644
index 146bd662b49..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.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/77cff42b6c514e73881a885036be4b4dd2949f62",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json
deleted file mode 100644
index 146bd662b49..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.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/77cff42b6c514e73881a885036be4b4dd2949f62",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json
deleted file mode 100644
index 146bd662b49..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.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/77cff42b6c514e73881a885036be4b4dd2949f62",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json
deleted file mode 100644
index 146bd662b49..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.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/77cff42b6c514e73881a885036be4b4dd2949f62",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/meta.json
deleted file mode 100644
index 5f1566a476d..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Made by PixelTheKermit (github) for SS14",
-  "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/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/meta.json
deleted file mode 100644
index eadf9c61d48..00000000000
--- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Sprited by belay5 (Discord)",
-  "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/Clothing/Shoes/Boots/combatboots.rsi/equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/equipped-FEET-vox.png
new file mode 100644
index 00000000000..77af7765e57
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/equipped-FEET-vox.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json
index 8eb6b8a626a..b0c4419ddae 100644
--- a/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json
+++ b/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by @ninruB#7795, based off tgstation's jackboots at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
+  "copyright": "Made by @ninruB#7795, based off tgstation's jackboots at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe. Vox state modified from jackboots.rsi by Flareguy",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-FEET",
       "directions": 4
     },
+    {
+      "name": "equipped-FEET-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/equipped-FEET-vox.png
new file mode 100644
index 00000000000..dc22be4ac27
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/equipped-FEET-vox.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/meta.json
index 2880b8eec40..6b1053d8ea2 100644
--- a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/meta.json
+++ b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Drawn by Ubaser.",
+  "copyright": "Drawn by Ubaser. Vox states made by Flareguy, modified from magboots.rsi",
   "size": {
     "x": 32,
     "y": 32
@@ -15,6 +15,14 @@
       "name": "on-equipped-FEET",
       "directions": 4
     },
+    {
+      "name": "equipped-FEET-vox",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-FEET-vox",
+      "directions": 4
+    },
     {
       "name": "icon"
     },
diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-equipped-FEET-vox.png
new file mode 100644
index 00000000000..04605be1065
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-equipped-FEET-vox.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/equipped-FEET-vox.png
new file mode 100644
index 00000000000..ff5c3a05894
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/equipped-FEET-vox.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/meta.json
index 3aa61e31c5a..7c3599192c9 100644
--- a/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/meta.json
+++ b/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC0-1.0",
-  "copyright": "Created by EmoGarbage404",
+  "copyright": "Created by EmoGarbage404. Vox states made by Flareguy, modified from magboots.rsi",
   "size": {
     "x": 32,
     "y": 32
@@ -15,6 +15,14 @@
       "name": "on-equipped-FEET",
       "directions": 4
     },
+    {
+      "name": "equipped-FEET-vox",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-FEET-vox",
+      "directions": 4
+    },
     {
       "name": "icon"
     },
diff --git a/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/on-equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/on-equipped-FEET-vox.png
new file mode 100644
index 00000000000..66ae1ee7e84
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/on-equipped-FEET-vox.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/equipped-FEET.png
index 7f0f359ed41..4d981a54c7c 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/icon.png
index 31bdf9a1adb..f8133ecc16b 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-left.png
index e605ea59bd9..76f3ec14448 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-left.png and b/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-right.png
index 6925df6df6c..69c30d66e80 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-right.png and b/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/meta.json
index e484bbb13af..bda672d9609 100644
--- a/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/meta.json
+++ b/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "drawn by Ubaser",
+  "copyright": "drawn by Ubaser and modified by alzore_(discord)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/equipped-FEET.png
index b292b07a39d..c2c2e4d929c 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/icon.png
index 95c916586e8..53063f59dfd 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-left.png
index 2df546bd078..0a447f07746 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-left.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-right.png
index d4c3b8602f5..da7b5bc6668 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-right.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/meta.json
index 8bfe0c1a190..6fda26443e2 100644
--- a/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/meta.json
+++ b/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by UbaserB and edited by Kilk for SS14" ,
+  "copyright": "Made by UbaserB and edited by Kilk for SS14 and modified by alzore_(discord)" ,
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/equipped-FEET.png
index 467cad3bd89..dee2d7fb3a4 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/icon.png
index e1fea94f59c..b1b0e3024df 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-left.png
index ae66fbf2314..0adf41be118 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-left.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-right.png
index 9fba6eb0ecf..3d2a86f3c8c 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-right.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/meta.json
index 8bfe0c1a190..6fda26443e2 100644
--- a/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/meta.json
+++ b/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by UbaserB and edited by Kilk for SS14" ,
+  "copyright": "Made by UbaserB and edited by Kilk for SS14 and modified by alzore_(discord)" ,
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/equipped-FEET.png
index 6736993f4f4..9721c880c99 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/icon.png
index c0775e6f22a..2a178b902ba 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-left.png
index 7a85298de15..2802f072428 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-left.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-right.png
index 903168d47b8..33d50cba558 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-right.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/meta.json
index 8bfe0c1a190..6fda26443e2 100644
--- a/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/meta.json
+++ b/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by UbaserB and edited by Kilk for SS14" ,
+  "copyright": "Made by UbaserB and edited by Kilk for SS14 and modified by alzore_(discord)" ,
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/equipped-FEET.png
index 1f3e9613607..1a55673925d 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/icon.png
index 4bd7201d1e9..47f596310ab 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-left.png
index 270f95ccf5f..dfbe52f9b96 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-left.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-right.png
index eaa7faa88df..b4dcef516c2 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-right.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/meta.json
index 8bfe0c1a190..6fda26443e2 100644
--- a/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/meta.json
+++ b/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by UbaserB and edited by Kilk for SS14" ,
+  "copyright": "Made by UbaserB and edited by Kilk for SS14 and modified by alzore_(discord)" ,
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/equipped-FEET.png
index 0e03908a0e5..53687ff5813 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/icon.png
index bec3a3c81f2..5dc63e7d4f7 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-left.png
index c600e2e27ed..562c871f365 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-left.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-right.png
index e1251f23561..a059a5089bb 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-right.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/meta.json
index 8bfe0c1a190..6fda26443e2 100644
--- a/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/meta.json
+++ b/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by UbaserB and edited by Kilk for SS14" ,
+  "copyright": "Made by UbaserB and edited by Kilk for SS14 and modified by alzore_(discord)" ,
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/equipped-FEET.png
index 248b20735ac..bcff2ee62e4 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/icon.png
index bf7a5a514c0..1167a26b4e6 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/inhand-left.png
index ebf7810dadd..3397fee7b9c 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/inhand-left.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/inhand-right.png
index 22f21c3eacf..c00ee22e4a7 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/inhand-right.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/meta.json
index b333e16946e..6fcbb46f5ad 100644
--- a/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/meta.json
+++ b/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by UbaserB and edited by Kilk for SS14",
+  "copyright": "Made by UbaserB and edited by Kilk for SS14 and modified by alzore_(discord)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/equipped-FEET.png
index 8a24f3260ce..e38aa6f63d0 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/icon.png
index bf2a8ee58ab..6cda093ac52 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/inhand-left.png
index 345b1c6c783..c87ff7cdd83 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/inhand-left.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/inhand-right.png
index 45906997979..2443e02aaf1 100644
Binary files a/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/inhand-right.png and b/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/meta.json
index 8bfe0c1a190..6fda26443e2 100644
--- a/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/meta.json
+++ b/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by UbaserB and edited by Kilk for SS14" ,
+  "copyright": "Made by UbaserB and edited by Kilk for SS14 and modified by alzore_(discord)" ,
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Shoes/color.rsi/contrastedsoles-equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/color.rsi/contrastedsoles-equipped-FEET-vox.png
index a7ebf25671f..5294d0cde32 100644
Binary files a/Resources/Textures/Clothing/Shoes/color.rsi/contrastedsoles-equipped-FEET-vox.png and b/Resources/Textures/Clothing/Shoes/color.rsi/contrastedsoles-equipped-FEET-vox.png differ
diff --git a/Resources/Textures/Clothing/Shoes/color.rsi/equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/color.rsi/equipped-FEET-vox.png
index d81e2314b68..9ab3ec39583 100644
Binary files a/Resources/Textures/Clothing/Shoes/color.rsi/equipped-FEET-vox.png and b/Resources/Textures/Clothing/Shoes/color.rsi/equipped-FEET-vox.png differ
diff --git a/Resources/Textures/Clothing/Shoes/color.rsi/soles-equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/color.rsi/soles-equipped-FEET-vox.png
index 0255ed7b786..35b9ed4f979 100644
Binary files a/Resources/Textures/Clothing/Shoes/color.rsi/soles-equipped-FEET-vox.png and b/Resources/Textures/Clothing/Shoes/color.rsi/soles-equipped-FEET-vox.png differ
diff --git a/Resources/Textures/Decals/Overlays/markups.rsi/meta.json b/Resources/Textures/Decals/Overlays/markups.rsi/meta.json
new file mode 100644
index 00000000000..162a07245b4
--- /dev/null
+++ b/Resources/Textures/Decals/Overlays/markups.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "by Ko4erga (discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+	  {
+      "name": "square"
+    },
+    {
+      "name": "rectangle1x2"
+    },
+    {
+      "name": "rectangle1x2center"
+    },
+    {
+      "name": "squareQuater"
+    },
+    {
+      "name": "squareQuaterCenter"
+    }
+  ]
+}
diff --git a/Resources/Textures/Decals/Overlays/markups.rsi/rectangle1x2.png b/Resources/Textures/Decals/Overlays/markups.rsi/rectangle1x2.png
new file mode 100644
index 00000000000..d88bcb36800
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/markups.rsi/rectangle1x2.png differ
diff --git a/Resources/Textures/Decals/Overlays/markups.rsi/rectangle1x2center.png b/Resources/Textures/Decals/Overlays/markups.rsi/rectangle1x2center.png
new file mode 100644
index 00000000000..eaa437336b7
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/markups.rsi/rectangle1x2center.png differ
diff --git a/Resources/Textures/Decals/Overlays/markups.rsi/square.png b/Resources/Textures/Decals/Overlays/markups.rsi/square.png
new file mode 100644
index 00000000000..7e085ef1f6f
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/markups.rsi/square.png differ
diff --git a/Resources/Textures/Decals/Overlays/markups.rsi/squareQuater.png b/Resources/Textures/Decals/Overlays/markups.rsi/squareQuater.png
new file mode 100644
index 00000000000..6d49b25d610
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/markups.rsi/squareQuater.png differ
diff --git a/Resources/Textures/Decals/Overlays/markups.rsi/squareQuaterCenter.png b/Resources/Textures/Decals/Overlays/markups.rsi/squareQuaterCenter.png
new file mode 100644
index 00000000000..b160a089b79
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/markups.rsi/squareQuaterCenter.png differ
diff --git a/Resources/Textures/Effects/medi_holo.rsi/medi_holo.png b/Resources/Textures/Effects/medi_holo.rsi/medi_holo.png
new file mode 100644
index 00000000000..9b024faa2d7
Binary files /dev/null and b/Resources/Textures/Effects/medi_holo.rsi/medi_holo.png differ
diff --git a/Resources/Textures/Effects/medi_holo.rsi/meta.json b/Resources/Textures/Effects/medi_holo.rsi/meta.json
new file mode 100644
index 00000000000..1be502223e5
--- /dev/null
+++ b/Resources/Textures/Effects/medi_holo.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/tgstation/tgstation/tree/217b39cc85e45302d407d5c1ab60809bd9e18987",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "medi_holo",
+      "delays": [
+        [
+          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/Interface/Bwoink/pinned.png b/Resources/Textures/Interface/Bwoink/pinned.png
new file mode 100644
index 00000000000..80c8a202005
Binary files /dev/null and b/Resources/Textures/Interface/Bwoink/pinned.png differ
diff --git a/Resources/Textures/Interface/Bwoink/pinned2.png b/Resources/Textures/Interface/Bwoink/pinned2.png
new file mode 100644
index 00000000000..11c4b62f123
Binary files /dev/null and b/Resources/Textures/Interface/Bwoink/pinned2.png differ
diff --git a/Resources/Textures/Interface/Bwoink/un_pinned.png b/Resources/Textures/Interface/Bwoink/un_pinned.png
new file mode 100644
index 00000000000..26ef8b48185
Binary files /dev/null and b/Resources/Textures/Interface/Bwoink/un_pinned.png differ
diff --git a/Resources/Textures/Interface/Paper/paper_heading_postage_stamp.svg.96dpi.png b/Resources/Textures/Interface/Paper/paper_heading_postage_stamp.svg.96dpi.png
new file mode 100644
index 00000000000..ec3566f63ea
Binary files /dev/null and b/Resources/Textures/Interface/Paper/paper_heading_postage_stamp.svg.96dpi.png differ
diff --git a/Resources/Textures/Interface/Paper/paper_heading_postage_stamp.svg.96dpi.png.yml b/Resources/Textures/Interface/Paper/paper_heading_postage_stamp.svg.96dpi.png.yml
new file mode 100644
index 00000000000..5c43e233050
--- /dev/null
+++ b/Resources/Textures/Interface/Paper/paper_heading_postage_stamp.svg.96dpi.png.yml
@@ -0,0 +1,2 @@
+sample:
+  filter: true
diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_stenciled.png b/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_stenciled.png
index 50627ac5220..9072c9f4fc3 100644
Binary files a/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_stenciled.png and b/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_stenciled.png differ
diff --git a/Resources/Textures/Mobs/Silicon/Bots/supplybot.rsi/meta.json b/Resources/Textures/Mobs/Silicon/Bots/supplybot.rsi/meta.json
index 6bb3e77cfeb..f459a7caa63 100644
--- a/Resources/Textures/Mobs/Silicon/Bots/supplybot.rsi/meta.json
+++ b/Resources/Textures/Mobs/Silicon/Bots/supplybot.rsi/meta.json
@@ -10,6 +10,28 @@
     {
       "name": "supplybot",
       "directions": 4,
+      "delays": [
+        [
+          0.3,
+          0.1
+        ],
+        [
+          0.3,
+          0.1
+        ],
+        [
+          0.3,
+          0.1
+        ],
+        [
+          0.3,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "supplybot-moving",
+      "directions": 4,
       "delays": [
         [
           0.1,
diff --git a/Resources/Textures/Mobs/Silicon/Bots/supplybot.rsi/supplybot-moving.png b/Resources/Textures/Mobs/Silicon/Bots/supplybot.rsi/supplybot-moving.png
new file mode 100644
index 00000000000..cac976240bd
Binary files /dev/null and b/Resources/Textures/Mobs/Silicon/Bots/supplybot.rsi/supplybot-moving.png differ
diff --git a/Resources/Textures/Mobs/Silicon/Bots/supplybot.rsi/supplybot.png b/Resources/Textures/Mobs/Silicon/Bots/supplybot.rsi/supplybot.png
index cac976240bd..9a4895603b1 100644
Binary files a/Resources/Textures/Mobs/Silicon/Bots/supplybot.rsi/supplybot.png and b/Resources/Textures/Mobs/Silicon/Bots/supplybot.rsi/supplybot.png differ
diff --git a/Resources/Textures/Mobs/Species/Human/displacement.rsi/jumpsuit-female.png b/Resources/Textures/Mobs/Species/Human/displacement.rsi/jumpsuit-female.png
new file mode 100644
index 00000000000..be9c1064fbd
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/displacement.rsi/jumpsuit-female.png differ
diff --git a/Resources/Textures/Mobs/Species/Human/displacement.rsi/meta.json b/Resources/Textures/Mobs/Species/Human/displacement.rsi/meta.json
new file mode 100644
index 00000000000..7ac587cad70
--- /dev/null
+++ b/Resources/Textures/Mobs/Species/Human/displacement.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by TheShuEd",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "load": {
+        "srgb": false
+    },
+    "states": [
+        {
+            "name": "jumpsuit-female",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/back.png b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/back.png
new file mode 100644
index 00000000000..c300bba8a5b
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/back.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/ears.png b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/ears.png
new file mode 100644
index 00000000000..0b163821447
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/ears.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/eyes.png b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/eyes.png
new file mode 100644
index 00000000000..f705c337de1
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/eyes.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/hand.png b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/hand.png
new file mode 100644
index 00000000000..4a0266dfd37
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/hand.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/head.png b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/head.png
new file mode 100644
index 00000000000..676262eca65
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/head.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json
index 6ea6c552b97..002f826b3e5 100644
--- a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json
+++ b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Made by PJB3005",
+    "copyright": "jumpsuit state made by PJB3005. back, hand, head, and eyes states made by Flareguy, ears and shoes made by TheShuEd",
     "size": {
         "x": 32,
         "y": 32
@@ -13,6 +13,30 @@
         {
             "name": "jumpsuit",
             "directions": 4
+        },
+        {
+            "name": "back",
+            "directions": 4
+        },
+        {
+            "name": "hand",
+            "directions": 4
+        },
+        {
+            "name": "head",
+            "directions": 4
+        },
+        {
+            "name": "ears",
+            "directions": 4
+        },
+        {
+            "name": "eyes",
+            "directions": 4
+        },
+        {
+            "name": "shoes",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/shoes.png b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/shoes.png
new file mode 100644
index 00000000000..107a7500bb9
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/shoes.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/parts.rsi/torso.png b/Resources/Textures/Mobs/Species/Vox/parts.rsi/torso.png
index 841d4097351..3910fb39a67 100644
Binary files a/Resources/Textures/Mobs/Species/Vox/parts.rsi/torso.png and b/Resources/Textures/Mobs/Species/Vox/parts.rsi/torso.png differ
diff --git a/Resources/Textures/Mobs/Species/lungs_phoronman.png b/Resources/Textures/Mobs/Species/lungs_phoronman.png
deleted file mode 100644
index 1c6d2dc11a8..00000000000
Binary files a/Resources/Textures/Mobs/Species/lungs_phoronman.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json
index f42362b2545..cb676a06ef7 100644
--- a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.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, Spicy Rock Pizza modified from margherita pizza by mkanke",
   "size": {
     "x": 32,
     "y": 32
@@ -137,6 +137,12 @@
     {
       "name": "box-inhand-left",
       "directions": 4
+    },
+    {
+      "name": "uranium-pizza"
+    },
+    {
+      "name": "uranium-slice"
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/uranium-pizza.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/uranium-pizza.png
new file mode 100644
index 00000000000..6fdb66c2dca
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/uranium-pizza.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/uranium-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/uranium-slice.png
new file mode 100644
index 00000000000..de619c3a137
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/uranium-slice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/butter-slice.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/butter-slice.png
new file mode 100644
index 00000000000..81b73772a73
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/butter-slice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json
index b4317b0c76f..8e733752358 100644
--- a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and baystation and modified by potato1234x at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Tofu and tofu-slice were created by Discord user rosysyntax#6514. Chevrelog and chevredisk created by Github user deathride58, tortilladough tortillaflat and tortillaslice added by Phunny,",
+  "copyright": "Taken from tgstation and baystation and modified by potato1234x at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Tofu and tofu-slice were created by Discord user rosysyntax#6514. Chevrelog and chevredisk created by Github user deathride58, tortilladough tortillaflat and tortillaslice added by Phunny, butter-slice taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955",
   "size": {
     "x": 32,
     "y": 32
@@ -111,6 +111,9 @@
     },
     {
       "name": "tortilladough-slice"
+    },
+    {
+      "name": "butter-slice"
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-ord.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-ord.png
similarity index 100%
rename from Resources/Textures/Objects/Devices/cartridges.rsi/cart-ord.png
rename to Resources/Textures/Objects/Devices/cartridge.rsi/cart-ord.png
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/insert_overlay.png b/Resources/Textures/Objects/Devices/cartridge.rsi/insert_overlay.png
similarity index 100%
rename from Resources/Textures/Objects/Devices/cartridges.rsi/insert_overlay.png
rename to Resources/Textures/Objects/Devices/cartridge.rsi/insert_overlay.png
diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json b/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json
index c7eb96d964e..f3b02a2b2ea 100644
--- a/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d , cart-log made by Skarletto (github)",
+  "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d and tgstation at tgstation at https://github.com/tgstation/tgstation/commit/0c15d9dbcf0f2beb230eba5d9d889ef2d1945bb8, cart-log made by Skarletto (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -49,12 +49,18 @@
     {
       "name": "cart-lib"
     },
+    {
+      "name": "cart-log"
+    },
     {
       "name": "cart-m"
     },
     {
       "name": "cart-mi"
     },
+    {
+      "name": "cart-ord"
+    },
     {
       "name": "cart-q"
     },
@@ -74,7 +80,7 @@
       "name": "cart-y"
     },
     {
-      "name": "cart-log"
+      "name": "insert_overlay"
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-a.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-a.png
deleted file mode 100644
index 567490fdea6..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-a.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-b.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-b.png
deleted file mode 100644
index 90a75aecca7..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-b.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-c.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-c.png
deleted file mode 100644
index e2fa89e9d56..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-c.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-ce.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-ce.png
deleted file mode 100644
index 3eb6762a5ad..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-ce.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-chem.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-chem.png
deleted file mode 100644
index 945092b63d0..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-chem.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-clown.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-clown.png
deleted file mode 100644
index 384d2fbd099..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-clown.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-cmo.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-cmo.png
deleted file mode 100644
index 794eeb32a2c..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-cmo.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-e.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-e.png
deleted file mode 100644
index 81573340a36..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-e.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-eye.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-eye.png
deleted file mode 100644
index 52be2688c4d..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-eye.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-h.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-h.png
deleted file mode 100644
index 2cdc1326357..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-h.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-hos.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-hos.png
deleted file mode 100644
index 5d3419fc63c..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-hos.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-j.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-j.png
deleted file mode 100644
index f676b14b846..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-j.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-lib.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-lib.png
deleted file mode 100644
index 6fbffc5962a..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-lib.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-m.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-m.png
deleted file mode 100644
index 3956c626a44..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-m.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-mi.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-mi.png
deleted file mode 100644
index ad50f4cd308..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-mi.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-q.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-q.png
deleted file mode 100644
index 5f0e415ca8d..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-q.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-rd.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-rd.png
deleted file mode 100644
index 3544bf21dfc..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-rd.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-s.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-s.png
deleted file mode 100644
index 732722a2cf0..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-s.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-tear.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-tear.png
deleted file mode 100644
index a4fc0a1747f..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-tear.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart.png
deleted file mode 100644
index a5347224d75..00000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/meta.json b/Resources/Textures/Objects/Devices/cartridges.rsi/meta.json
deleted file mode 100644
index b0f5cd02a76..00000000000
--- a/Resources/Textures/Objects/Devices/cartridges.rsi/meta.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/0c15d9dbcf0f2beb230eba5d9d889ef2d1945bb8",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "insert_overlay"
-    },
-    {
-      "name": "cart"
-    },
-    {
-      "name": "cart-e"
-    },
-    {
-      "name": "cart-m"
-    },
-    {
-      "name": "cart-chem"
-    },
-    {
-      "name": "cart-c"
-    },
-    {
-      "name": "cart-h"
-    },
-    {
-      "name": "cart-s"
-    },
-    {
-      "name": "cart-clown"
-    },
-    {
-      "name": "cart-a"
-    },
-    {
-      "name": "cart-j"
-    },
-    {
-      "name": "cart-q"
-    },
-    {
-      "name": "cart-ord"
-    },
-    {
-      "name": "cart-tear"
-    },
-    {
-      "name": "cart-b"
-    },
-    {
-      "name": "cart-lib"
-    },
-    {
-      "name": "cart-eye"
-    },
-    {
-      "name": "cart-mi"
-    },
-    {
-      "name": "cart-hos"
-    },
-    {
-      "name": "cart-ce"
-    },
-    {
-      "name": "cart-cmo"
-    },
-    {
-      "name": "cart-rd"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/meta.json b/Resources/Textures/Objects/Devices/communication.rsi/meta.json
index 328747df09a..784e509c1d3 100644
--- a/Resources/Textures/Objects/Devices/communication.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/communication.rsi/meta.json
@@ -86,6 +86,9 @@
     {
       "name": "old-radio-urist"
     },
+    {
+      "name": "old-radio-nukeop"
+    },
     {
       "name": "old-radio-ancestor"
     },
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/old-radio-nukeop.png b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-nukeop.png
new file mode 100644
index 00000000000..b5befcf26db
Binary files /dev/null and b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-nukeop.png differ
diff --git a/Resources/Textures/Objects/Devices/goldwatch.rsi/equipped-HAND.png b/Resources/Textures/Objects/Devices/goldwatch.rsi/equipped-HAND.png
new file mode 100644
index 00000000000..59522f6c12e
Binary files /dev/null and b/Resources/Textures/Objects/Devices/goldwatch.rsi/equipped-HAND.png differ
diff --git a/Resources/Textures/Objects/Devices/goldwatch.rsi/goldwatch.png b/Resources/Textures/Objects/Devices/goldwatch.rsi/goldwatch.png
new file mode 100644
index 00000000000..60e16eb8459
Binary files /dev/null and b/Resources/Textures/Objects/Devices/goldwatch.rsi/goldwatch.png differ
diff --git a/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_0.png b/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_0.png
new file mode 100644
index 00000000000..f1064c1a274
Binary files /dev/null and b/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_0.png differ
diff --git a/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_1.png b/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_1.png
new file mode 100644
index 00000000000..c553b1c913b
Binary files /dev/null and b/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_1.png differ
diff --git a/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_10.png b/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_10.png
new file mode 100644
index 00000000000..0bbe9d8ba24
Binary files /dev/null and b/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_10.png differ
diff --git a/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_11.png b/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_11.png
new file mode 100644
index 00000000000..e364438e4ec
Binary files /dev/null and b/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_11.png differ
diff --git a/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_2.png b/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_2.png
new file mode 100644
index 00000000000..87c642239fe
Binary files /dev/null and b/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_2.png differ
diff --git a/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_3.png b/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_3.png
new file mode 100644
index 00000000000..107b210ff4f
Binary files /dev/null and b/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_3.png differ
diff --git a/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_4.png b/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_4.png
new file mode 100644
index 00000000000..c03f799fcce
Binary files /dev/null and b/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_4.png differ
diff --git a/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_5.png b/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_5.png
new file mode 100644
index 00000000000..2835fadd249
Binary files /dev/null and b/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_5.png differ
diff --git a/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_6.png b/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_6.png
new file mode 100644
index 00000000000..55df41a9ce9
Binary files /dev/null and b/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_6.png differ
diff --git a/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_7.png b/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_7.png
new file mode 100644
index 00000000000..890650474df
Binary files /dev/null and b/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_7.png differ
diff --git a/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_8.png b/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_8.png
new file mode 100644
index 00000000000..a9a27f92dfd
Binary files /dev/null and b/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_8.png differ
diff --git a/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_9.png b/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_9.png
new file mode 100644
index 00000000000..262901db8f4
Binary files /dev/null and b/Resources/Textures/Objects/Devices/goldwatch.rsi/hours_9.png differ
diff --git a/Resources/Textures/Objects/Devices/goldwatch.rsi/inhand-left.png b/Resources/Textures/Objects/Devices/goldwatch.rsi/inhand-left.png
new file mode 100644
index 00000000000..ec40991d4ec
Binary files /dev/null and b/Resources/Textures/Objects/Devices/goldwatch.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Devices/goldwatch.rsi/inhand-right.png b/Resources/Textures/Objects/Devices/goldwatch.rsi/inhand-right.png
new file mode 100644
index 00000000000..aac69417e32
Binary files /dev/null and b/Resources/Textures/Objects/Devices/goldwatch.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Devices/goldwatch.rsi/meta.json b/Resources/Textures/Objects/Devices/goldwatch.rsi/meta.json
new file mode 100644
index 00000000000..6466438b53b
--- /dev/null
+++ b/Resources/Textures/Objects/Devices/goldwatch.rsi/meta.json
@@ -0,0 +1,98 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/223bf37a7386249ecf1fe425ca8cef25821ca9d7/icons/obj/watches/goldwatch.dmi, https://github.com/vgstation-coders/vgstation13/blob/223bf37a7386249ecf1fe425ca8cef25821ca9d7/icons/mob/in-hand/right/clothing_accessories.dmi, https://github.com/vgstation-coders/vgstation13/blob/223bf37a7386249ecf1fe425ca8cef25821ca9d7/icons/mob/in-hand/left/clothing_accessories.dmi, https://github.com/vgstation-coders/vgstation13/blob/30f9caeb59b0dd9da1dbcd4c69307ae182033a74/icons/mob/clothing_accessories.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "goldwatch"
+    },
+    {
+      "name": "hours_1"
+    },
+    {
+      "name": "hours_2"
+    },
+    {
+      "name": "hours_3"
+    },
+    {
+      "name": "hours_4"
+    },
+    {
+      "name": "hours_5"
+    },
+    {
+      "name": "hours_6"
+    },
+    {
+      "name": "hours_7"
+    },
+    {
+      "name": "hours_8"
+    },
+    {
+      "name": "hours_9"
+    },
+    {
+      "name": "hours_10"
+    },
+    {
+      "name": "hours_11"
+    },
+    {
+      "name": "hours_0"
+    },
+    {
+      "name": "minutes_1"
+    },
+    {
+      "name": "minutes_2"
+    },
+    {
+      "name": "minutes_3"
+    },
+    {
+      "name": "minutes_4"
+    },
+    {
+      "name": "minutes_5"
+    },
+    {
+      "name": "minutes_6"
+    },
+    {
+      "name": "minutes_7"
+    },
+    {
+      "name": "minutes_8"
+    },
+    {
+      "name": "minutes_9"
+    },
+    {
+      "name": "minutes_10"
+    },
+    {
+      "name": "minutes_11"
+    },
+    {
+      "name": "minutes_0"
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "equipped-HAND",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_0.png b/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_0.png
new file mode 100644
index 00000000000..be687566cba
Binary files /dev/null and b/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_0.png differ
diff --git a/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_1.png b/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_1.png
new file mode 100644
index 00000000000..0ef2c831f4d
Binary files /dev/null and b/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_1.png differ
diff --git a/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_10.png b/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_10.png
new file mode 100644
index 00000000000..3019a20a9ba
Binary files /dev/null and b/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_10.png differ
diff --git a/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_11.png b/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_11.png
new file mode 100644
index 00000000000..fcbf039b6ff
Binary files /dev/null and b/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_11.png differ
diff --git a/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_2.png b/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_2.png
new file mode 100644
index 00000000000..1304f56e757
Binary files /dev/null and b/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_2.png differ
diff --git a/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_3.png b/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_3.png
new file mode 100644
index 00000000000..8f58881dbda
Binary files /dev/null and b/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_3.png differ
diff --git a/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_4.png b/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_4.png
new file mode 100644
index 00000000000..a0c007b6eac
Binary files /dev/null and b/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_4.png differ
diff --git a/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_5.png b/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_5.png
new file mode 100644
index 00000000000..1d71f45c479
Binary files /dev/null and b/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_5.png differ
diff --git a/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_6.png b/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_6.png
new file mode 100644
index 00000000000..5e1070e3a80
Binary files /dev/null and b/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_6.png differ
diff --git a/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_7.png b/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_7.png
new file mode 100644
index 00000000000..4af1070d216
Binary files /dev/null and b/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_7.png differ
diff --git a/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_8.png b/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_8.png
new file mode 100644
index 00000000000..39b252688a7
Binary files /dev/null and b/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_8.png differ
diff --git a/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_9.png b/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_9.png
new file mode 100644
index 00000000000..b9614ed80f5
Binary files /dev/null and b/Resources/Textures/Objects/Devices/goldwatch.rsi/minutes_9.png differ
diff --git a/Resources/Textures/Objects/Devices/wristwatch.rsi/equipped-HAND.png b/Resources/Textures/Objects/Devices/wristwatch.rsi/equipped-HAND.png
new file mode 100644
index 00000000000..b12afe6d4ee
Binary files /dev/null and b/Resources/Textures/Objects/Devices/wristwatch.rsi/equipped-HAND.png differ
diff --git a/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_0.png b/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_0.png
new file mode 100644
index 00000000000..3af9ca46343
Binary files /dev/null and b/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_0.png differ
diff --git a/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_1.png b/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_1.png
new file mode 100644
index 00000000000..4791cee3e4a
Binary files /dev/null and b/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_1.png differ
diff --git a/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_10.png b/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_10.png
new file mode 100644
index 00000000000..aeac8626567
Binary files /dev/null and b/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_10.png differ
diff --git a/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_11.png b/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_11.png
new file mode 100644
index 00000000000..5f2daf512a4
Binary files /dev/null and b/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_11.png differ
diff --git a/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_2.png b/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_2.png
new file mode 100644
index 00000000000..386166cabdd
Binary files /dev/null and b/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_2.png differ
diff --git a/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_3.png b/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_3.png
new file mode 100644
index 00000000000..2f5300928f2
Binary files /dev/null and b/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_3.png differ
diff --git a/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_4.png b/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_4.png
new file mode 100644
index 00000000000..c994c056859
Binary files /dev/null and b/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_4.png differ
diff --git a/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_5.png b/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_5.png
new file mode 100644
index 00000000000..c344b0307b4
Binary files /dev/null and b/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_5.png differ
diff --git a/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_6.png b/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_6.png
new file mode 100644
index 00000000000..892194a6f0a
Binary files /dev/null and b/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_6.png differ
diff --git a/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_7.png b/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_7.png
new file mode 100644
index 00000000000..fa7af8e5cca
Binary files /dev/null and b/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_7.png differ
diff --git a/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_8.png b/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_8.png
new file mode 100644
index 00000000000..83caf8c8e17
Binary files /dev/null and b/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_8.png differ
diff --git a/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_9.png b/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_9.png
new file mode 100644
index 00000000000..6334bb72fdc
Binary files /dev/null and b/Resources/Textures/Objects/Devices/wristwatch.rsi/hours_9.png differ
diff --git a/Resources/Textures/Objects/Devices/wristwatch.rsi/inhand-left.png b/Resources/Textures/Objects/Devices/wristwatch.rsi/inhand-left.png
new file mode 100644
index 00000000000..76ca3c49115
Binary files /dev/null and b/Resources/Textures/Objects/Devices/wristwatch.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Devices/wristwatch.rsi/inhand-right.png b/Resources/Textures/Objects/Devices/wristwatch.rsi/inhand-right.png
new file mode 100644
index 00000000000..f9ab9c67d49
Binary files /dev/null and b/Resources/Textures/Objects/Devices/wristwatch.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Devices/wristwatch.rsi/meta.json b/Resources/Textures/Objects/Devices/wristwatch.rsi/meta.json
new file mode 100644
index 00000000000..fbf18c1a8da
--- /dev/null
+++ b/Resources/Textures/Objects/Devices/wristwatch.rsi/meta.json
@@ -0,0 +1,98 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/223bf37a7386249ecf1fe425ca8cef25821ca9d7/icons/obj/watches/wristwatch.dmi, https://github.com/vgstation-coders/vgstation13/blob/30f9caeb59b0dd9da1dbcd4c69307ae182033a74/icons/obj/clothing/accessory_overlays.dmi, https://github.com/vgstation-coders/vgstation13/blob/223bf37a7386249ecf1fe425ca8cef25821ca9d7/icons/mob/in-hand/right/clothing_accessories.dmi, https://github.com/vgstation-coders/vgstation13/blob/223bf37a7386249ecf1fe425ca8cef25821ca9d7/icons/mob/in-hand/right/clothing_accessories.dmi, https://github.com/vgstation-coders/vgstation13/blob/223bf37a7386249ecf1fe425ca8cef25821ca9d7/icons/mob/in-hand/left/clothing_accessories.dmi, https://github.com/vgstation-coders/vgstation13/blob/30f9caeb59b0dd9da1dbcd4c69307ae182033a74/icons/mob/clothing_accessories.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "wristwatch"
+    },
+    {
+      "name": "hours_1"
+    },
+    {
+      "name": "hours_2"
+    },
+    {
+      "name": "hours_3"
+    },
+    {
+      "name": "hours_4"
+    },
+    {
+      "name": "hours_5"
+    },
+    {
+      "name": "hours_6"
+    },
+    {
+      "name": "hours_7"
+    },
+    {
+      "name": "hours_8"
+    },
+    {
+      "name": "hours_9"
+    },
+    {
+      "name": "hours_10"
+    },
+    {
+      "name": "hours_11"
+    },
+    {
+      "name": "hours_0"
+    },
+    {
+      "name": "minutes_1"
+    },
+    {
+      "name": "minutes_2"
+    },
+    {
+      "name": "minutes_3"
+    },
+    {
+      "name": "minutes_4"
+    },
+    {
+      "name": "minutes_5"
+    },
+    {
+      "name": "minutes_6"
+    },
+    {
+      "name": "minutes_7"
+    },
+    {
+      "name": "minutes_8"
+    },
+    {
+      "name": "minutes_9"
+    },
+    {
+      "name": "minutes_10"
+    },
+    {
+      "name": "minutes_11"
+    },
+    {
+      "name": "minutes_0"
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "equipped-HAND",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_0.png b/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_0.png
new file mode 100644
index 00000000000..5285c6b7091
Binary files /dev/null and b/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_0.png differ
diff --git a/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_1.png b/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_1.png
new file mode 100644
index 00000000000..336bb51039d
Binary files /dev/null and b/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_1.png differ
diff --git a/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_10.png b/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_10.png
new file mode 100644
index 00000000000..9dad0d83cbe
Binary files /dev/null and b/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_10.png differ
diff --git a/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_11.png b/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_11.png
new file mode 100644
index 00000000000..0c789112c32
Binary files /dev/null and b/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_11.png differ
diff --git a/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_2.png b/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_2.png
new file mode 100644
index 00000000000..a4c3bbe7179
Binary files /dev/null and b/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_2.png differ
diff --git a/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_3.png b/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_3.png
new file mode 100644
index 00000000000..6bfdc405c79
Binary files /dev/null and b/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_3.png differ
diff --git a/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_4.png b/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_4.png
new file mode 100644
index 00000000000..89c08f3396f
Binary files /dev/null and b/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_4.png differ
diff --git a/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_5.png b/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_5.png
new file mode 100644
index 00000000000..4cbaa00d14b
Binary files /dev/null and b/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_5.png differ
diff --git a/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_6.png b/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_6.png
new file mode 100644
index 00000000000..e834c52d8cd
Binary files /dev/null and b/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_6.png differ
diff --git a/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_7.png b/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_7.png
new file mode 100644
index 00000000000..8c8927f03ab
Binary files /dev/null and b/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_7.png differ
diff --git a/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_8.png b/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_8.png
new file mode 100644
index 00000000000..e0bba2ecf9a
Binary files /dev/null and b/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_8.png differ
diff --git a/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_9.png b/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_9.png
new file mode 100644
index 00000000000..db0f5a1c71e
Binary files /dev/null and b/Resources/Textures/Objects/Devices/wristwatch.rsi/minutes_9.png differ
diff --git a/Resources/Textures/Objects/Devices/wristwatch.rsi/wristwatch.png b/Resources/Textures/Objects/Devices/wristwatch.rsi/wristwatch.png
new file mode 100644
index 00000000000..aea09a7f89c
Binary files /dev/null and b/Resources/Textures/Objects/Devices/wristwatch.rsi/wristwatch.png differ
diff --git a/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 00000000000..72146d40e5a
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/meta.json
index 831493169f7..3fd240a93b9 100644
--- a/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/meta.json
@@ -14,6 +14,10 @@
             "name": "equipped-BACKPACK",
             "directions": 4
         },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
         {
             "name": "inhand-left",
             "directions": 4
diff --git a/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 00000000000..ba9d4876a2b
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/meta.json
index 0891477f1b5..8723daef066 100644
--- a/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/meta.json
@@ -14,6 +14,10 @@
             "name": "equipped-BACKPACK",
             "directions": 4
         },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
         {
             "name": "inhand-left",
             "directions": 4
diff --git a/Resources/Textures/Objects/Fun/Instruments/guitar.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Fun/Instruments/guitar.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 00000000000..71667f4e21c
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/guitar.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Fun/Instruments/guitar.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/guitar.rsi/meta.json
index 68132823727..bcd517578fc 100644
--- a/Resources/Textures/Objects/Fun/Instruments/guitar.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Instruments/guitar.rsi/meta.json
@@ -29,6 +29,10 @@
     {
       "name": "equipped-BACKPACK",
       "directions": 4
+    },
+    {
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 00000000000..36cb11d801b
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/meta.json
index 7fb73d450dc..96bd8a37e53 100644
--- a/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/meta.json
@@ -14,6 +14,10 @@
             "name": "equipped-BACKPACK",
             "directions": 4
         },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
         {
             "name": "inhand-left",
             "directions": 4
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/lizard-equipped-HELMET.png b/Resources/Textures/Objects/Fun/toys.rsi/lizard-equipped-HELMET.png
new file mode 100644
index 00000000000..a436871b94d
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/lizard-equipped-HELMET.png differ
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
index fc92a479367..4975ba04611 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, NanoTrasen Balloon by MACMAN2003, holoplush and magicplush modified by deltanedas (github)",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser, plushie_penguin by netwy, plushie_arachnid by PixelTheKermit (github), plushie human by TheShuEd, NanoTrasen Balloon by MACMAN2003, holoplush and magicplush modified by deltanedas (github). Lizard hat sprite made by Cinder",
   "size": {
     "x": 32,
     "y": 32
@@ -53,6 +53,14 @@
     {
       "name": "rainbowcarpplush"
     },
+    {
+      "name": "rainbowcarpplush-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "rainbowcarpplush-inhand-right",
+      "directions": 4
+    },
     {
       "name": "narplush"
     },
@@ -83,6 +91,10 @@
     {
       "name": "plushie_lizard_mirrored"
     },
+    {
+      "name": "lizard-equipped-HELMET",
+      "directions": 4
+    },
     {
       "name": "plushie_lamp"
     },
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/rainbowcarpplush-inhand-left.png b/Resources/Textures/Objects/Fun/toys.rsi/rainbowcarpplush-inhand-left.png
new file mode 100644
index 00000000000..8f28f41fd85
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/rainbowcarpplush-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/rainbowcarpplush-inhand-right.png b/Resources/Textures/Objects/Fun/toys.rsi/rainbowcarpplush-inhand-right.png
new file mode 100644
index 00000000000..f12cf346ba2
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/rainbowcarpplush-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/airlock-inhand-left.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/airlock-inhand-left.png
new file mode 100644
index 00000000000..1302edea02d
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/airlock-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/airlock-inhand-right.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/airlock-inhand-right.png
new file mode 100644
index 00000000000..6422df61b9c
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/airlock-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/closet-inhand-left.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/closet-inhand-left.png
new file mode 100644
index 00000000000..0ed13dae809
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/closet-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/closet-inhand-right.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/closet-inhand-right.png
new file mode 100644
index 00000000000..968696b185e
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/closet-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/firelock-1-inhand-left.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/firelock-1-inhand-left.png
new file mode 100644
index 00000000000..455c336b4aa
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/firelock-1-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/firelock-1-inhand-right.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/firelock-1-inhand-right.png
new file mode 100644
index 00000000000..455c336b4aa
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/firelock-1-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/firelock-2-inhand-left.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/firelock-2-inhand-left.png
new file mode 100644
index 00000000000..657b16a3cf1
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/firelock-2-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/firelock-2-inhand-right.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/firelock-2-inhand-right.png
new file mode 100644
index 00000000000..c0edb2ae167
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/firelock-2-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-1.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-1.png
new file mode 100644
index 00000000000..a559bdfa66c
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-1.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-2.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-2.png
new file mode 100644
index 00000000000..939ac203916
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-2.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-3.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-3.png
new file mode 100644
index 00000000000..6a9c1773996
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-3.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-4.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-4.png
new file mode 100644
index 00000000000..0eb7585d966
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-4.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-5.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-5.png
new file mode 100644
index 00000000000..e295c8f1249
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-5.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-6.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-6.png
new file mode 100644
index 00000000000..f106b827b50
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-6.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-inhand-left.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-inhand-left.png
new file mode 100644
index 00000000000..b0e5ce127dc
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-inhand-right.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-inhand-right.png
new file mode 100644
index 00000000000..d5d4b2983ed
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/jetpack-inhand-left.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/jetpack-inhand-left.png
new file mode 100644
index 00000000000..b99a49a4e9d
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/jetpack-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/jetpack-inhand-right.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/jetpack-inhand-right.png
new file mode 100644
index 00000000000..574c095868a
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/jetpack-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-airlock-1.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-airlock-1.png
new file mode 100644
index 00000000000..bc4d9aab118
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-airlock-1.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-airlock-2.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-airlock-2.png
new file mode 100644
index 00000000000..1ef4d7b2417
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-airlock-2.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-airlock-3.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-airlock-3.png
new file mode 100644
index 00000000000..5acd2c44867
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-airlock-3.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-bucket.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-bucket.png
new file mode 100644
index 00000000000..4285633af08
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-bucket.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-camera.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-camera.png
new file mode 100644
index 00000000000..1afaaac4a0d
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-camera.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-canister-1.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-canister-1.png
new file mode 100644
index 00000000000..8bf7d2f6a98
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-canister-1.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-canister-2.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-canister-2.png
new file mode 100644
index 00000000000..abe398db412
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-canister-2.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-closet.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-closet.png
new file mode 100644
index 00000000000..ddbe20f740b
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-closet.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-fax.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-fax.png
new file mode 100644
index 00000000000..973be377b08
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-fax.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-fireextinguisher.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-fireextinguisher.png
new file mode 100644
index 00000000000..9e79c0d7ecd
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-fireextinguisher.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-firelock-1.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-firelock-1.png
new file mode 100644
index 00000000000..1280210529f
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-firelock-1.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-firelock-2.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-firelock-2.png
new file mode 100644
index 00000000000..8864e1288b4
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-firelock-2.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-firelock-3.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-firelock-3.png
new file mode 100644
index 00000000000..7b98e108d12
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-firelock-3.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-intercom-1.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-intercom-1.png
new file mode 100644
index 00000000000..3ce6f3f2b88
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-intercom-1.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-intercom-2.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-intercom-2.png
new file mode 100644
index 00000000000..79a90271a71
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-intercom-2.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-intercom-3.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-intercom-3.png
new file mode 100644
index 00000000000..0f7cbee653c
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-intercom-3.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-jetpack.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-jetpack.png
new file mode 100644
index 00000000000..a1ba37ce1a0
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-jetpack.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-medkit-1.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-medkit-1.png
new file mode 100644
index 00000000000..047723cf4f9
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-medkit-1.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-medkit-2.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-medkit-2.png
new file mode 100644
index 00000000000..b4898354731
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-medkit-2.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-mop-bucket.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-mop-bucket.png
new file mode 100644
index 00000000000..66751cf4a52
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-mop-bucket.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-pai-gold.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-pai-gold.png
new file mode 100644
index 00000000000..7a3bf9f89e0
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-pai-gold.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-pai.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-pai.png
new file mode 100644
index 00000000000..50742a847e6
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-pai.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-target.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-target.png
new file mode 100644
index 00000000000..73ea8350f1d
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-target.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/meta.json b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/meta.json
new file mode 100644
index 00000000000..c4902e5ba77
--- /dev/null
+++ b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/meta.json
@@ -0,0 +1,181 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Flareguy & EmoGarbage404 using assets taken from https://github.com/tgstation/tgstation at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "airlock-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "airlock-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "closet-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "closet-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "firelock-1-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "firelock-1-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "firelock-2-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "firelock-2-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "glass-1"
+    },
+    {
+      "name": "glass-2"
+    },
+    {
+      "name": "glass-3"
+    },
+    {
+      "name": "glass-4"
+    },
+    {
+      "name": "glass-5"
+    },
+    {
+      "name": "glass-6"
+    },
+    {
+      "name": "glass-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "glass-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "jetpack-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "jetpack-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "junk-airlock-1"
+    },
+    {
+      "name": "junk-airlock-2"
+    },
+    {
+      "name": "junk-airlock-3"
+    },
+    {
+      "name": "junk-bucket"
+    },
+    {
+      "name": "junk-camera"
+    },
+    {
+      "name": "junk-canister-1"
+    },
+    {
+      "name": "junk-canister-2"
+    },
+    {
+      "name": "junk-closet"
+    },
+    {
+      "name": "junk-fax"
+    },
+    {
+      "name": "junk-fireextinguisher"
+    },
+    {
+      "name": "junk-firelock-1"
+    },
+    {
+      "name": "junk-firelock-2"
+    },
+    {
+      "name": "junk-firelock-3"
+    },
+    {
+      "name": "junk-intercom-1"
+    },
+    {
+      "name": "junk-intercom-2"
+    },
+    {
+      "name": "junk-intercom-3"
+    },
+    {
+      "name": "junk-jetpack"
+    },
+    {
+      "name": "junk-medkit-1"
+    },
+    {
+      "name": "junk-medkit-2"
+    },
+    {
+      "name": "junk-mop-bucket"
+    },
+    {
+      "name": "junk-pai"
+    },
+    {
+      "name": "junk-pai-gold"
+    },
+    {
+      "name": "junk-target"
+    },
+    {
+      "name": "metal-1"
+    },
+    {
+      "name": "metal-2"
+    },
+    {
+      "name": "metal-3"
+    },
+    {
+      "name": "metal-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "metal-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "tube"
+    },
+    {
+      "name": "tube-bk"
+    },
+    {
+      "name": "tube-bl"
+    },
+    {
+      "name": "tube-g"
+    },
+    {
+      "name": "tube-r"
+    },
+    {
+      "name": "tube-y"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/metal-1.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/metal-1.png
new file mode 100644
index 00000000000..f45090ec5ed
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/metal-1.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/metal-2.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/metal-2.png
new file mode 100644
index 00000000000..521ea068a2c
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/metal-2.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/metal-3.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/metal-3.png
new file mode 100644
index 00000000000..bf1341c3fcd
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/metal-3.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/metal-inhand-left.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/metal-inhand-left.png
new file mode 100644
index 00000000000..6404b89500a
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/metal-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/metal-inhand-right.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/metal-inhand-right.png
new file mode 100644
index 00000000000..6404b89500a
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/metal-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/tube-bk.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/tube-bk.png
new file mode 100644
index 00000000000..0a411708337
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/tube-bk.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/tube-bl.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/tube-bl.png
new file mode 100644
index 00000000000..cdfd4a382c3
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/tube-bl.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/tube-g.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/tube-g.png
new file mode 100644
index 00000000000..92cc4fb4516
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/tube-g.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/tube-r.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/tube-r.png
new file mode 100644
index 00000000000..e444ce686be
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/tube-r.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/tube-y.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/tube-y.png
new file mode 100644
index 00000000000..590c5e8a931
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/tube-y.png differ
diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/tube.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/tube.png
new file mode 100644
index 00000000000..95046d040a5
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/tube.png differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/diamond-inhand-left.png b/Resources/Textures/Objects/Materials/materials.rsi/diamond-inhand-left.png
index c9b55e9daa5..9eae45d039a 100644
Binary files a/Resources/Textures/Objects/Materials/materials.rsi/diamond-inhand-left.png and b/Resources/Textures/Objects/Materials/materials.rsi/diamond-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/diamond-inhand-right.png b/Resources/Textures/Objects/Materials/materials.rsi/diamond-inhand-right.png
index 295c2c4eca1..3353eb6f7ca 100644
Binary files a/Resources/Textures/Objects/Materials/materials.rsi/diamond-inhand-right.png and b/Resources/Textures/Objects/Materials/materials.rsi/diamond-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/diamond.png b/Resources/Textures/Objects/Materials/materials.rsi/diamond.png
index 5eb8aabf879..8b39437d0ac 100644
Binary files a/Resources/Textures/Objects/Materials/materials.rsi/diamond.png and b/Resources/Textures/Objects/Materials/materials.rsi/diamond.png differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/diamond_2.png b/Resources/Textures/Objects/Materials/materials.rsi/diamond_2.png
new file mode 100644
index 00000000000..410d83f1c29
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/diamond_2.png differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/diamond_3.png b/Resources/Textures/Objects/Materials/materials.rsi/diamond_3.png
new file mode 100644
index 00000000000..152da2befe8
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/diamond_3.png differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/meta.json b/Resources/Textures/Objects/Materials/materials.rsi/meta.json
index 78f497c0cda..3ae12dc14c0 100644
--- a/Resources/Textures/Objects/Materials/materials.rsi/meta.json
+++ b/Resources/Textures/Objects/Materials/materials.rsi/meta.json
@@ -78,6 +78,12 @@
     {
       "name": "diamond"
     },
+    {
+      "name": "diamond_2"
+    },
+    {
+      "name": "diamond_3"
+    },
     {
       "name": "diamond-inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/diamond.png b/Resources/Textures/Objects/Materials/ore.rsi/diamond.png
new file mode 100644
index 00000000000..b2a3c788d34
Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/diamond.png differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/meta.json b/Resources/Textures/Objects/Materials/ore.rsi/meta.json
index 98a10750bf7..8f1b4533f2a 100644
--- a/Resources/Textures/Objects/Materials/ore.rsi/meta.json
+++ b/Resources/Textures/Objects/Materials/ore.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-NC-SA-3.0",
-  "copyright": "silver, plasma taken from https://github.com/vgstation-coders/vgstation13 at commit f2ef221849675915a78fd92fe622c32ab740e085, spacequartz taken from https://github.com/goonstation/goonstation at commit b51daf824df46a3a1426475f982c09479818e522 and reshaded by Alekshhh, bananium; uranium; iron; gold; coal by Alekshhh",
+  "copyright": "silver, plasma taken from https://github.com/vgstation-coders/vgstation13 at commit f2ef221849675915a78fd92fe622c32ab740e085, spacequartz taken from https://github.com/goonstation/goonstation at commit b51daf824df46a3a1426475f982c09479818e522 and reshaded by Alekshhh, bananium; uranium; iron; gold; coal by Alekshhh, diamond at commit https://github.com/tgstation/tgstation/pull/78524, edited by TheShuEd",
   "size": {
     "x": 32,
     "y": 32
@@ -33,6 +33,9 @@
     },
     {
       "name": "salt"
+    },
+    {
+      "name": "diamond"
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Misc/arabianlamp.rsi/flame.png b/Resources/Textures/Objects/Misc/arabianlamp.rsi/flame.png
new file mode 100644
index 00000000000..decabebccb6
Binary files /dev/null and b/Resources/Textures/Objects/Misc/arabianlamp.rsi/flame.png differ
diff --git a/Resources/Textures/Objects/Misc/arabianlamp.rsi/inhand-left-flame.png b/Resources/Textures/Objects/Misc/arabianlamp.rsi/inhand-left-flame.png
new file mode 100644
index 00000000000..e512dcf2975
Binary files /dev/null and b/Resources/Textures/Objects/Misc/arabianlamp.rsi/inhand-left-flame.png differ
diff --git a/Resources/Textures/Objects/Misc/arabianlamp.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/arabianlamp.rsi/inhand-left.png
new file mode 100644
index 00000000000..680158cc918
Binary files /dev/null and b/Resources/Textures/Objects/Misc/arabianlamp.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Misc/arabianlamp.rsi/inhand-right-flame.png b/Resources/Textures/Objects/Misc/arabianlamp.rsi/inhand-right-flame.png
new file mode 100644
index 00000000000..a1fc9ee7b69
Binary files /dev/null and b/Resources/Textures/Objects/Misc/arabianlamp.rsi/inhand-right-flame.png differ
diff --git a/Resources/Textures/Objects/Misc/arabianlamp.rsi/inhand-right.png b/Resources/Textures/Objects/Misc/arabianlamp.rsi/inhand-right.png
new file mode 100644
index 00000000000..0f6b7bf2c9e
Binary files /dev/null and b/Resources/Textures/Objects/Misc/arabianlamp.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Misc/arabianlamp.rsi/lamp.png b/Resources/Textures/Objects/Misc/arabianlamp.rsi/lamp.png
new file mode 100644
index 00000000000..616a46f4e53
Binary files /dev/null and b/Resources/Textures/Objects/Misc/arabianlamp.rsi/lamp.png differ
diff --git a/Resources/Textures/Objects/Misc/arabianlamp.rsi/lamptop.png b/Resources/Textures/Objects/Misc/arabianlamp.rsi/lamptop.png
new file mode 100644
index 00000000000..e3fe0fc3cb0
Binary files /dev/null and b/Resources/Textures/Objects/Misc/arabianlamp.rsi/lamptop.png differ
diff --git a/Resources/Textures/Objects/Misc/arabianlamp.rsi/meta.json b/Resources/Textures/Objects/Misc/arabianlamp.rsi/meta.json
new file mode 100644
index 00000000000..32199184601
--- /dev/null
+++ b/Resources/Textures/Objects/Misc/arabianlamp.rsi/meta.json
@@ -0,0 +1,117 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "made by IProduceWidgets, flame sprite by TheShuEd",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "lamp",
+	  "directions": 4
+    },
+	{
+	  "name": "lamptop",
+	  "directions": 4
+	},
+    {
+      "name": "flame",
+	  "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+		  0.1,
+		  0.1
+        ],
+		[
+          0.1,
+          0.1,
+		  0.1,
+		  0.1
+        ],
+		[
+          0.1,
+          0.1,
+		  0.1,
+		  0.1
+        ],
+		[
+          0.1,
+          0.1,
+		  0.1,
+		  0.1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left-flame",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+		  0.1,
+		  0.1
+        ],
+        [
+          0.1,
+          0.1,
+		  0.1,
+		  0.1
+        ],
+        [
+          0.1,
+          0.1,
+		  0.1,
+		  0.1
+        ],
+        [
+          0.1,
+          0.1,
+		  0.1,
+		  0.1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-right-flame",
+      "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
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/inhand-left.png
new file mode 100644
index 00000000000..c6e2bcb80f9
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/inhand-right.png
new file mode 100644
index 00000000000..0b278eed621
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json
index 54a2e31b016..28207bc250c 100644
--- a/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93",
+  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93, sprites in hands by @mishutka09",
   "size": {
     "x": 32,
     "y": 32
@@ -15,6 +15,14 @@
           0.1
         ]
       ]
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/dead.png
new file mode 100644
index 00000000000..fb10912e697
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/dead.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/harvest.png
new file mode 100644
index 00000000000..924aedcea7a
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/harvest.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/meta.json
new file mode 100644
index 00000000000..1359fd7f8cb
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/meta.json
@@ -0,0 +1,40 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dead"
+    },
+    {
+      "name": "harvest"
+    },
+    {
+      "name": "produce"
+    },
+    {
+      "name": "seed"
+    },
+    {
+      "name": "stage-1"
+    },
+    {
+      "name": "stage-2"
+    },
+    {
+      "name": "stage-3"
+    },
+	{
+      "name": "produce-inhand-left",
+	  "directions": 4
+    },
+	{
+      "name": "produce-inhand-right",
+	  "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce-inhand-left.png
new file mode 100644
index 00000000000..0527f86b937
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce-inhand-right.png
new file mode 100644
index 00000000000..cd3cc3216e9
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce.png
new file mode 100644
index 00000000000..11c43d8d13e
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/seed.png
new file mode 100644
index 00000000000..f3e99168ddc
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/seed.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-1.png
new file mode 100644
index 00000000000..d4204913b5e
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-1.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-2.png
new file mode 100644
index 00000000000..804aa020127
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-2.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-3.png
new file mode 100644
index 00000000000..1e6923c9e2d
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-3.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/dead.png
new file mode 100644
index 00000000000..817c0f4bff1
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/dead.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/harvest.png
new file mode 100644
index 00000000000..5a49c3f5c53
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/harvest.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json
new file mode 100644
index 00000000000..775f8df408f
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json
@@ -0,0 +1,41 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dead"
+    },
+    {
+      "name": "harvest"
+    },
+    {
+      "name": "produce"
+    },
+    {
+      "name": "seed"
+    },
+    {
+      "name": "stage-1"
+    },
+    {
+      "name": "stage-2"
+    },
+    {
+      "name": "stage-3"
+    },
+    {
+      "name": "stage-4"
+    },
+    {
+      "name": "stage-5"
+    },
+    {
+      "name": "stage-6"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce.png
new file mode 100644
index 00000000000..4c369829601
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/seed.png
new file mode 100644
index 00000000000..9fc96ba7c29
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/seed.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-1.png
new file mode 100644
index 00000000000..e65be188b1e
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-1.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-2.png
new file mode 100644
index 00000000000..165e17b57c9
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-2.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-3.png
new file mode 100644
index 00000000000..9b193a59e3b
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-3.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-4.png
new file mode 100644
index 00000000000..e66ff1ddc94
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-4.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-5.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-5.png
new file mode 100644
index 00000000000..fc1807e0899
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-5.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-6.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-6.png
new file mode 100644
index 00000000000..e2790c179ab
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-6.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/dead.png
new file mode 100644
index 00000000000..6c7185bb1e4
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/dead.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/harvest.png
new file mode 100644
index 00000000000..d1f2111b252
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/harvest.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/meta.json
new file mode 100644
index 00000000000..3f97a14afa6
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/meta.json
@@ -0,0 +1,32 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dead"
+    },
+    {
+      "name": "harvest"
+    },
+    {
+      "name": "produce"
+    },
+    {
+      "name": "seed"
+    },
+    {
+      "name": "stage-1"
+    },
+    {
+      "name": "stage-2"
+    },
+    {
+      "name": "stage-3"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/produce.png
new file mode 100644
index 00000000000..fe787f35f52
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/produce.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/seed.png
new file mode 100644
index 00000000000..3ba27fa5b7d
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/seed.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-1.png
new file mode 100644
index 00000000000..5b26285f7c0
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-1.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-2.png
new file mode 100644
index 00000000000..df5aff42b0c
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-2.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-3.png
new file mode 100644
index 00000000000..1c926be364b
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-3.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/defib.rsi/icon.png b/Resources/Textures/Objects/Specific/Medical/defib.rsi/icon.png
index 7ad5415f588..0b9d3770eda 100644
Binary files a/Resources/Textures/Objects/Specific/Medical/defib.rsi/icon.png and b/Resources/Textures/Objects/Specific/Medical/defib.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/defib.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Medical/defib.rsi/inhand-left.png
index 37282f2b6d4..f5256654991 100644
Binary files a/Resources/Textures/Objects/Specific/Medical/defib.rsi/inhand-left.png and b/Resources/Textures/Objects/Specific/Medical/defib.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/defib.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Medical/defib.rsi/inhand-right.png
index 37282f2b6d4..f5256654991 100644
Binary files a/Resources/Textures/Objects/Specific/Medical/defib.rsi/inhand-right.png and b/Resources/Textures/Objects/Specific/Medical/defib.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/defib.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/defib.rsi/meta.json
index 10645c13be9..441fd4f5feb 100644
--- a/Resources/Textures/Objects/Specific/Medical/defib.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Medical/defib.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC0-1.0",
-  "copyright": "Created by EmoGarbage404 (github) for Space Staiton 14",
+  "copyright": "Created by EmoGarbage404 (github) for Space Staiton 14 and modified by alzore_(Discord)",
   "size": {
     "x": 32,
     "y": 32
@@ -25,4 +25,4 @@
       "name": "screen"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/envelope.png b/Resources/Textures/Objects/Storage/boxes.rsi/envelope.png
new file mode 100644
index 00000000000..93d52099fc2
Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/envelope.png differ
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
index 53ac39b639b..cda6e30a05e 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, throwing_knives and vials was drawn by Ubaser, evidence_markers by moomoobeef.",
+  "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, throwing_knives and vials was drawn by Ubaser, evidence_markers by moomoobeef, nitrogentank modified from extendedtank by Errant",
   "size": {
     "x": 32,
     "y": 32
@@ -25,6 +25,9 @@
         {
             "name": "emergencytank"
         },
+        {
+            "name": "nitrogentank"
+        },
         {
             "name": "heart"
         },
@@ -211,6 +214,9 @@
         },
         {
             "name": "vials"
+        },
+        {
+            "name": "envelope"
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/nitrogentank.png b/Resources/Textures/Objects/Storage/boxes.rsi/nitrogentank.png
new file mode 100644
index 00000000000..e179be543c2
Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/nitrogentank.png differ
diff --git a/Resources/Textures/Objects/Tanks/generic.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Tanks/generic.rsi/equipped-BACKPACK.png
index 332f1d08f37..e3837b63666 100644
Binary files a/Resources/Textures/Objects/Tanks/generic.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Tanks/generic.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE.png
index 332f1d08f37..e3837b63666 100644
Binary files a/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE.png and b/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Tanks/generic.rsi/meta.json b/Resources/Textures/Objects/Tanks/generic.rsi/meta.json
index 98b81aaf259..c6521799201 100644
--- a/Resources/Textures/Objects/Tanks/generic.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/generic.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. equipped-SUITSTORAGE-secdog modified from equipped-SUITSTORAGE-dog by TJohnson.",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. Suit and back storages drawn by Ubaser. equipped-SUITSTORAGE-secdog modified from equipped-SUITSTORAGE-dog by TJohnson.",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-BACKPACK.png
index d890d08c1af..72bc19c5b84 100644
Binary files a/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE.png
index d890d08c1af..72bc19c5b84 100644
Binary files a/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE.png and b/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Tanks/oxygen.rsi/meta.json b/Resources/Textures/Objects/Tanks/oxygen.rsi/meta.json
index 1450c5a2d23..b9e0c759569 100644
--- a/Resources/Textures/Objects/Tanks/oxygen.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/oxygen.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. equipped-SUITSTORAGE-secdog taken from generic.rsi.",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. Suit and back storages drawn by Ubaser. equipped-SUITSTORAGE-secdog taken from generic.rsi.",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tanks/red.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Tanks/red.rsi/equipped-BACKPACK.png
index 6c36a11d4de..b8c3c183e2a 100644
Binary files a/Resources/Textures/Objects/Tanks/red.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Tanks/red.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE.png
index 6c36a11d4de..b8c3c183e2a 100644
Binary files a/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE.png and b/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Tanks/red.rsi/meta.json b/Resources/Textures/Objects/Tanks/red.rsi/meta.json
index 1450c5a2d23..b9e0c759569 100644
--- a/Resources/Textures/Objects/Tanks/red.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/red.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. equipped-SUITSTORAGE-secdog taken from generic.rsi.",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. Suit and back storages drawn by Ubaser. equipped-SUITSTORAGE-secdog taken from generic.rsi.",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/concrete-mono.png b/Resources/Textures/Objects/Tiles/tile.rsi/concrete-mono.png
new file mode 100644
index 00000000000..c8300ff3e4a
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/concrete-mono.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/concrete-smooth.png b/Resources/Textures/Objects/Tiles/tile.rsi/concrete-smooth.png
new file mode 100644
index 00000000000..a108ce8b4d5
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/concrete-smooth.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-diagonal-mini.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-diagonal-mini.png
new file mode 100644
index 00000000000..a325052228c
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-diagonal-mini.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-diagonal.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-diagonal.png
new file mode 100644
index 00000000000..c6b889a14a1
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-diagonal.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-herringbone.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-herringbone.png
new file mode 100644
index 00000000000..2ebda842b97
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-herringbone.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-mini.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-mini.png
new file mode 100644
index 00000000000..1605945c16d
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-mini.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-mono.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-mono.png
new file mode 100644
index 00000000000..8e02358eb6e
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-mono.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-offset.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-offset.png
new file mode 100644
index 00000000000..e21176bf452
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-offset.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-pavement-vertical.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-pavement-vertical.png
new file mode 100644
index 00000000000..66bfacb04b3
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-pavement-vertical.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-pavement.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-pavement.png
new file mode 100644
index 00000000000..b5311d5e364
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-pavement.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark.png
index cd05817621c..220a0cfdb65 100644
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/dark.png and b/Resources/Textures/Objects/Tiles/tile.rsi/dark.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/grayconcrete-mono.png b/Resources/Textures/Objects/Tiles/tile.rsi/grayconcrete-mono.png
new file mode 100644
index 00000000000..72445cc47e2
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/grayconcrete-mono.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/grayconcrete-smooth.png b/Resources/Textures/Objects/Tiles/tile.rsi/grayconcrete-smooth.png
new file mode 100644
index 00000000000..cc86c6edeaf
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/grayconcrete-smooth.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
index 11992954f89..7db50200ed6 100644
--- a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
+++ b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
@@ -10,6 +10,30 @@
     {
       "name": "dark"
     },
+    {
+      "name": "dark-diagonal-mini"
+    },
+    {
+      "name": "dark-diagonal"
+    },
+    {
+      "name": "dark-herringbone"
+    },
+    {
+      "name": "dark-mini"
+    },
+    {
+      "name": "dark-mono"
+    },
+    {
+      "name": "dark-pavement"
+    },
+    {
+      "name": "dark-pavement-vertical"
+    },
+    {
+      "name": "dark-offset"
+    },
     {
       "name": "dirty"
     },
@@ -22,12 +46,30 @@
     {
       "name": "concrete"
     },
+    {
+      "name": "concrete-mono"
+    },
+    {
+      "name": "concrete-smooth"
+    },
     {
       "name": "grayconcrete"
     },
+    {
+      "name": "grayconcrete-mono"
+    },
+    {
+      "name": "grayconcrete-smooth"
+    },
     {
       "name": "oldconcrete"
     },
+    {
+      "name": "oldconcrete-mono"
+    },
+    {
+      "name": "oldconcrete-smooth"
+    },
     {
       "name": "gcircuit"
     },
@@ -37,15 +79,15 @@
     {
       "name": "blue"
     },
-	{
-	  "name": "brass"
-	},
-	{
-	  "name": "brass-filled"
-	},
-	{
-	  "name": "reebe"
-	},
+	  {
+	    "name": "brass"
+	  },
+	  {
+	    "name": "brass-filled"
+	  },
+	  {
+	    "name": "reebe"
+	  },
     {
       "name": "lime"
     },
@@ -168,6 +210,30 @@
     {
       "name": "steel"
     },
+    {
+      "name": "steel-offset"
+    },
+    {
+      "name": "steel-diagonal-mini"
+    },
+    {
+      "name": "steel-diagonal"
+    },
+    {
+      "name": "steel-herringbone"
+    },
+    {
+      "name": "steel-mini"
+    },
+    {
+      "name": "steel-mono"
+    },
+    {
+      "name": "steel-pavement"
+    },
+    {
+      "name": "steel-pavement-vertical"
+    },
     {
       "name": "silver"
     },
@@ -177,6 +243,30 @@
     {
       "name": "white"
     },
+    {
+      "name": "white-offset"
+    },
+    {
+      "name": "white-diagonal-mini"
+    },
+    {
+      "name": "white-diagonal"
+    },
+    {
+      "name": "white-herringbone"
+    },
+    {
+      "name": "white-mini"
+    },
+    {
+      "name": "white-mono"
+    },
+    {
+      "name": "white-pavement"
+    },
+    {
+      "name": "white-pavement-vertical"
+    },
     {
       "name": "monofloor"
     },
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/oldconcrete-mono.png b/Resources/Textures/Objects/Tiles/tile.rsi/oldconcrete-mono.png
new file mode 100644
index 00000000000..c42fa801d97
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/oldconcrete-mono.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/oldconcrete-smooth.png b/Resources/Textures/Objects/Tiles/tile.rsi/oldconcrete-smooth.png
new file mode 100644
index 00000000000..ef0e7012c9c
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/oldconcrete-smooth.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steel-diagonal-mini.png b/Resources/Textures/Objects/Tiles/tile.rsi/steel-diagonal-mini.png
new file mode 100644
index 00000000000..cbe178a00f1
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/steel-diagonal-mini.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steel-diagonal.png b/Resources/Textures/Objects/Tiles/tile.rsi/steel-diagonal.png
new file mode 100644
index 00000000000..752d17fa530
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/steel-diagonal.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steel-herringbone.png b/Resources/Textures/Objects/Tiles/tile.rsi/steel-herringbone.png
new file mode 100644
index 00000000000..0dd75de3544
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/steel-herringbone.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steel-mini.png b/Resources/Textures/Objects/Tiles/tile.rsi/steel-mini.png
new file mode 100644
index 00000000000..277b658d320
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/steel-mini.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steel-mono.png b/Resources/Textures/Objects/Tiles/tile.rsi/steel-mono.png
new file mode 100644
index 00000000000..ff71f6e0514
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/steel-mono.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steel-offset.png b/Resources/Textures/Objects/Tiles/tile.rsi/steel-offset.png
new file mode 100644
index 00000000000..679861267ee
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/steel-offset.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steel-pavement-vertical.png b/Resources/Textures/Objects/Tiles/tile.rsi/steel-pavement-vertical.png
new file mode 100644
index 00000000000..a5c058085c1
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/steel-pavement-vertical.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steel-pavement.png b/Resources/Textures/Objects/Tiles/tile.rsi/steel-pavement.png
new file mode 100644
index 00000000000..e9559c10571
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/steel-pavement.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steel.png b/Resources/Textures/Objects/Tiles/tile.rsi/steel.png
index 5ea3049f875..b39ca9aeb51 100644
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/steel.png and b/Resources/Textures/Objects/Tiles/tile.rsi/steel.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-diagonal-mini.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-diagonal-mini.png
new file mode 100644
index 00000000000..109f89c1abc
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/white-diagonal-mini.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-diagonal.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-diagonal.png
new file mode 100644
index 00000000000..9bbe51b2841
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/white-diagonal.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-herringbone.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-herringbone.png
new file mode 100644
index 00000000000..316d36da026
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/white-herringbone.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-mini.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-mini.png
new file mode 100644
index 00000000000..e413501ba3c
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/white-mini.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-mono.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-mono.png
new file mode 100644
index 00000000000..53361667dd6
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/white-mono.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-offset.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-offset.png
new file mode 100644
index 00000000000..b58aa94d6ab
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/white-offset.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-pavement-vertical.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-pavement-vertical.png
new file mode 100644
index 00000000000..42eec613812
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/white-pavement-vertical.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-pavement.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-pavement.png
new file mode 100644
index 00000000000..9800874d740
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/white-pavement.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white.png b/Resources/Textures/Objects/Tiles/tile.rsi/white.png
index 28459f0cb78..20d44bde5a1 100644
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/white.png and b/Resources/Textures/Objects/Tiles/tile.rsi/white.png differ
diff --git a/Resources/Textures/Objects/Tools/thief_beacon.rsi/extraction_point.png b/Resources/Textures/Objects/Tools/thief_beacon.rsi/extraction_point.png
new file mode 100644
index 00000000000..b986a6ae28a
Binary files /dev/null and b/Resources/Textures/Objects/Tools/thief_beacon.rsi/extraction_point.png differ
diff --git a/Resources/Textures/Objects/Tools/thief_beacon.rsi/extraction_point_light.png b/Resources/Textures/Objects/Tools/thief_beacon.rsi/extraction_point_light.png
new file mode 100644
index 00000000000..f2e9f984d23
Binary files /dev/null and b/Resources/Textures/Objects/Tools/thief_beacon.rsi/extraction_point_light.png differ
diff --git a/Resources/Textures/Objects/Tools/thief_beacon.rsi/folded_extraction.png b/Resources/Textures/Objects/Tools/thief_beacon.rsi/folded_extraction.png
new file mode 100644
index 00000000000..43ead68bb25
Binary files /dev/null and b/Resources/Textures/Objects/Tools/thief_beacon.rsi/folded_extraction.png differ
diff --git a/Resources/Textures/Objects/Tools/thief_beacon.rsi/meta.json b/Resources/Textures/Objects/Tools/thief_beacon.rsi/meta.json
new file mode 100644
index 00000000000..ba7e003575e
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/thief_beacon.rsi/meta.json
@@ -0,0 +1,32 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/austation/austation/commit/e2a4fefd01e702f48d3d4cc8d6a2686d54d104fa and edited by TheShuEd",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "folded_extraction"
+    },
+    {
+      "name": "extraction_point",
+      "delays": [
+        [
+          0.5,
+          0.5
+        ]
+      ]
+    },
+    {
+      "name": "extraction_point_light",
+      "delays": [
+        [
+          0.5,
+          0.5
+        ]
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/equipped-BELT.png
new file mode 100644
index 00000000000..d3cf1cf4c93
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/icon.png b/Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/icon.png
new file mode 100644
index 00000000000..a13dedfc205
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/meta.json
new file mode 100644
index 00000000000..139eebb04da
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by EmoGarbage404",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "primed",
+      "delays": [
+        [
+          0.2,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/primed.png
new file mode 100644
index 00000000000..dafc378c3bc
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/primed.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/meta.json
index 7609e516b3a..b0f1b27c24c 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by Pato Grone for SS14",
+  "copyright": "Made by Pato Grone for SS14, Wielded states by Jonathan Argo",
   "size": {
     "x": 32,
     "y": 32
@@ -15,6 +15,14 @@
       "name": "inhand-left",
       "directions": 4
     },
+    {
+      "name": "wielded-inhand-left",
+      "directions": 4
+    },
+    {
+        "name": "wielded-inhand-right",
+        "directions": 4
+    },
     {
       "name": "base"
     }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..bf76836959c
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..a8a6bbe8b4d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-back-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-back-fill-1.png
new file mode 100644
index 00000000000..db23cdc2a4f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-back-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-suitstorage-fill-1.png
new file mode 100644
index 00000000000..db23cdc2a4f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-suitstorage-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-left-fill-1.png
new file mode 100644
index 00000000000..87a1358a8ce
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-right-fill-1.png
new file mode 100644
index 00000000000..4d0d61d0c17
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json
index 421037eac37..33274c57fe5 100644
--- a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json
@@ -8,34 +8,58 @@
   },
   "states": [
     {
-      "name": "spear"
+        "name": "spear"
     },
     {
-      "name": "spear1"
+        "name": "spear1"
     },
     {
-      "name": "inhand-left",
-      "directions": 4
+        "name": "inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "inhand-left-fill-1",
+        "directions": 4
     },
     {
-      "name": "inhand-right",
-      "directions": 4
+        "name": "inhand-right",
+        "directions": 4
+    },
+    {
+        "name": "inhand-right-fill-1",
+        "directions": 4
     },
     {
         "name": "wielded-inhand-left",
         "directions": 4
     },
+    {
+        "name": "wielded-inhand-left-fill-1",
+        "directions": 4
+    },
     {
         "name": "wielded-inhand-right",
         "directions": 4
     },
     {
-      "name": "equipped-BACKPACK",
-      "directions": 4
+        "name": "wielded-inhand-right-fill-1",
+        "directions": 4
+    },
+    {
+        "name": "equipped-BACKPACK",
+        "directions": 4
+    },
+    {
+        "name": "equipped-back-fill-1",
+        "directions": 4
     },
     {
         "name": "equipped-SUITSTORAGE",
         "directions": 4
+    },
+    {
+        "name": "equipped-suitstorage-fill-1",
+        "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-left-fill-1.png
new file mode 100644
index 00000000000..e50787d3f94
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-right-fill-1.png
new file mode 100644
index 00000000000..0a78a494a7c
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/e_sword.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/e_sword.png
new file mode 100644
index 00000000000..109a3230b98
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/e_sword.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/e_sword_blade.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/e_sword_blade.png
new file mode 100644
index 00000000000..8b8c9f45a74
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/e_sword_blade.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/icon.png
new file mode 100644
index 00000000000..4111eebaab4
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-left-blade.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-left-blade.png
new file mode 100644
index 00000000000..03d50f98ef4
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-left-blade.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-left.png
new file mode 100644
index 00000000000..639da1c1843
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-right-blade.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-right-blade.png
new file mode 100644
index 00000000000..ae7c25221e3
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-right-blade.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-right.png
new file mode 100644
index 00000000000..00d8e890aaa
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/meta.json
new file mode 100644
index 00000000000..3b12fda33ee
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/meta.json
@@ -0,0 +1,78 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation and modified by alzore_(Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "e_sword"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "e_sword_blade",
+      "delays": [
+        [
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-left-blade",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-right-blade",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/icon.png
index 58e2f149426..ef62ecf5f49 100644
Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-back-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-back-fill-1.png
new file mode 100644
index 00000000000..db23cdc2a4f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-back-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-suitstorage-fill-1.png
new file mode 100644
index 00000000000..db23cdc2a4f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-suitstorage-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-left-fill-1.png
new file mode 100644
index 00000000000..87a1358a8ce
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-right-fill-1.png
new file mode 100644
index 00000000000..4d0d61d0c17
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/meta.json
index 5a18552d2e0..538317a61de 100644
--- a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/meta.json
@@ -8,34 +8,58 @@
   },
   "states": [
     {
-      "name": "spear"
+        "name": "spear"
     },
     {
-      "name": "spear1"
+        "name": "spear1"
     },
     {
-      "name": "inhand-left",
-      "directions": 4
+        "name": "inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "inhand-left-fill-1",
+        "directions": 4
     },
     {
-      "name": "inhand-right",
-      "directions": 4
+        "name": "inhand-right",
+        "directions": 4
+    },
+    {
+        "name": "inhand-right-fill-1",
+        "directions": 4
     },
     {
         "name": "wielded-inhand-left",
         "directions": 4
     },
+    {
+        "name": "wielded-inhand-left-fill-1",
+        "directions": 4
+    },
     {
         "name": "wielded-inhand-right",
         "directions": 4
     },
     {
-      "name": "equipped-BACKPACK",
-      "directions": 4
+        "name": "wielded-inhand-right-fill-1",
+        "directions": 4
+    },
+    {
+        "name": "equipped-BACKPACK",
+        "directions": 4
+    },
+    {
+        "name": "equipped-back-fill-1",
+        "directions": 4
     },
     {
         "name": "equipped-SUITSTORAGE",
         "directions": 4
+    },
+    {
+        "name": "equipped-suitstorage-fill-1",
+        "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-left-fill-1.png
new file mode 100644
index 00000000000..e50787d3f94
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-right-fill-1.png
new file mode 100644
index 00000000000..0a78a494a7c
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-back-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-back-fill-1.png
new file mode 100644
index 00000000000..db23cdc2a4f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-back-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-suitstorage-fill-1.png
new file mode 100644
index 00000000000..db23cdc2a4f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-suitstorage-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-left-fill-1.png
new file mode 100644
index 00000000000..87a1358a8ce
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-right-fill-1.png
new file mode 100644
index 00000000000..4d0d61d0c17
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/meta.json
index 5a18552d2e0..6ef6a5fa440 100644
--- a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/meta.json
@@ -8,34 +8,58 @@
   },
   "states": [
     {
-      "name": "spear"
+        "name": "spear"
     },
     {
-      "name": "spear1"
+         "name": "spear1"
     },
     {
-      "name": "inhand-left",
-      "directions": 4
+        "name": "inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "inhand-left-fill-1",
+        "directions": 4
     },
     {
-      "name": "inhand-right",
-      "directions": 4
+        "name": "inhand-right",
+        "directions": 4
+    },
+    {
+        "name": "inhand-right-fill-1",
+        "directions": 4
     },
     {
         "name": "wielded-inhand-left",
         "directions": 4
     },
+    {
+        "name": "wielded-inhand-left-fill-1",
+        "directions": 4
+    },
     {
         "name": "wielded-inhand-right",
         "directions": 4
     },
     {
-      "name": "equipped-BACKPACK",
-      "directions": 4
+        "name": "wielded-inhand-right-fill-1",
+        "directions": 4
+    },
+    {
+        "name": "equipped-BACKPACK",
+        "directions": 4
+    },
+    {
+        "name": "equipped-back-fill-1",
+        "directions": 4
     },
     {
         "name": "equipped-SUITSTORAGE",
         "directions": 4
+    },
+    {
+        "name": "equipped-suitstorage-fill-1",
+        "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-left-fill-1.png
new file mode 100644
index 00000000000..e50787d3f94
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-right-fill-1.png
new file mode 100644
index 00000000000..0a78a494a7c
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-back-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-back-fill-1.png
new file mode 100644
index 00000000000..db23cdc2a4f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-back-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-suitstorage-fill-1.png
new file mode 100644
index 00000000000..db23cdc2a4f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-suitstorage-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-left-fill-1.png
new file mode 100644
index 00000000000..87a1358a8ce
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-right-fill-1.png
new file mode 100644
index 00000000000..4d0d61d0c17
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json
index 421037eac37..33274c57fe5 100644
--- a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json
@@ -8,34 +8,58 @@
   },
   "states": [
     {
-      "name": "spear"
+        "name": "spear"
     },
     {
-      "name": "spear1"
+        "name": "spear1"
     },
     {
-      "name": "inhand-left",
-      "directions": 4
+        "name": "inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "inhand-left-fill-1",
+        "directions": 4
     },
     {
-      "name": "inhand-right",
-      "directions": 4
+        "name": "inhand-right",
+        "directions": 4
+    },
+    {
+        "name": "inhand-right-fill-1",
+        "directions": 4
     },
     {
         "name": "wielded-inhand-left",
         "directions": 4
     },
+    {
+        "name": "wielded-inhand-left-fill-1",
+        "directions": 4
+    },
     {
         "name": "wielded-inhand-right",
         "directions": 4
     },
     {
-      "name": "equipped-BACKPACK",
-      "directions": 4
+        "name": "wielded-inhand-right-fill-1",
+        "directions": 4
+    },
+    {
+        "name": "equipped-BACKPACK",
+        "directions": 4
+    },
+    {
+        "name": "equipped-back-fill-1",
+        "directions": 4
     },
     {
         "name": "equipped-SUITSTORAGE",
         "directions": 4
+    },
+    {
+        "name": "equipped-suitstorage-fill-1",
+        "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-left-fill-1.png
new file mode 100644
index 00000000000..e50787d3f94
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-right-fill-1.png
new file mode 100644
index 00000000000..0a78a494a7c
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-back-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-back-fill-1.png
new file mode 100644
index 00000000000..db23cdc2a4f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-back-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-suitstorage-fill-1.png
new file mode 100644
index 00000000000..db23cdc2a4f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-suitstorage-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-left-fill-1.png
new file mode 100644
index 00000000000..87a1358a8ce
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-right-fill-1.png
new file mode 100644
index 00000000000..4d0d61d0c17
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/meta.json
index 5a18552d2e0..538317a61de 100644
--- a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/meta.json
@@ -8,34 +8,58 @@
   },
   "states": [
     {
-      "name": "spear"
+        "name": "spear"
     },
     {
-      "name": "spear1"
+        "name": "spear1"
     },
     {
-      "name": "inhand-left",
-      "directions": 4
+        "name": "inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "inhand-left-fill-1",
+        "directions": 4
     },
     {
-      "name": "inhand-right",
-      "directions": 4
+        "name": "inhand-right",
+        "directions": 4
+    },
+    {
+        "name": "inhand-right-fill-1",
+        "directions": 4
     },
     {
         "name": "wielded-inhand-left",
         "directions": 4
     },
+    {
+        "name": "wielded-inhand-left-fill-1",
+        "directions": 4
+    },
     {
         "name": "wielded-inhand-right",
         "directions": 4
     },
     {
-      "name": "equipped-BACKPACK",
-      "directions": 4
+        "name": "wielded-inhand-right-fill-1",
+        "directions": 4
+    },
+    {
+        "name": "equipped-BACKPACK",
+        "directions": 4
+    },
+    {
+        "name": "equipped-back-fill-1",
+        "directions": 4
     },
     {
         "name": "equipped-SUITSTORAGE",
         "directions": 4
+    },
+    {
+        "name": "equipped-suitstorage-fill-1",
+        "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-left-fill-1.png
new file mode 100644
index 00000000000..e50787d3f94
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-right-fill-1.png
new file mode 100644
index 00000000000..0a78a494a7c
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Shaders/radial_blur.swsl b/Resources/Textures/Shaders/radial_blur.swsl
new file mode 100644
index 00000000000..f3224ce06c9
--- /dev/null
+++ b/Resources/Textures/Shaders/radial_blur.swsl
@@ -0,0 +1,14 @@
+uniform sampler2D SCREEN_TEXTURE;
+uniform highp float Strength;
+const highp int SampleCount = 10; // a higher number makes the shader look better, but has a big performance impact
+
+// a simple radial blur
+void fragment() {
+    highp vec2 uv = FRAGCOORD.xy * SCREEN_PIXEL_SIZE.xy;
+    highp vec2 direction = vec2(0.5, 0.5) - uv;
+    for (int i=1; i <= SampleCount; i++)
+    {
+        COLOR += zTextureSpec(SCREEN_TEXTURE, uv + float(i) * Strength / float(SampleCount) * direction);
+    }
+    COLOR = COLOR / float(SampleCount);
+}
diff --git a/Resources/Textures/Structures/Machines/autolathe.rsi/meta.json b/Resources/Textures/Structures/Machines/autolathe.rsi/meta.json
index b53c89c7a6e..2e28bba2875 100644
--- a/Resources/Textures/Structures/Machines/autolathe.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/autolathe.rsi/meta.json
@@ -20,15 +20,31 @@
       "name": "building",
       "delays": [
         [
-          0.5,
-          0.5,
-          0.5,
-          0.5,
-          0.5,
-          0.5,
-          0.5,
-          0.5,
-          0.5
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15
+        ]
+      ]
+    },
+    {
+      "name": "unlit-building",
+      "delays": [
+        [
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15
         ]
       ]
     },
diff --git a/Resources/Textures/Structures/Machines/autolathe.rsi/unlit-building.png b/Resources/Textures/Structures/Machines/autolathe.rsi/unlit-building.png
new file mode 100644
index 00000000000..5b17c682dc2
Binary files /dev/null and b/Resources/Textures/Structures/Machines/autolathe.rsi/unlit-building.png differ
diff --git a/Resources/Textures/Structures/Machines/autolathe_hypercon.rsi/meta.json b/Resources/Textures/Structures/Machines/autolathe_hypercon.rsi/meta.json
index 3dfb0685f28..9eada3ebc3d 100644
--- a/Resources/Textures/Structures/Machines/autolathe_hypercon.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/autolathe_hypercon.rsi/meta.json
@@ -20,15 +20,31 @@
       "name": "building",
       "delays": [
         [
-          0.5,
-          0.5,
-          0.5,
-          0.5,
-          0.5,
-          0.5,
-          0.5,
-          0.5,
-          0.5
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15
+        ]
+      ]
+    },
+    {
+      "name": "unlit-building",
+      "delays": [
+        [
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15,
+          0.15
         ]
       ]
     },
diff --git a/Resources/Textures/Structures/Machines/autolathe_hypercon.rsi/unlit-building.png b/Resources/Textures/Structures/Machines/autolathe_hypercon.rsi/unlit-building.png
new file mode 100644
index 00000000000..8f03eaa61a2
Binary files /dev/null and b/Resources/Textures/Structures/Machines/autolathe_hypercon.rsi/unlit-building.png differ
diff --git a/Resources/Textures/Structures/Machines/cuttermachine.rsi/building.png b/Resources/Textures/Structures/Machines/cuttermachine.rsi/building.png
new file mode 100644
index 00000000000..7b710f4f74a
Binary files /dev/null and b/Resources/Textures/Structures/Machines/cuttermachine.rsi/building.png differ
diff --git a/Resources/Textures/Structures/Machines/cuttermachine.rsi/icon.png b/Resources/Textures/Structures/Machines/cuttermachine.rsi/icon.png
new file mode 100644
index 00000000000..c718682539b
Binary files /dev/null and b/Resources/Textures/Structures/Machines/cuttermachine.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Machines/cuttermachine.rsi/meta.json b/Resources/Textures/Structures/Machines/cuttermachine.rsi/meta.json
new file mode 100644
index 00000000000..fd5f81442a3
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/cuttermachine.rsi/meta.json
@@ -0,0 +1,39 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "by Ko4erga (discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "panel"
+    },
+    {
+      "name": "unlit"
+    },
+    {
+      "name": "building",
+      "delays": [
+        [
+          0.042,
+          0.042,
+          0.042,
+          0.042,
+          0.042,
+          0.042,
+          0.042,
+          0.042,
+          0.042,
+          0.042,
+          0.042,
+          0.042
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Machines/cuttermachine.rsi/panel.png b/Resources/Textures/Structures/Machines/cuttermachine.rsi/panel.png
new file mode 100644
index 00000000000..1081f6622f4
Binary files /dev/null and b/Resources/Textures/Structures/Machines/cuttermachine.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/cuttermachine.rsi/unlit.png b/Resources/Textures/Structures/Machines/cuttermachine.rsi/unlit.png
new file mode 100644
index 00000000000..91551514811
Binary files /dev/null and b/Resources/Textures/Structures/Machines/cuttermachine.rsi/unlit.png differ
diff --git a/Resources/Textures/Structures/Machines/protolathe.rsi/meta.json b/Resources/Textures/Structures/Machines/protolathe.rsi/meta.json
index 17832603ef4..57f80369d0b 100644
--- a/Resources/Textures/Structures/Machines/protolathe.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/protolathe.rsi/meta.json
@@ -20,19 +20,39 @@
       "name": "building",
       "delays": [
         [
-          0.8,
-          0.8,
-          0.8,
-          0.8,
-          0.8,
-          0.8,
-          0.8,
-          0.8,
-          0.8,
-          0.8,
-          0.8,
-          0.8,
-          0.8
+          0.10,
+          0.10,
+          0.10,
+          0.10,
+          0.10,
+          0.10,
+          0.10,
+          0.10,
+          0.10,
+          0.10,
+          0.10,
+          0.10,
+          0.10
+        ]
+      ]
+    },
+    {
+      "name": "unlit-building",
+      "delays": [
+        [
+          0.10,
+          0.10,
+          0.10,
+          0.10,
+          0.10,
+          0.10,
+          0.10,
+          0.10,
+          0.10,
+          0.10,
+          0.10,
+          0.10,
+          0.10
         ]
       ]
     },
diff --git a/Resources/Textures/Structures/Machines/protolathe.rsi/unlit-building.png b/Resources/Textures/Structures/Machines/protolathe.rsi/unlit-building.png
new file mode 100644
index 00000000000..b72d06d6546
Binary files /dev/null and b/Resources/Textures/Structures/Machines/protolathe.rsi/unlit-building.png differ
diff --git a/Resources/Textures/Structures/Machines/protolathe_hypercon.rsi/meta.json b/Resources/Textures/Structures/Machines/protolathe_hypercon.rsi/meta.json
index b0326326f97..775b298d5a8 100644
--- a/Resources/Textures/Structures/Machines/protolathe_hypercon.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/protolathe_hypercon.rsi/meta.json
@@ -20,16 +20,33 @@
       "name": "building",
       "delays": [
         [
-          1.0,
-          1.0,
-          1.0,
-          1.0,
-          1.0,
-          1.0,
-          1.0,
-          1.0,
-          1.0,
-          1.0
+          0.10,
+          0.10,
+          0.10,
+          0.10,
+          0.10,
+          0.10,
+          0.10,
+          0.10,
+          0.10,
+          0.10
+        ]
+      ]
+    },
+    {
+      "name": "unlit-building",
+      "delays": [
+        [
+          0.10,
+          0.10,
+          0.10,
+          0.10,
+          0.10,
+          0.10,
+          0.10,
+          0.10,
+          0.10,
+          0.10
         ]
       ]
     },
diff --git a/Resources/Textures/Structures/Machines/protolathe_hypercon.rsi/unlit-building.png b/Resources/Textures/Structures/Machines/protolathe_hypercon.rsi/unlit-building.png
new file mode 100644
index 00000000000..bce4888e2a7
Binary files /dev/null and b/Resources/Textures/Structures/Machines/protolathe_hypercon.rsi/unlit-building.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/directionalfan.rsi/icon.png b/Resources/Textures/Structures/Piping/Atmospherics/directionalfan.rsi/icon.png
new file mode 100644
index 00000000000..577175edcd2
Binary files /dev/null and b/Resources/Textures/Structures/Piping/Atmospherics/directionalfan.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/directionalfan.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/directionalfan.rsi/meta.json
new file mode 100644
index 00000000000..217a9f3d782
--- /dev/null
+++ b/Resources/Textures/Structures/Piping/Atmospherics/directionalfan.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-SA-3.0",
+    "copyright": "Made by SlamBamActionman",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon",
+            "directions": 4,
+            "delays":[
+                [
+                    0.01,0.01,0.01,0.01
+                ],
+                [
+                    0.01,0.01,0.01,0.01
+                ],
+                [
+                    0.01,0.01,0.01,0.01
+                ],
+                [
+                    0.01,0.01,0.01,0.01
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp0.png b/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp0.png
index 45134518715..a83b3f9e095 100644
Binary files a/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp0.png and b/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp0.png differ
diff --git a/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp1.png b/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp1.png
index 21f121314de..8902a538953 100644
Binary files a/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp1.png and b/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp1.png differ
diff --git a/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp2.png b/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp2.png
index 4002ea9fb60..f579920985f 100644
Binary files a/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp2.png and b/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp2.png differ
diff --git a/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp3.png b/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp3.png
index 63d8adc2c79..129f9388f7d 100644
Binary files a/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp3.png and b/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unlitp3.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/base.png b/Resources/Textures/Structures/Power/apc.rsi/base.png
index 68b83101d21..17b98b40161 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/base.png and b/Resources/Textures/Structures/Power/apc.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/broken.png b/Resources/Textures/Structures/Power/apc.rsi/broken.png
index bb54b4bdc7d..18d1549fb1e 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/broken.png and b/Resources/Textures/Structures/Power/apc.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/display-charging.png b/Resources/Textures/Structures/Power/apc.rsi/display-charging.png
index 0f26ba31bd3..bf6ab695c75 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/display-charging.png and b/Resources/Textures/Structures/Power/apc.rsi/display-charging.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/display-full.png b/Resources/Textures/Structures/Power/apc.rsi/display-full.png
index 9b1e28db26d..2b0f0033b1f 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/display-full.png and b/Resources/Textures/Structures/Power/apc.rsi/display-full.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/display-lack.png b/Resources/Textures/Structures/Power/apc.rsi/display-lack.png
index e360f9c6bb0..eaa25feac9d 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/display-lack.png and b/Resources/Textures/Structures/Power/apc.rsi/display-lack.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/display-remote.png b/Resources/Textures/Structures/Power/apc.rsi/display-remote.png
index 089eb9345e7..42f0f6d6855 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/display-remote.png and b/Resources/Textures/Structures/Power/apc.rsi/display-remote.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png b/Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png
index 140ae850be7..9e1963a5957 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png and b/Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/frame.png b/Resources/Textures/Structures/Power/apc.rsi/frame.png
index 4f8ba4d56ef..4a4723e9ed2 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/frame.png and b/Resources/Textures/Structures/Power/apc.rsi/frame.png differ
diff --git a/Resources/Textures/Structures/Power/apc.rsi/static.png b/Resources/Textures/Structures/Power/apc.rsi/static.png
index 7275cfc9feb..d224dc7ff88 100644
Binary files a/Resources/Textures/Structures/Power/apc.rsi/static.png and b/Resources/Textures/Structures/Power/apc.rsi/static.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/base.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/base.png
new file mode 100644
index 00000000000..2d67101d2fc
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-0.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-0.png
new file mode 100644
index 00000000000..199a65fb959
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-0.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-1.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-1.png
new file mode 100644
index 00000000000..47ee108f18c
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-1.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-2.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-2.png
new file mode 100644
index 00000000000..77a54a15cef
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-2.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-3.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-3.png
new file mode 100644
index 00000000000..ddd26ba6270
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-3.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-4.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-4.png
new file mode 100644
index 00000000000..942f3df3ad2
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-4.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-5.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-5.png
new file mode 100644
index 00000000000..1b7430d8095
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-5.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-6.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-6.png
new file mode 100644
index 00000000000..e415ee1a7e8
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-6.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/closed.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/closed.png
new file mode 100644
index 00000000000..c79f80c0c23
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/locked.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/locked.png
new file mode 100644
index 00000000000..3156cb9fa1e
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/locked.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/meta.json b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/meta.json
new file mode 100644
index 00000000000..a3fb20976ef
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/meta.json
@@ -0,0 +1,47 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Kezu",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "chem-0"
+    },
+    {
+      "name": "chem-1"
+    },
+    {
+      "name": "chem-2"
+    },
+    {
+      "name": "chem-3"
+    },
+    {
+      "name": "chem-4"
+    },
+    {
+      "name": "chem-5"
+    },
+    {
+      "name": "chem-6"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/open.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/open.png
new file mode 100644
index 00000000000..ce50773db87
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/unlocked.png
new file mode 100644
index 00000000000..39d2fb77884
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/unlocked.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-0.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-0.png
new file mode 100644
index 00000000000..c090326148d
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-0.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-1.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-1.png
new file mode 100644
index 00000000000..7d698e0020f
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-1.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-10.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-10.png
new file mode 100644
index 00000000000..5acb43b1799
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-10.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-11.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-11.png
new file mode 100644
index 00000000000..328ca05ab73
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-11.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-12.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-12.png
new file mode 100644
index 00000000000..77469720a63
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-12.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-2.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-2.png
new file mode 100644
index 00000000000..5eab596dd46
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-2.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-3.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-3.png
new file mode 100644
index 00000000000..116080939b6
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-3.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-4.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-4.png
new file mode 100644
index 00000000000..15c03124e69
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-4.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-5.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-5.png
new file mode 100644
index 00000000000..ece06f2d786
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-5.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-6.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-6.png
new file mode 100644
index 00000000000..8ec7b1f6123
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-6.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-7.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-7.png
new file mode 100644
index 00000000000..e9468e2cdfe
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-7.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-8.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-8.png
new file mode 100644
index 00000000000..d01b2a6bc87
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-8.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-9.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-9.png
new file mode 100644
index 00000000000..b5b86d3e4cd
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-9.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/base.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/base.png
new file mode 100644
index 00000000000..ff9dd093b6b
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/meta.json b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/meta.json
new file mode 100644
index 00000000000..79e0904dd92
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/meta.json
@@ -0,0 +1,53 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Kezu",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "bar-0"
+    },
+    {
+      "name": "bar-1"
+    },
+    {
+      "name": "bar-2"
+    },
+    {
+      "name": "bar-3"
+    },
+    {
+      "name": "bar-4"
+    },
+    {
+      "name": "bar-5"
+    },
+    {
+      "name": "bar-6"
+    },
+    {
+      "name": "bar-7"
+    },
+    {
+      "name": "bar-8"
+    },
+    {
+      "name": "bar-9"
+    },
+    {
+      "name": "bar-10"
+    },
+    {
+      "name": "bar-11"
+    },
+    {
+      "name": "bar-12"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/base.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/base.png
new file mode 100644
index 00000000000..b302518d3de
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-0.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-0.png
new file mode 100644
index 00000000000..199a65fb959
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-0.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-1.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-1.png
new file mode 100644
index 00000000000..ded931cadfc
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-1.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-10.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-10.png
new file mode 100644
index 00000000000..8d71c464f6e
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-10.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-11.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-11.png
new file mode 100644
index 00000000000..5885ae1c6e3
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-11.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-12.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-12.png
new file mode 100644
index 00000000000..5afb489f643
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-12.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-2.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-2.png
new file mode 100644
index 00000000000..03799bb6889
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-2.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-3.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-3.png
new file mode 100644
index 00000000000..5daaf7dda89
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-3.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-4.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-4.png
new file mode 100644
index 00000000000..fc7be0c7da2
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-4.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-5.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-5.png
new file mode 100644
index 00000000000..150e8f3ec78
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-5.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-6.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-6.png
new file mode 100644
index 00000000000..653ca142c23
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-6.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-7.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-7.png
new file mode 100644
index 00000000000..8fb7d79932d
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-7.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-8.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-8.png
new file mode 100644
index 00000000000..ca197f5ba5f
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-8.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-9.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-9.png
new file mode 100644
index 00000000000..9f61aeeb480
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-9.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/meta.json b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/meta.json
new file mode 100644
index 00000000000..2daba51b6c9
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/meta.json
@@ -0,0 +1,53 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Kezu",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "kitchen-0"
+    },
+    {
+      "name": "kitchen-1"
+    },
+    {
+      "name": "kitchen-2"
+    },
+    {
+      "name": "kitchen-3"
+    },
+    {
+      "name": "kitchen-4"
+    },
+    {
+      "name": "kitchen-5"
+    },
+    {
+      "name": "kitchen-6"
+    },
+    {
+      "name": "kitchen-7"
+    },
+    {
+      "name": "kitchen-8"
+    },
+    {
+      "name": "kitchen-9"
+    },
+    {
+      "name": "kitchen-10"
+    },
+    {
+      "name": "kitchen-11"
+    },
+    {
+      "name": "kitchen-12"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/base.png b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/base.png
new file mode 100644
index 00000000000..ccaf278a543
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/closed.png b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/closed.png
new file mode 100644
index 00000000000..c79f80c0c23
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/locked.png b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/locked.png
new file mode 100644
index 00000000000..3156cb9fa1e
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/locked.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/meta.json b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/meta.json
new file mode 100644
index 00000000000..544b43a1e80
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Kezu",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "rbase"
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/open.png b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/open.png
new file mode 100644
index 00000000000..ce50773db87
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/rbase.png b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/rbase.png
new file mode 100644
index 00000000000..584a185caab
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/rbase.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/unlocked.png
new file mode 100644
index 00000000000..39d2fb77884
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/unlocked.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/base.png b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/base.png
new file mode 100644
index 00000000000..430b603aa3a
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/closed.png b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/closed.png
new file mode 100644
index 00000000000..c79f80c0c23
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/locked.png b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/locked.png
new file mode 100644
index 00000000000..3156cb9fa1e
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/locked.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/meta.json b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/meta.json
new file mode 100644
index 00000000000..544b43a1e80
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Kezu",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "rbase"
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/open.png b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/open.png
new file mode 100644
index 00000000000..ce50773db87
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/rbase.png b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/rbase.png
new file mode 100644
index 00000000000..430b603aa3a
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/rbase.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/unlocked.png
new file mode 100644
index 00000000000..39d2fb77884
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/unlocked.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/base.png b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/base.png
new file mode 100644
index 00000000000..a1054e575dd
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/closed.png b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/closed.png
new file mode 100644
index 00000000000..df740ed7b0f
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/locked.png b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/locked.png
new file mode 100644
index 00000000000..421688fcda8
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/locked.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/meta.json b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/meta.json
new file mode 100644
index 00000000000..544b43a1e80
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Kezu",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "rbase"
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/open.png b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/open.png
new file mode 100644
index 00000000000..c0e25c446bd
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/rbase.png b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/rbase.png
new file mode 100644
index 00000000000..a1054e575dd
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/rbase.png differ
diff --git a/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/unlocked.png
new file mode 100644
index 00000000000..3a00217edae
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/unlocked.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png b/Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png
index 787af3f5387..a85cbfbecc6 100644
Binary files a/Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png and b/Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/intercom.rsi/broadcasting.png b/Resources/Textures/Structures/Wallmounts/intercom.rsi/broadcasting.png
index 0566c70e35c..962417ccb4d 100644
Binary files a/Resources/Textures/Structures/Wallmounts/intercom.rsi/broadcasting.png and b/Resources/Textures/Structures/Wallmounts/intercom.rsi/broadcasting.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/intercom.rsi/build.png b/Resources/Textures/Structures/Wallmounts/intercom.rsi/build.png
index cfd5d5fffa0..e8edab0fa02 100644
Binary files a/Resources/Textures/Structures/Wallmounts/intercom.rsi/build.png and b/Resources/Textures/Structures/Wallmounts/intercom.rsi/build.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/intercom.rsi/panel.png b/Resources/Textures/Structures/Wallmounts/intercom.rsi/panel.png
index 3bfeb8df584..68f4cd1240b 100644
Binary files a/Resources/Textures/Structures/Wallmounts/intercom.rsi/panel.png and b/Resources/Textures/Structures/Wallmounts/intercom.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png b/Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png
index eb09c52fc3a..4bcd29d7f4b 100644
Binary files a/Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png and b/Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png b/Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png
index 7b0bb630722..a8fda54fc93 100644
Binary files a/Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png and b/Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/ai.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/ai.png
index 6cee540a6b2..e532ec039e8 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/ai.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/ai.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/ai_upload.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/ai_upload.png
new file mode 100644
index 00000000000..91256aa1df7
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/ai_upload.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png
index e5b69da718e..6b7361f21c2 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly2.png
deleted file mode 100644
index 73d94ac95e4..00000000000
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly2.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/arcade.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/arcade.png
index 9f36d43776f..7cb18443529 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/arcade.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/arcade.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/armory.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/armory.png
index 671e57aa5cf..3f237ec0466 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/armory.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/armory.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/ass.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/ass.png
index 0dfa8a04f5c..9d57ebe7e9a 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/ass.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/ass.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/atmominsky.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmominsky.png
deleted file mode 100644
index 3bd5488a62c..00000000000
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/atmominsky.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos.png
index 9441b328278..ae31db348b2 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/atmos.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/bar.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/bar.png
index e5fb2ab766e..8fdc8016af3 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/bar.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/bar.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/barbershop.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/barbershop.png
index d196072a32b..b01a82717f7 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/barbershop.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/barbershop.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/biblio.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/biblio.png
index ae86efe4965..9c2f15e0483 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/biblio.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/biblio.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/bridge.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/bridge.png
index e34d8cf8f25..838ffa7b24b 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/bridge.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/bridge.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/cans.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/cans.png
new file mode 100644
index 00000000000..53cdbbb5c90
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/cans.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/cargo.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/cargo.png
index bf0176ea97e..0366a82ffa6 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/cargo.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/cargo.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/cargo_dock.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/cargo_dock.png
index df7ee4cf112..4b07e410e29 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/cargo_dock.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/cargo_dock.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/chapel.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/chapel.png
index 635f00ec536..a862131d76c 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/chapel.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/chapel.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/chem.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/chem.png
index 71739f2d4a8..f8b42e9e6a3 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/chem.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/chem.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry1.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry1.png
deleted file mode 100644
index d1c1ac91845..00000000000
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry1.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry2.png
deleted file mode 100644
index f9864f7d44c..00000000000
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry2.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/cloning.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/cloning.png
index ecbc9370c18..da9434fcfbb 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/cloning.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/cloning.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/commander.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/commander.png
index d66b76011f2..f98c0a440b2 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/commander.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/commander.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/conference_room.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/conference_room.png
index c3d20f31b87..0823ef39432 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/conference_room.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/conference_room.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/court.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/court.png
deleted file mode 100644
index fbb8c50593e..00000000000
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/court.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/cryo.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/cryo.png
new file mode 100644
index 00000000000..3a0fc6d7168
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/cryo.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/data.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/data.png
new file mode 100644
index 00000000000..03a801e4838
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/data.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/deathsposal.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/deathsposal.png
index 28975a1b12b..1fa88f63afa 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/deathsposal.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/deathsposal.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/dock.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/dock.png
index 1716f825bbd..8d59357a358 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/dock.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/dock.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/doors.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/doors.png
index 46f7585812b..107ea06c99c 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/doors.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/doors.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/drama1.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/drama1.png
new file mode 100644
index 00000000000..af0d276d5c0
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/drama1.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/drama2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/drama2.png
new file mode 100644
index 00000000000..538374ce404
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/drama2.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/drama3.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/drama3.png
new file mode 100644
index 00000000000..cba0ec5955a
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/drama3.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/drones.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/drones.png
deleted file mode 100644
index 3d7e65f7a57..00000000000
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/drones.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/eng.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/eng.png
index 2d12b080fc7..5a70940bd90 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/eng.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/eng.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/engine.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/engine.png
index 2c4f14d7077..629680bfea8 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/engine.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/engine.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/eva.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/eva.png
index 2db7d426456..3e5d2db3c32 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/eva.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/eva.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/examroom.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/examroom.png
index afe1ce59865..05f0b7c0f5e 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/examroom.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/examroom.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/gravi.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/gravi.png
index 21eb2e86136..811d40aa898 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/gravi.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/gravi.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro.png
new file mode 100644
index 00000000000..f23fa7960de
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro1.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro1.png
deleted file mode 100644
index b20654fcd64..00000000000
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro1.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro2.png
deleted file mode 100644
index 40d3e546ec4..00000000000
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro2.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro3.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro3.png
deleted file mode 100644
index ccb0e83784e..00000000000
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/hydro3.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/interrogation.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/interrogation.png
index 653caf39075..e5c0b186b4c 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/interrogation.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/interrogation.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/janitor.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/janitor.png
index 789a53802c7..350f40dabd4 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/janitor.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/janitor.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/kitchen.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/kitchen.png
new file mode 100644
index 00000000000..322d62d8d2e
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/kitchen.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/laundromat.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/laundromat.png
index 251e0ebd7b7..400e73df422 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/laundromat.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/laundromat.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/law.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/law.png
index de6e16d4a60..0a239af288a 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/law.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/law.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/mail.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/mail.png
index f397ffe996e..ffb43a9ae5f 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/mail.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/mail.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/mats.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/mats.png
new file mode 100644
index 00000000000..af933d5b9e3
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/mats.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/medbay.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/medbay.png
index c9c6e1362a7..e57571f6821 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/medbay.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/medbay.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
index 97be2aaa0d0..a13df6f7d66 100644
--- a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
+++ b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
@@ -5,1490 +5,490 @@
     "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, 'arcade', 'barbershop', 'direction_exam', 'direction_icu', 'laundromat', 'news', 'reception', and 'salvage' made by rosieposieeee (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, Job signs by EmoGarbage404 (github) with inspiration from yogstation and tgstation, 'direction_exam' and 'direction_icu' made by rosieposieeee (github)",
     "states": [
         {
-            "name": "ai",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "ai"
         },
         {
-            "name": "anomaly",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "ai_upload"
         },
         {
-            "name": "anomaly2"
+            "name": "vault"
         },
         {
-            "name": "arcade",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "xenoarch"
         },
         {
-            "name": "armory",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "anomaly"
         },
         {
-            "name": "barbershop",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "arcade"
         },
         {
-            "name": "ass",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "armory"
         },
         {
-            "name": "atmos",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "barbershop"
         },
         {
-            "name": "atmos_air",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "ass"
         },
         {
-            "name": "atmos_co2",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "atmos"
         },
         {
-            "name": "atmos_n2",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "atmos_air"
         },
         {
-            "name": "atmos_n2o",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "atmos_co2"
         },
         {
-            "name": "atmos_o2",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "atmos_n2"
         },
         {
-            "name": "atmos_plasma",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "atmos_n2o"
         },
         {
-            "name": "atmos_tritium",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "atmos_o2"
         },
         {
-            "name": "atmos_waste",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "atmos_plasma"
         },
         {
-            "name": "atmosplaque",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "atmos_tritium"
         },
         {
-            "name": "zumosplaque",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "atmos_waste"
         },
         {
-            "name": "bar",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "atmosplaque"
         },
         {
-            "name": "biblio",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "zumosplaque"
         },
         {
-            "name": "bio",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "bar"
         },
         {
-            "name": "biohazard",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "biblio"
         },
         {
-            "name": "bridge",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "bio"
         },
         {
-            "name": "canisters",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "biohazard"
         },
         {
-            "name": "cargo",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "bridge"
         },
         {
-            "name": "cargo_dock",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "canisters"
         },
         {
-            "name": "chapel",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "cargo"
         },
         {
-            "name": "chem",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "cargo_dock"
         },
         {
-            "name": "chemistry1",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "chapel"
         },
         {
-            "name": "chemistry2",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "chem"
         },
         {
-            "name": "commander",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "commander"
         },
         {
-            "name": "conference_room",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "conference_room"
         },
         {
-            "name": "corrosives",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "corrosives"
         },
         {
-            "name": "court",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "cryogenics"
         },
         {
-            "name": "cryogenics",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "danger"
         },
         {
-            "name": "danger",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
-        {
-            "name": "deathsposal",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "deathsposal"
         },
         {
             "name": "direction_bar",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_exam",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_icu",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_janitor",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_food",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_hop",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_library",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_chemistry",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_eng",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_evac",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_supply",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_bridge",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_med",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_sci",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_sec",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_brig",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_chapel",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_hydro",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_dorms",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_cryo",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_gravity",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_salvage",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_solar",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "direction_wash",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
-        },
-        {
-            "name": "dock",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
-        {
-            "name": "doors",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
-        {
-            "name": "drones",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
-        {
-            "name": "electrical",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
-        {
-            "name": "eng",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
-        {
-            "name": "engine",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
-        {
-            "name": "eva",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
-        {
-            "name": "examroom",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
-        {
-            "name": "explosives",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
-        {
-            "name": "fire",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
-        {
-            "name": "flammable",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
-        {
-            "name": "cloning",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "directions": 4
+        },
+        {
+            "name": "dock"
+        },
+        {
+            "name": "doors"
+        },
+        {
+            "name": "mats"
+        },
+        {
+            "name": "electrical"
+        },
+        {
+            "name": "eng"
+        },
+        {
+            "name": "engine"
+        },
+        {
+            "name": "eva"
+        },
+        {
+            "name": "examroom"
         },
         {
-            "name": "gravi",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "explosives"
         },
         {
-            "name": "hydro1",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "fire"
         },
         {
-            "name": "hydro2",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "flammable"
         },
         {
-            "name": "hydro3",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "cloning"
         },
         {
-            "name": "interrogation",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "gravi"
         },
         {
-            "name": "janitor",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "hydro"
         },
         {
-            "name": "laser",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "interrogation"
         },
         {
-            "name": "laundromat",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "janitor"
         },
         {
-            "name": "law",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "laser"
         },
         {
-            "name": "magnetics",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "laundromat"
         },
         {
-            "name": "mail",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "law"
         },
         {
-            "name": "medbay",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "magnetics"
         },
         {
-            "name": "memetic",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "mail"
         },
         {
-            "name": "miner_dock",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "medbay"
         },
         {
-            "name": "monkey_painting",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "memetic"
         },
         {
-            "name": "morgue",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "monkey_painting"
         },
         {
-            "name": "news",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "morgue"
         },
         {
-            "name": "nosmoking",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "news"
         },
         {
-            "name": "nosmoking2",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "kitchen"
         },
         {
-            "name": "surgery",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "drama1"
         },
         {
-            "name": "optical",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "drama2"
         },
         {
-            "name": "oxidants",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "drama3"
         },
         {
-            "name": "pods",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "restroom"
         },
         {
-            "name": "prison",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "nosmoking"
         },
         {
-            "name": "psychology",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "nosmoking2"
         },
         {
-            "name": "radiation",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "surgery"
         },
         {
-            "name": "reception",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "optical"
         },
         {
-            "name": "rnd",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "oxidants"
         },
         {
-            "name": "robo",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "pods"
         },
         {
-            "name": "salvage",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "prison"
         },
         {
-            "name": "sci",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "psychology"
         },
         {
-            "name": "science1",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "radiation"
         },
         {
-            "name": "science2",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "reception"
         },
         {
-            "name": "secure",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "rnd"
         },
         {
-            "name": "securearea",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "robo"
         },
         {
-            "name": "shield",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "salvage"
         },
         {
-            "name": "shock",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "sci"
         },
         {
-            "name": "something-old1",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "secure"
         },
         {
-            "name": "something-old2",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "securearea"
         },
         {
-            "name": "space",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "cans"
         },
         {
-            "name": "telecoms",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "shock"
         },
         {
-            "name": "toxins2",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "something-old1"
         },
         {
-            "name": "toxins",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "something-old2"
         },
         {
-            "name": "virology",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "space"
         },
         {
-            "name": "xenobio",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "telecoms"
         },
         {
-            "name": "xenobio2",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "toxins"
         },
         {
-            "name": "xenolab",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "virology"
         },
         {
-            "name": "zomlab",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "xenobio"
         },
         {
-            "name": "small_secure_red",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "zomlab"
         },
         {
-            "name": "small_secure",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "small_secure_red"
         },
         {
-            "name": "medium_secure_red",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "small_secure"
         },
         {
-            "name": "medium_blank",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "medium_secure_red"
         },
         {
-            "name": "medium_magnetics",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "medium_blank"
         },
         {
-            "name": "medium_danger",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "medium_magnetics"
         },
         {
-            "name": "medium_explosives",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "medium_danger"
         },
         {
-            "name": "medium_cryogenics",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "medium_explosives"
         },
         {
-            "name": "medium_electrical",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "medium_cryogenics"
         },
         {
-            "name": "medium_biohazard",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "medium_electrical"
         },
         {
-            "name": "medium_radiation",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "medium_biohazard"
         },
         {
-            "name": "medium_flammable",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "medium_radiation"
         },
         {
-            "name": "medium_laser",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "medium_flammable"
         },
         {
-            "name": "medium_secure",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "medium_laser"
         },
         {
-            "name": "goldenplaque",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "medium_secure"
         },
         {
-            "name": "kiddieplaque",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "goldenplaque"
         },
         {
-            "name": "security",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "kiddieplaque"
         },
         {
-            "name": "nanotrasen_sign1",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "security"
         },
         {
-            "name": "nanotrasen_sign2",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "data"
         },
         {
-            "name": "nanotrasen_sign3",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "cryo"
         },
         {
-            "name": "nanotrasen_sign4",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "nanotrasen_sign1"
         },
         {
-            "name": "nanotrasen_sign5",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "nanotrasen_sign2"
         },
         {
-            "name": "atmominsky",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
+            "name": "nanotrasen_sign3"
+        },
         {
-            "name": "one",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
+            "name": "nanotrasen_sign4"
+        },
         {
-            "name": "two",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
+            "name": "nanotrasen_sign5"
+        },
         {
-            "name": "three",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
+            "name": "one"
+        },
         {
-            "name": "four",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
+            "name": "two"
+        },
         {
-            "name": "five",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
+            "name": "three"
+        },
         {
-            "name": "six",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
+            "name": "four"
+        },
         {
-            "name": "seven",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
+            "name": "five"
+        },
         {
-            "name": "eight",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
+            "name": "six"
+        },
+        {
+            "name": "seven"
+        },
+        {
+            "name": "eight"
+        },
         {
-            "name": "nine",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
+            "name": "nine"
+        },
         {
-            "name": "zero",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
+            "name": "zero"
+        },
         {
-            "name": "survival",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
+            "name": "survival"
+        },
         {
-            "name": "ntmining",
-            "delays": [
-                [
-                    1
-                ]
-            ]
+            "name": "ntmining"
         }
     ]
 }
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/miner_dock.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/miner_dock.png
deleted file mode 100644
index a9444f1ed6c..00000000000
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/miner_dock.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/morgue.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/morgue.png
index 1dc0e7d1a96..95729938071 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/morgue.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/morgue.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/news.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/news.png
index 575d943c769..40b73c7c2d2 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/news.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/news.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/prison.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/prison.png
index a6fe5ca1f39..cea5bba81a9 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/prison.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/prison.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/psychology.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/psychology.png
index 9b0761c1bb4..1d89a1ec590 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/psychology.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/psychology.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/reception.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/reception.png
index b16670d5b5f..3f3e6dfa490 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/reception.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/reception.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/restroom.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/restroom.png
new file mode 100644
index 00000000000..f5903a7d155
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/restroom.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/rnd.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/rnd.png
index 875b57204b3..3dc284f4794 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/rnd.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/rnd.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/robo.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/robo.png
index 5b3bb6e83db..82519ba966b 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/robo.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/robo.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/salvage.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/salvage.png
index 8c51238f897..20b0eb577de 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/salvage.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/salvage.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/sci.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/sci.png
index eb3afab2f8f..599207f48ae 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/sci.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/sci.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/science1.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/science1.png
deleted file mode 100644
index 7c67901ec43..00000000000
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/science1.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/science2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/science2.png
deleted file mode 100644
index 7722ef83031..00000000000
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/science2.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/security.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/security.png
index 7e27efa2b32..2de5d34a5ee 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/security.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/security.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/shield.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/shield.png
deleted file mode 100644
index bb88d2a770e..00000000000
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/shield.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/space.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/space.png
index 214650d6db4..b9286eb06db 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/space.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/space.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/surgery.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/surgery.png
index 254ada76fd4..f24ba5c1b33 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/surgery.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/surgery.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/telecoms.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/telecoms.png
index e1e721de4aa..5896206cafe 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/telecoms.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/telecoms.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/toxins.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/toxins.png
index 6c28bfde003..cf11ed6155f 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/toxins.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/toxins.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/toxins2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/toxins2.png
deleted file mode 100644
index c2c35212d0b..00000000000
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/toxins2.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/vault.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/vault.png
new file mode 100644
index 00000000000..33572ca25b5
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/vault.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/virology.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/virology.png
index b83297d037c..232d9a74b55 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/virology.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/virology.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/xenoarch.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/xenoarch.png
new file mode 100644
index 00000000000..a4b26daa993
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/xenoarch.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio.png
index 0d9336c01a1..4f99ab19c3d 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio2.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio2.png
deleted file mode 100644
index 3e8515dda03..00000000000
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio2.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/xenolab.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/xenolab.png
deleted file mode 100644
index 21eb486835b..00000000000
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/xenolab.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/zomlab.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/zomlab.png
index 09d54e603dc..a81784d30b5 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/zomlab.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/zomlab.png differ
diff --git a/Resources/Textures/Structures/Walls/mining.rsi/meta.json b/Resources/Textures/Structures/Walls/mining.rsi/meta.json
index 4ce4691c516..77f43229984 100644
--- a/Resources/Textures/Structures/Walls/mining.rsi/meta.json
+++ b/Resources/Textures/Structures/Walls/mining.rsi/meta.json
@@ -7,40 +7,72 @@
     "y": 32
   },
   "states": [
-	  {
+    {
       "name": "full"
     }, 
-	  {
+    {
       "name": "mining0",
-	    "directions": 4
+        "directions": 4
     },
-	  {
+    {
       "name": "mining1",
-	    "directions": 4
+        "directions": 4
     },
-	  {
+    {
       "name": "mining2",
-	    "directions": 4
+        "directions": 4
     },
-	  {
+    {
       "name": "mining3",
-	    "directions": 4
+        "directions": 4
     },
-	  {
+    {
       "name": "mining4",
-	    "directions": 4
+        "directions": 4
     },
-	  {
+    {
       "name": "mining5",
-	    "directions": 4
+        "directions": 4
     },
-	  {
+    {
       "name": "mining6",
-	    "directions": 4
+        "directions": 4
     },
-	  {
+    {
       "name": "mining7",
-	    "directions": 4
+        "directions": 4
+    }, 
+    {
+      "name": "miningB0",
+        "directions": 4
+    },
+    {
+      "name": "miningB1",
+        "directions": 4
+    },
+    {
+      "name": "miningB2",
+        "directions": 4
+    },
+    {
+      "name": "miningB3",
+        "directions": 4
+    },
+    {
+      "name": "miningB4",
+        "directions": 4
+    },
+    {
+      "name": "miningB5",
+        "directions": 4
+    },
+    {
+      "name": "miningB6",
+        "directions": 4
+    },
+    {
+      "name": "miningB7",
+        "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Structures/Walls/mining.rsi/miningB0.png b/Resources/Textures/Structures/Walls/mining.rsi/miningB0.png
new file mode 100644
index 00000000000..f65f066b65a
Binary files /dev/null and b/Resources/Textures/Structures/Walls/mining.rsi/miningB0.png differ
diff --git a/Resources/Textures/Structures/Walls/mining.rsi/miningB1.png b/Resources/Textures/Structures/Walls/mining.rsi/miningB1.png
new file mode 100644
index 00000000000..24c81aa8779
Binary files /dev/null and b/Resources/Textures/Structures/Walls/mining.rsi/miningB1.png differ
diff --git a/Resources/Textures/Structures/Walls/mining.rsi/miningB2.png b/Resources/Textures/Structures/Walls/mining.rsi/miningB2.png
new file mode 100644
index 00000000000..f65f066b65a
Binary files /dev/null and b/Resources/Textures/Structures/Walls/mining.rsi/miningB2.png differ
diff --git a/Resources/Textures/Structures/Walls/mining.rsi/miningB3.png b/Resources/Textures/Structures/Walls/mining.rsi/miningB3.png
new file mode 100644
index 00000000000..24c81aa8779
Binary files /dev/null and b/Resources/Textures/Structures/Walls/mining.rsi/miningB3.png differ
diff --git a/Resources/Textures/Structures/Walls/mining.rsi/miningB4.png b/Resources/Textures/Structures/Walls/mining.rsi/miningB4.png
new file mode 100644
index 00000000000..1412f002696
Binary files /dev/null and b/Resources/Textures/Structures/Walls/mining.rsi/miningB4.png differ
diff --git a/Resources/Textures/Structures/Walls/mining.rsi/miningB5.png b/Resources/Textures/Structures/Walls/mining.rsi/miningB5.png
new file mode 100644
index 00000000000..8bbef8ca971
Binary files /dev/null and b/Resources/Textures/Structures/Walls/mining.rsi/miningB5.png differ
diff --git a/Resources/Textures/Structures/Walls/mining.rsi/miningB6.png b/Resources/Textures/Structures/Walls/mining.rsi/miningB6.png
new file mode 100644
index 00000000000..1412f002696
Binary files /dev/null and b/Resources/Textures/Structures/Walls/mining.rsi/miningB6.png differ
diff --git a/Resources/Textures/Structures/Walls/mining.rsi/miningB7.png b/Resources/Textures/Structures/Walls/mining.rsi/miningB7.png
new file mode 100644
index 00000000000..add9cddf83f
Binary files /dev/null and b/Resources/Textures/Structures/Walls/mining.rsi/miningB7.png differ
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/meta.json b/Resources/Textures/Structures/Walls/rock.rsi/meta.json
index aa46326a4b5..a29513356c5 100644
--- a/Resources/Textures/Structures/Walls/rock.rsi/meta.json
+++ b/Resources/Textures/Structures/Walls/rock.rsi/meta.json
@@ -104,7 +104,23 @@
             "name": "rock_copper"
         },
         {
-            "name": "rock_diamond"
+            "name": "rock_diamond",
+            "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": "rock_gold"
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_diamond.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_diamond.png
index eb05ebd3d11..cc54b642f45 100644
Binary files a/Resources/Textures/Structures/Walls/rock.rsi/rock_diamond.png and b/Resources/Textures/Structures/Walls/rock.rsi/rock_diamond.png differ
diff --git a/Resources/Textures/Template/signs.png b/Resources/Textures/Template/signs.png
new file mode 100644
index 00000000000..4dc483183b2
Binary files /dev/null and b/Resources/Textures/Template/signs.png differ
diff --git a/Resources/Textures/Tiles/attributions.yml b/Resources/Textures/Tiles/attributions.yml
index 7cfe5535a0a..6a6f545d1e9 100644
--- a/Resources/Textures/Tiles/attributions.yml
+++ b/Resources/Textures/Tiles/attributions.yml
@@ -16,11 +16,11 @@
   copyright: "Modified by github user @Flareguy from plating.png, using damaged plating sprites from /tg/station at commit https://github.com/tgstation/tgstation/blob/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae/icons/turf/floors.dmi"
   source: "https://github.com/space-wizards/space-station-14/pull/21711"
 
-- files: [ "asteroid_red.png", "asteroid_tile.png", "elevator_shaft.png", "freezer.png", "green_circuit.png", "lino.png", "mono.png", "rock_vault.png", "showroom.png"]
+- files: [ "asteroid_red.png", "asteroid_tile.png", "elevator_shaft.png", "freezer.png", "foammetal.png", "green_circuit.png", "lino.png", "mono.png", "rock_vault.png", "showroom.png"]
   license: "CC-BY-SA-3.0"
   copyright: "vgstation13 at roughly commit e4d3ea7f69d21c3667be12b114fa935c4640cb05, asteroid_red and asteroid_tile taken from commit /vg/station at commit 02b9f6894af4419c9f7e699a22c402b086d8067e."
   source: "https://github.com/vgstation-coders/vgstation13"
-  
+
 - files: [ "asteroid.png", "asteroid_dug.png", "asteroid0.png"]
   license: "CC-BY-SA-3.0"
   copyright: "Taken from /tg/station at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae."
@@ -40,7 +40,7 @@
   license: "CC-BY-SA-3.0"
   copyright: "Modified from plating.png by github user @Flareguy"
   source: "https://github.com/space-wizards/space-station-14/"
-  
+
 - files: ["rglass.png"]
   license: "CC-BY-SA-3.0"
   copyright: "tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49, rglass modified by github user @notquitehadouken."
@@ -90,7 +90,7 @@
   license: "CC-BY-SA-3.0"
   copyright: "Fortuna commit 2a9408a47e2f83d945335e4feeeeafb552173e6f, grasslight and dirt by Peptide based on grassdark.png and dirt."
   source: "https://github.com/FortunaSS13/Fortuna"
-  
+
 - files: ["steel_maint.png", "grating_maint.png", "wood_tile.png"]
   license: "CC-BY-SA-3.0"
   copyright: "by brainfood for space-station-14, ."
@@ -105,7 +105,7 @@
   license: "CC-BY-SA-3.0"
   copyright: "taken at https://github.com/ParadiseSS13/Paradise/blob/8b7f4c8b69c74c6de5a755272eb8d3520f3d87c7/icons/turf/floors.dmi"
   source: "https://github.com/ParadiseSS13/Paradise"
-  
+
 - files: ["chromite.png"]
   license: "CC-BY-NC-SA-3.0"
   copyright: "taken at commit 0587dd16e28108bdf0b0a28e2caae4319845e861, and recolored by TheShuEd"
diff --git a/Resources/Textures/Tiles/foammetal.png b/Resources/Textures/Tiles/foammetal.png
new file mode 100644
index 00000000000..a6afd53b25a
Binary files /dev/null and b/Resources/Textures/Tiles/foammetal.png differ
diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml
index c11f59d17c9..0b38a649227 100644
--- a/Resources/keybinds.yml
+++ b/Resources/keybinds.yml
@@ -455,8 +455,8 @@ binds:
 - function: OpenDecalSpawnWindow
   type: State
   key: F8
-- function: OpenScoreboardWindow
-  type: State
+- function: ToggleRoundEndSummaryWindow
+  type: Toggle
   key: F9
 - function: OpenSandboxWindow
   type: State
diff --git a/RobustToolbox b/RobustToolbox
index 860c9af2bfb..49c831b48d1 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 860c9af2bfbf1477b96519067ef5e62b2525d987
+Subproject commit 49c831b48d1449e90a65acdb0c276d2deea4ce2c
diff --git a/SpaceStation14.sln b/SpaceStation14.sln
index e0cb455a6db..bcd013b5981 100644
--- a/SpaceStation14.sln
+++ b/SpaceStation14.sln
@@ -62,7 +62,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{806ED41A-411B-4B3B-BEB6-DEC6DCA4C205}"
 	ProjectSection(SolutionItems) = preProject
 		Tools\generate_hashes.ps1 = Tools\generate_hashes.ps1
-		Tools\gen_build_info.py = Tools\gen_build_info.py
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Shared.Scripting", "RobustToolbox\Robust.Shared.Scripting\Robust.Shared.Scripting.csproj", "{41B450C0-A361-4CD7-8121-7072B8995CFC}"
diff --git a/Tools/actions_changelog_rss.py b/Tools/actions_changelog_rss.py
index 5e42a030bde..5c696f5b01a 100755
--- a/Tools/actions_changelog_rss.py
+++ b/Tools/actions_changelog_rss.py
@@ -29,13 +29,13 @@
 
 # Change these to suit your server settings
 # https://docs.fabfile.org/en/stable/getting-started.html#run-commands-via-connections-and-run
-SSH_HOST = "centcomm.spacestation14.io"
+SSH_HOST = "moon.spacestation14.com"
 SSH_USER = "changelog-rss"
 SSH_PORT = 22
 RSS_FILE = "changelog.xml"
 XSL_FILE = "stylesheet.xsl"
 HOST_KEYS = [
-    "AAAAC3NzaC1lZDI1NTE5AAAAIEE8EhnPjb3nIaAPTXAJHbjrwdGGxHoM0f1imCK0SygD"
+    "AAAAC3NzaC1lZDI1NTE5AAAAIOBpGO/Qc6X0YWuw7z+/WS/65+aewWI29oAyx+jJpCmh"
 ]
 
 # RSS feed parameters, change these
diff --git a/Tools/publish_github_artifact.py b/Tools/publish_github_artifact.py
index 9daa12782c9..145dc69b228 100755
--- a/Tools/publish_github_artifact.py
+++ b/Tools/publish_github_artifact.py
@@ -53,4 +53,4 @@ def get_engine_version() -> str:
 
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()